diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-26 12:30:40 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-26 20:55:36 +0000 |
commit | b4972afaa5170fe6712e81fb8d27a21313fdcea2 (patch) | |
tree | a90e31a69fd1f6e0f6dda802956df2d449ffe313 | |
parent | f18e14b7739e52f3cecf6da3c1aabe07cc9e6fe9 (diff) |
boost->std
Change-Id: Icb81f72c5eaeb728603d8595d22bf18c8e97d7d0
Reviewed-on: https://gerrit.libreoffice.org/18884
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 2 | ||||
-rw-r--r-- | sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ebc0b4d5173a..006293587b64 100644 --- a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx +++ b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx @@ -83,7 +83,7 @@ public: virtual bool RelocateToParentWindow (vcl::Window* pParentWindow) SAL_OVERRIDE; private: - ::boost::scoped_ptr< ToolPanelViewShell_Impl > mpImpl; + std::unique_ptr< ToolPanelViewShell_Impl > mpImpl; std::shared_ptr<TaskPaneShellManager> mpSubShellManager; diff --git a/sd/source/ui/slidesorter/view/SlideSorterView.cxx b/sd/source/ui/slidesorter/view/SlideSorterView.cxx index a023aa4fd154..46766bb0ec40 100644 --- a/sd/source/ui/slidesorter/view/SlideSorterView.cxx +++ b/sd/source/ui/slidesorter/view/SlideSorterView.cxx @@ -83,7 +83,7 @@ namespace sd { namespace slidesorter { namespace view { namespace { /** Wrapper around the SlideSorterView that supports the IPainter interface and that allows the LayeredDevice to hold the - SlideSorterView (held as scoped_ptr by the SlideSorter) as + SlideSorterView (held as unique_ptr by the SlideSorter) as shared_ptr. */ class Painter : public ILayerPainter |