[Libreoffice-commits] core.git: sd/source

[Caolán McNamara]

 sd/source/ui/framework/configuration/ConfigurationController.cxx |    4 ++--
 sd/source/ui/framework/factories/BasicPaneFactory.hxx            |    3 +--
 sd/source/ui/framework/factories/BasicViewFactory.hxx            |    3 +--
 sd/source/ui/framework/module/ResourceManager.hxx                |    3 +--
 sd/source/ui/framework/module/ShellStackGuard.hxx                |    3 +--
 sd/source/ui/framework/module/ToolBarModule.hxx                  |    3 +--
 6 files changed, 7 insertions(+), 12 deletions(-)

New commits:
commit 4b16c89f06146ce50b360916538fe744ec2a72c7
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Sep 24 11:19:44 2015 +0100

    sd/source/ui/framework boost::scoped_ptr->std::unique_ptr
    
    Change-Id: I37e8c596d7afc3f7d0461b40e596dea45e9470a4
    Reviewed-on: https://gerrit.libreoffice.org/18824
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/framework/configuration/ConfigurationController.cxx b/sd/source/ui/framework/configuration/ConfigurationController.cxx
index d6b221577..abfaa87 100644
--- a/sd/source/ui/framework/configuration/ConfigurationController.cxx
+++ b/sd/source/ui/framework/configuration/ConfigurationController.cxx
@@ -36,7 +36,7 @@
 
 #include <osl/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -80,7 +80,7 @@ public:
     /** The queue processor ownes the queue of configuration change request
         objects and processes the objects.
     */
-    ::boost::scoped_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
+    std::unique_ptr<ChangeRequestQueueProcessor> mpQueueProcessor;
 
     std::shared_ptr<ConfigurationUpdaterLock> mpConfigurationUpdaterLock;
 
diff --git a/sd/source/ui/framework/factories/BasicPaneFactory.hxx b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
index 5d1a454..4421732 100644
--- a/sd/source/ui/framework/factories/BasicPaneFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicPaneFactory.hxx
@@ -33,7 +33,6 @@
 #include <cppuhelper/compbase.hxx>
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace {
 
@@ -109,7 +108,7 @@ private:
     ViewShellBase* mpViewShellBase;
     class PaneDescriptor;
     class PaneContainer;
-    ::boost::scoped_ptr<PaneContainer> mpPaneContainer;
+    std::unique_ptr<PaneContainer> mpPaneContainer;
 
     /** Create a new instance of FrameWindowPane.
         @param rPaneId
diff --git a/sd/source/ui/framework/factories/BasicViewFactory.hxx b/sd/source/ui/framework/factories/BasicViewFactory.hxx
index 7b1530c..064558c 100644
--- a/sd/source/ui/framework/factories/BasicViewFactory.hxx
+++ b/sd/source/ui/framework/factories/BasicViewFactory.hxx
@@ -34,7 +34,6 @@
 
 #include <vcl/vclptr.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd {
 class ViewShell;
@@ -100,7 +99,7 @@ private:
         mxConfigurationController;
     class ViewDescriptor;
     class ViewShellContainer;
-    ::boost::scoped_ptr<ViewShellContainer> mpViewShellContainer;
+    std::unique_ptr<ViewShellContainer> mpViewShellContainer;
     ViewShellBase* mpBase;
     FrameView* mpFrameView;
 
diff --git a/sd/source/ui/framework/module/ResourceManager.hxx b/sd/source/ui/framework/module/ResourceManager.hxx
index 418979b..d0abc5d 100644
--- a/sd/source/ui/framework/module/ResourceManager.hxx
+++ b/sd/source/ui/framework/module/ResourceManager.hxx
@@ -26,7 +26,6 @@
 #include <com/sun/star/frame/XController.hpp>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace {
 
@@ -83,7 +82,7 @@ protected:
 
 private:
     class MainViewContainer;
-    ::boost::scoped_ptr<MainViewContainer> mpActiveMainViewContainer;
+    std::unique_ptr<MainViewContainer> mpActiveMainViewContainer;
 
     /// The resource managed by this class.
     css::uno::Reference<css::drawing::framework::XResourceId> mxResourceId;
diff --git a/sd/source/ui/framework/module/ShellStackGuard.hxx b/sd/source/ui/framework/module/ShellStackGuard.hxx
index f2a5f37..5d4bf13 100644
--- a/sd/source/ui/framework/module/ShellStackGuard.hxx
+++ b/sd/source/ui/framework/module/ShellStackGuard.hxx
@@ -32,7 +32,6 @@
 #include <vcl/idle.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace {
 
@@ -85,7 +84,7 @@ private:
     css::uno::Reference<css::drawing::framework::XConfigurationController>
         mxConfigurationController;
     ViewShellBase* mpBase;
-    ::boost::scoped_ptr<ConfigurationController::Lock> mpUpdateLock;
+    std::unique_ptr<ConfigurationController::Lock> mpUpdateLock;
     Idle maPrinterPollingIdle;
 
     DECL_LINK_TYPED(TimeoutHandler, Idle*, void);
diff --git a/sd/source/ui/framework/module/ToolBarModule.hxx b/sd/source/ui/framework/module/ToolBarModule.hxx
index cffc42e..60350da 100644
--- a/sd/source/ui/framework/module/ToolBarModule.hxx
+++ b/sd/source/ui/framework/module/ToolBarModule.hxx
@@ -29,7 +29,6 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/compbase.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd {
 class ViewShellBase;
@@ -77,7 +76,7 @@ private:
     css::uno::Reference<
         css::drawing::framework::XConfigurationController> mxConfigurationController;
     ViewShellBase* mpBase;
-    ::boost::scoped_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
+    std::unique_ptr<ToolBarManager::UpdateLock> mpToolBarManagerLock;
     bool mbMainViewSwitchUpdatePending;
 
     void HandleUpdateStart();