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

Caolán McNamara caolanm at redhat.com
Thu Sep 24 01:17:37 PDT 2015


 sd/inc/stlsheet.hxx |    3 +--
 sd/inc/undoanim.hxx |    7 +++----
 2 files changed, 4 insertions(+), 6 deletions(-)

New commits:
commit 876e63e6295573e50886e37b3ca31716e0401af1
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Sep 21 14:45:13 2015 +0100

    sd/inc boost::scoped_ptr->std::unique_ptr
    
    Change-Id: I3830c451f685d7603c0271107bd1a0d477be464b
    Reviewed-on: https://gerrit.libreoffice.org/18749
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index a9a49d3..d1e64ba 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -38,7 +38,6 @@
 #include <editeng/unoipset.hxx>
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 #include "prlayout.hxx"
 
@@ -147,7 +146,7 @@ protected:
     /** broadcast helper for events */
     ::cppu::OBroadcastHelper mrBHelper;
 
-    boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
+    std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
 
 private:
     SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index be2eea8..66e2823 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -24,7 +24,6 @@
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <svx/svdundo.hxx>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 #include "sdundo.hxx"
 
@@ -47,7 +46,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    boost::scoped_ptr<UndoAnimationImpl>  mpImpl;
+    std::unique_ptr<UndoAnimationImpl>  mpImpl;
 };
 
 struct UndoAnimationPathImpl;
@@ -63,7 +62,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    boost::scoped_ptr<UndoAnimationPathImpl> mpImpl;
+    std::unique_ptr<UndoAnimationPathImpl> mpImpl;
 };
 
 struct UndoTransitionImpl;
@@ -80,7 +79,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    boost::scoped_ptr<UndoTransitionImpl> mpImpl;
+    std::unique_ptr<UndoTransitionImpl> mpImpl;
 };
 
 }


More information about the Libreoffice-commits mailing list