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

[Caolán McNamara]

 sd/source/ui/app/sdmod1.cxx         |    1 -
 sd/source/ui/inc/SlideSorter.hxx    |    7 +++----
 sd/source/ui/inc/ToolBarManager.hxx |    2 +-
 sd/source/ui/inc/ViewShell.hxx      |    1 -
 sd/source/ui/inc/ViewShellBase.hxx  |    1 +
 sd/source/ui/view/sdview2.cxx       |    3 +--
 6 files changed, 6 insertions(+), 9 deletions(-)

New commits:
commit 01b003c47bb7bb469eaf4ebf08ded979a0424df4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sat Sep 26 11:32:17 2015 +0100

    boost->std
    
    Change-Id: I17a517e5063aebd7d20864104b4b24a5fd05612b
    Reviewed-on: https://gerrit.libreoffice.org/18883
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/source/ui/app/sdmod1.cxx b/sd/source/ui/app/sdmod1.cxx
index 81a72e9..69599d9b 100644
--- a/sd/source/ui/app/sdmod1.cxx
+++ b/sd/source/ui/app/sdmod1.cxx
@@ -60,7 +60,6 @@
 #include "FactoryIds.hxx"
 #include "sdabstdlg.hxx"
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include "slideshow.hxx"
 
 #include <com/sun/star/document/XDocumentPropertiesSupplier.hpp>
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx
index c2f302c..0b7273a 100644
--- a/sd/source/ui/inc/SlideSorter.hxx
+++ b/sd/source/ui/inc/SlideSorter.hxx
@@ -29,7 +29,6 @@
 #include <boost/current_function.hpp>
 #include <vcl/scrbar.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 class ScrollBar;
 class ScrollBarBox;
@@ -215,9 +214,9 @@ protected:
 private:
     bool mbIsValid;
 
-    ::boost::scoped_ptr<controller::SlideSorterController> mpSlideSorterController;
-    ::boost::scoped_ptr<model::SlideSorterModel> mpSlideSorterModel;
-    ::boost::scoped_ptr<view::SlideSorterView> mpSlideSorterView;
+    std::unique_ptr<controller::SlideSorterController> mpSlideSorterController;
+    std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel;
+    std::unique_ptr<view::SlideSorterView> mpSlideSorterView;
     ::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak;
     ViewShell* mpViewShell;
     ViewShellBase* mpViewShellBase;
diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index d3501c4..fa681d6 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -253,7 +253,7 @@ public:
 
 private:
     class Implementation;
-    ::boost::scoped_ptr<Implementation> mpImpl;
+    std::unique_ptr<Implementation> mpImpl;
 
     /** The ViewShellBase is used to get the XLayoutManager and to determine
         the plug in mode.
diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx
index 3c0215f..bba5c73 100644
--- a/sd/source/ui/inc/ViewShell.hxx
+++ b/sd/source/ui/inc/ViewShell.hxx
@@ -34,7 +34,6 @@
 
 #include <com/sun/star/drawing/XDrawSubController.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 class SdPage;
 class SvxRuler;
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx
index 9975cbe..8f7a0b2 100644
--- a/sd/source/ui/inc/ViewShellBase.hxx
+++ b/sd/source/ui/inc/ViewShellBase.hxx
@@ -27,6 +27,7 @@
 #include "glob.hxx"
 #include <sfx2/viewsh.hxx>
 #include <sfx2/viewfac.hxx>
+#include <boost/scoped_ptr.hpp>
 #include <memory>
 
 class SdDrawDocument;
diff --git a/sd/source/ui/view/sdview2.cxx b/sd/source/ui/view/sdview2.cxx
index 612d585..24bff87 100644
--- a/sd/source/ui/view/sdview2.cxx
+++ b/sd/source/ui/view/sdview2.cxx
@@ -66,7 +66,6 @@
 
 #include "slideshow.hxx"
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd {
 
@@ -889,7 +888,7 @@ bool View::GetExchangeList (std::vector<OUString> &rExchangeList,
                 OUString aDesc(SD_RESSTR(STR_DESC_NAMEGROUP));
 
                 SvxAbstractDialogFactory* pFact = SvxAbstractDialogFactory::Create();
-                boost::scoped_ptr<AbstractSvxNameDialog> pDlg;
+                std::unique_ptr<AbstractSvxNameDialog> pDlg;
 
                 if (pFact)
                     pDlg.reset(pFact->CreateSvxNameDialog( mpViewSh->GetActiveWindow(), aNewName, aDesc ));