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

[Caolán McNamara]

 sd/source/ui/sidebar/MasterPageContainer.cxx      |    2 +-
 sd/source/ui/sidebar/MasterPageContainerQueue.hxx |    3 +--
 sd/source/ui/sidebar/MasterPagesSelector.cxx      |    2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

New commits:
commit 9a85fea2377f20a47bd08ef65148d09c6ff7df83
Author: Caolán McNamara <caol...@redhat.com>
Date:   Fri Sep 25 07:16:42 2015 +0100

    sd/source/ui/sidebar std->boost
    
    Change-Id: Ia147e1720b1e83ccf0d382ff0020e49f34ce9d21
    Reviewed-on: https://gerrit.libreoffice.org/18836
    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/ui/sidebar/MasterPageContainer.cxx 
b/sd/source/ui/sidebar/MasterPageContainer.cxx
index ce92d85..55a1b3a 100644
--- a/sd/source/ui/sidebar/MasterPageContainer.cxx
+++ b/sd/source/ui/sidebar/MasterPageContainer.cxx
@@ -131,7 +131,7 @@ private:
 
     enum InitializationState { NOT_INITIALIZED, INITIALIZING, INITIALIZED } 
meInitializationState;
 
-    ::boost::scoped_ptr<MasterPageContainerQueue> mpRequestQueue;
+    std::unique_ptr<MasterPageContainerQueue> mpRequestQueue;
     ::com::sun::star::uno::Reference<com::sun::star::frame::XModel> mxModel;
     SdDrawDocument* mpDocument;
     PreviewRenderer maPreviewRenderer;
diff --git a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx 
b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
index de0c4c2..e8b1553 100644
--- a/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
+++ b/sd/source/ui/sidebar/MasterPageContainerQueue.hxx
@@ -24,7 +24,6 @@
 #include "MasterPageDescriptor.hxx"
 
 #include <memory>
-#include <boost/scoped_ptr.hpp>
 
 namespace sd { namespace sidebar {
 
@@ -81,7 +80,7 @@ private:
     std::weak_ptr<ContainerAdapter> mpWeakContainer;
     class PreviewCreationRequest;
     class RequestQueue;
-    ::boost::scoped_ptr<RequestQueue> mpRequestQueue;
+    std::unique_ptr<RequestQueue> mpRequestQueue;
     Timer maDelayedPreviewCreationTimer;
     sal_uInt32 mnRequestsServedCount;
 
diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx 
b/sd/source/ui/sidebar/MasterPagesSelector.cxx
index 19d6ad7..13b7972 100644
--- a/sd/source/ui/sidebar/MasterPagesSelector.cxx
+++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx
@@ -59,7 +59,7 @@
 #include <sfx2/request.hxx>
 #include <svl/itempool.hxx>
 #include <sfx2/sidebar/Theme.hxx>
-#include <boost/scoped_ptr.hpp>
+#include <memory>
 
 using namespace ::com::sun::star::text;
 

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