diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 15:16:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2014-10-01 17:35:10 +0200 |
| commit | 3ed902fe4fca434755281982cb28239cbfa21672 (patch) | |
| tree | 70f51982fbb51b2244847cca9d6ca859b1eb68e0 /slideshow | |
| parent | 5b401a06a616238cfbd961e2afb47a21c2835220 (diff) | |
slideshow: std::auto_ptr -> std::unique_ptr
Change-Id: If5b81c423ec7e21f26b641b252b722d4bf467c13
Diffstat (limited to 'slideshow')
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.cxx | 1 | ||||
| -rw-r--r-- | slideshow/source/engine/shapes/viewmediashape.hxx | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index 83cb7b74828e..afddec0b6b51 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -75,7 +75,6 @@ namespace slideshow const uno::Reference< drawing::XShape >& rxShape, const uno::Reference< uno::XComponentContext >& rxContext ) : mpViewLayer( rViewLayer ), - mpMediaWindow(0), mpEventHandlerParent(0), maWindowOffset( 0, 0 ), maBounds(), diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index 6d06a14f6d60..a512a96e8c57 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -147,7 +147,7 @@ namespace slideshow const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& rVCLDeviceParams, const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; - ::std::auto_ptr< SystemChildWindow > mpMediaWindow; + ::std::unique_ptr< SystemChildWindow > mpMediaWindow; boost::scoped_ptr< ::vcl::Window > mpEventHandlerParent; mutable ::com::sun::star::awt::Point maWindowOffset; mutable ::basegfx::B2DRectangle maBounds; |