diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-09-25 07:16:42 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-25 08:52:03 +0000 |
| commit | 9a85fea2377f20a47bd08ef65148d09c6ff7df83 (patch) | |
| tree | 848d8cb1572337684097614c50969a0115aaf055 /sd | |
| parent | c29ea22b899f24dab3eecce9df8c70544f044e1b (diff) | |
sd/source/ui/sidebar std->boost
Change-Id: Ia147e1720b1e83ccf0d382ff0020e49f34ce9d21
Reviewed-on: https://gerrit.libreoffice.org/18836
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/sidebar/MasterPageContainer.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPageContainerQueue.hxx | 3 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 |
3 files changed, 3 insertions, 4 deletions
diff --git a/sd/source/ui/sidebar/MasterPageContainer.cxx b/sd/source/ui/sidebar/MasterPageContainer.cxx index ce92d85b776b..55a1b3abb104 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 de0c4c25e921..e8b1553ac546 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 19d6ad792fb8..13b7972c727b 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; |