diff options
Diffstat (limited to 'sd/source/ui/inc/SlideSorter.hxx')
-rw-r--r-- | sd/source/ui/inc/SlideSorter.hxx | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/sd/source/ui/inc/SlideSorter.hxx b/sd/source/ui/inc/SlideSorter.hxx index 0b7273a23abd..42dc811b68c4 100644 --- a/sd/source/ui/inc/SlideSorter.hxx +++ b/sd/source/ui/inc/SlideSorter.hxx @@ -26,9 +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> class ScrollBar; class ScrollBarBox; @@ -94,7 +95,7 @@ public: The little square enclosed by the two scroll bars. Typically the one from the ViewShell. */ - static std::shared_ptr<SlideSorter> CreateSlideSorter ( + static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShell& rViewShell, sd::Window* pContentWindow, ScrollBar* pHorizontalScrollBar, @@ -111,7 +112,7 @@ public: The parent window of the internally created content window and scroll bars. */ - static std::shared_ptr<SlideSorter> CreateSlideSorter ( + static ::boost::shared_ptr<SlideSorter> CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, vcl::Window& rParentWindow); @@ -178,11 +179,11 @@ public: /** Return a collection of properties that are used throughout the slide sorter. */ - std::shared_ptr<controller::Properties> GetProperties() const; + ::boost::shared_ptr<controller::Properties> GetProperties() const; /** Return the active theme which gives access to colors and fonts. */ - std::shared_ptr<view::Theme> GetTheme() const; + ::boost::shared_ptr<view::Theme> GetTheme() const; protected: /** This virtual method makes it possible to create a specialization of @@ -214,9 +215,9 @@ protected: private: bool mbIsValid; - std::unique_ptr<controller::SlideSorterController> mpSlideSorterController; - std::unique_ptr<model::SlideSorterModel> mpSlideSorterModel; - std::unique_ptr<view::SlideSorterView> mpSlideSorterView; + ::boost::scoped_ptr<controller::SlideSorterController> mpSlideSorterController; + ::boost::scoped_ptr<model::SlideSorterModel> mpSlideSorterModel; + ::boost::scoped_ptr<view::SlideSorterView> mpSlideSorterView; ::com::sun::star::uno::WeakReference<com::sun::star::frame::XController> mxControllerWeak; ViewShell* mpViewShell; ViewShellBase* mpViewShellBase; @@ -233,8 +234,8 @@ private: /** Some slide sorter wide properties that are used in different classes. */ - std::shared_ptr<controller::Properties> mpProperties; - std::shared_ptr<view::Theme> mpTheme; + ::boost::shared_ptr<controller::Properties> mpProperties; + ::boost::shared_ptr<view::Theme> mpTheme; SlideSorter ( ViewShell& rViewShell, |