sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx | 2 +- sd/source/ui/slidesorter/view/SlideSorterView.cxx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
New commits: commit b4972afaa5170fe6712e81fb8d27a21313fdcea2 Author: Caolán McNamara <caol...@redhat.com> Date: Sat Sep 26 12:30:40 2015 +0100 boost->std Change-Id: Icb81f72c5eaeb728603d8595d22bf18c8e97d7d0 Reviewed-on: https://gerrit.libreoffice.org/18884 Reviewed-by: Caolán McNamara <caol...@redhat.com> Tested-by: Caolán McNamara <caol...@redhat.com> diff --git a/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx b/sd/source/ui/inc/taskpane/ToolPanelViewShell.hxx index ebc0b4d..0062935 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 a023aa4..46766bb 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
_______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits