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

[Caolán McNamara]

 sd/source/filter/html/HtmlOptionsDialog.cxx |    3 +--
 sd/source/filter/html/htmlex.hxx            |    3 +--
 sd/source/filter/ppt/pptinanimations.cxx    |    3 +--
 3 files changed, 3 insertions(+), 6 deletions(-)

New commits:
commit 4266cd19650269c94c63168d1e9cbc105ff297f9
Author: Caolán McNamara <caol...@redhat.com>
Date:   Thu Sep 24 10:48:53 2015 +0100

    sd/source/filter boost::scoped_ptr->std::unique_ptr
    
    Change-Id: I335ff685def480933d846657df81f28242059c18
    Reviewed-on: https://gerrit.libreoffice.org/18823
    Tested-by: Jenkins <c...@libreoffice.org>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>
    Tested-by: Caolán McNamara <caol...@redhat.com>

diff --git a/sd/source/filter/html/HtmlOptionsDialog.cxx 
b/sd/source/filter/html/HtmlOptionsDialog.cxx
index 12165da..a094807 100644
--- a/sd/source/filter/html/HtmlOptionsDialog.cxx
+++ b/sd/source/filter/html/HtmlOptionsDialog.cxx
@@ -48,7 +48,6 @@ using namespace com::sun::star::ui::dialogs;
 #include "pres.hxx"
 #include "sdabstdlg.hxx"
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 class SdHtmlOptionsDialog : public cppu::WeakImplHelper
 <
@@ -199,7 +198,7 @@ sal_Int16 SdHtmlOptionsDialog::execute()
     SdAbstractDialogFactory* pFact = SdAbstractDialogFactory::Create();
     if( pFact )
     {
-        boost::scoped_ptr<AbstractSdPublishingDlg> 
pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType 
));
+        std::unique_ptr<AbstractSdPublishingDlg> 
pDlg(pFact->CreateSdPublishingDlg( Application::GetDefDialogParent(), meDocType 
));
         if( pDlg )
         {
             if( pDlg->Execute() )
diff --git a/sd/source/filter/html/htmlex.hxx b/sd/source/filter/html/htmlex.hxx
index 34b6caa3..72428c5 100644
--- a/sd/source/filter/html/htmlex.hxx
+++ b/sd/source/filter/html/htmlex.hxx
@@ -38,7 +38,6 @@
 #include "htmlpublishmode.hxx"
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 #include <vector>
 
 #define PUB_LOWRES_WIDTH    640
@@ -143,7 +142,7 @@ class HtmlExport
 
     const OUString maHTMLHeader;
 
-    boost::scoped_ptr< ButtonSet > mpButtonSet;
+    std::unique_ptr< ButtonSet > mpButtonSet;
 
     static SdrTextObj* GetLayoutTextObject(SdrPage* pPage);
 
diff --git a/sd/source/filter/ppt/pptinanimations.cxx 
b/sd/source/filter/ppt/pptinanimations.cxx
index c9a46c1..3b81999 100644
--- a/sd/source/filter/ppt/pptinanimations.cxx
+++ b/sd/source/filter/ppt/pptinanimations.cxx
@@ -68,7 +68,6 @@
 
 #include <algorithm>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 using ::std::map;
 using ::com::sun::star::beans::NamedValue;
@@ -223,7 +222,7 @@ int AnimationImporter::import( const Reference< XDrawPage 
>& xPage, const DffRec
         {
             Reference< XAnimationNode > xParent;
 
-            boost::scoped_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, 
mrStCtrl ));
+            std::unique_ptr<Atom> pAtom(Atom::import( rProgTagContentHd, 
mrStCtrl ));
             if( pAtom )
             {
                 nNodes = importAnimationContainer( pAtom.get(), xParent );

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits