diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-05-06 23:08:32 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2016-05-06 23:37:11 +0200 |
| commit | e38acc4096c8ece3bf64d285db9628dd1868bce2 (patch) | |
| tree | 4dce0bf38866dfe9b0abc0332d2afd40475e0d48 /sd | |
| parent | 58080e8f78f57e4340bbc428b167472e8e6c05d1 (diff) | |
sd: replace boost::enable_shared_from_this with std::enable...
Change-Id: Ia4f31a03b20bb0abe7e0ff8e423a0b046a828607
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/inc/pch/precompiled_sd.hxx | 1 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx | 4 |
3 files changed, 2 insertions, 5 deletions
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx index 40a5d6125674..f6876624a866 100644 --- a/sd/inc/pch/precompiled_sd.hxx +++ b/sd/inc/pch/precompiled_sd.hxx @@ -43,7 +43,6 @@ #include <utility> #include <vector> #include <boost/intrusive_ptr.hpp> -#include <boost/limits.hpp> #include <boost/optional.hpp> #include <boost/optional/optional.hpp> #include <boost/property_tree/json_parser.hpp> diff --git a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx index 6bb7399570c4..b56a319dadec 100644 --- a/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx +++ b/sd/source/ui/slidesorter/controller/SlsScrollBarManager.cxx @@ -30,8 +30,6 @@ #include "Window.hxx" #include "sdpage.hxx" -#include <boost/limits.hpp> - #include <vcl/scrbar.hxx> namespace sd { namespace slidesorter { namespace controller { diff --git a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx index 120b38c254b0..88073c89fc31 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsPageDescriptor.hxx @@ -26,7 +26,7 @@ #include <vcl/bitmap.hxx> #include <sfx2/viewfrm.hxx> -#include <boost/enable_shared_from_this.hpp> +#include <memory> class SdPage; class SdrPage; @@ -44,7 +44,7 @@ namespace sd { namespace slidesorter { namespace model { fade symbol.</p> */ class PageDescriptor - : public ::boost::enable_shared_from_this<PageDescriptor> + : public ::std::enable_shared_from_this<PageDescriptor> { public: /** Create a PageDescriptor for the given SdPage object. |