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

[Caolán McNamara]

 sd/source/ui/inc/pubdlg.hxx    |    3 +--
 sd/source/ui/view/drviewsa.cxx |    3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 6dbc69bdf44f1933687b93b4c1838b57804ecc17
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Sep 25 14:53:49 2015 +0100

    boost->std
    
    Change-Id: I329aabf1621b91756cd277bd0c56a2988c9ad1c0
    Reviewed-on: https://gerrit.libreoffice.org/18872
    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/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx
index 9d04829..9abdd7b 100644
--- a/sd/source/ui/inc/pubdlg.hxx
+++ b/sd/source/ui/inc/pubdlg.hxx
@@ -33,7 +33,6 @@
 
 #include <memory>
 #include <boost/ptr_container/ptr_vector.hpp>
-#include <boost/scoped_ptr.hpp>
 
 class FixedText;
 class RadioButton;
@@ -146,7 +145,7 @@ private:
     VclPtr<RadioButton>    pPage6_DocColors;
     VclPtr<SdHtmlAttrPreview>  pPage6_Preview;
 
-    boost::scoped_ptr< ButtonSet > mpButtonSet;
+    std::unique_ptr< ButtonSet > mpButtonSet;
 
     // standard controls
     VclPtr<PushButton>     pLastPageButton;
diff --git a/sd/source/ui/view/drviewsa.cxx b/sd/source/ui/view/drviewsa.cxx
index e1cbfd9..e2ff209 100644
--- a/sd/source/ui/view/drviewsa.cxx
+++ b/sd/source/ui/view/drviewsa.cxx
@@ -70,7 +70,6 @@
 
 #include <boost/bind.hpp>
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -554,7 +553,7 @@ void DrawViewShell::GetStatusBarState(SfxItemSet& rSet)
         }
         else
         {
-            boost::scoped_ptr<SvxZoomItem> pZoomItem;
+            std::unique_ptr<SvxZoomItem> pZoomItem;
             sal_uInt16 nZoom = (sal_uInt16) GetActiveWindow()->GetZoom();
 
             if( mbZoomOnPage )