diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-18 09:09:12 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-23 11:19:17 +0000 |
commit | 177ea7a2818ee64de3eaa9b587d70fe461468005 (patch) | |
tree | 60d3838c3f7daff05fc94e4bf2d7c83b2c013041 /sd/source/ui/inc/SlideSorter.hxx | |
parent | a44e03b5d7822d026a3b2fbaf039522f085defed (diff) |
boost::shared_ptr->std::shared_ptr
Change-Id: I2c6ac98f0984534894759cfbf4449eb554801cf8
Reviewed-on: https://gerrit.libreoffice.org/18678
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/source/ui/inc/SlideSorter.hxx')
-rw-r--r-- | sd/source/ui/inc/SlideSorter.hxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 42dc811b68c4..c2f302ced4e3 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -26,10 +26,10 @@ #include <cppuhelper/weakref.hxx> #include <sfx2/viewfrm.hxx> #include <boost/noncopyable.hpp> -#include <boost/shared_ptr.hpp> -#include <boost/scoped_ptr.hpp> #include <boost/current_function.hpp> #include <vcl/scrbar.hxx> +#include <memory> +#include <boost/scoped_ptr.hpp> class ScrollBar; class ScrollBarBox; @@ -95,7 +95,7 @@ public: The little square enclosed by the two scroll bars. Typically the one from the ViewShell. */ - static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( + static std::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShell& rViewShell, sd::Window* pContentWindow, ScrollBar* pHorizontalScrollBar, @@ -112,7 +112,7 @@ public: The parent window of the internally created content window and scroll bars. */ - static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( + static std::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, vcl::Window& rParentWindow); @@ -179,11 +179,11 @@ public: /** Return a collection of properties that are used throughout the slide sorter. */ - ::boost::shared_ptr<controller::Properties> GetProperties() const; + std::shared_ptr<controller::Properties> GetProperties() const; /** Return the active theme which gives access to colors and fonts. */ - ::boost::shared_ptr<view::Theme> GetTheme() const; + std::shared_ptr<view::Theme> GetTheme() const; protected: /** This virtual method makes it possible to create a specialization of @@ -234,8 +234,8 @@ private: /** Some slide sorter wide properties that are used in different classes. */ - ::boost::shared_ptr<controller::Properties> mpProperties; - ::boost::shared_ptr<view::Theme> mpTheme; + std::shared_ptr<controller::Properties> mpProperties; + std::shared_ptr<view::Theme> mpTheme; SlideSorter ( ViewShell& rViewShell, |