diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2015-09-17 18:59:32 +0100 |
commit | d030c4a2a54418b17e87f837092a33eae21f0588 (patch) | |
tree | dd80ff3ba78eaa03e98efeb87e9160c6cd7524c5 /sd/source/ui/inc/ViewShellBase.hxx | |
parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/inc/ViewShellBase.hxx')
-rw-r--r-- | sd/source/ui/inc/ViewShellBase.hxx | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/sd/source/ui/inc/ViewShellBase.hxx b/sd/source/ui/inc/ViewShellBase.hxx index 6ce7e4d5ed04..832add5cfb3f 100644 --- a/sd/source/ui/inc/ViewShellBase.hxx +++ b/sd/source/ui/inc/ViewShellBase.hxx @@ -27,7 +27,8 @@ #include "glob.hxx" #include <sfx2/viewsh.hxx> #include <sfx2/viewfac.hxx> -#include <memory> +#include <boost/shared_ptr.hpp> +#include <boost/scoped_ptr.hpp> class SdDrawDocument; class SfxRequest; @@ -84,13 +85,13 @@ public: */ void LateInit (const OUString& rsDefaultView); - std::shared_ptr<ViewShellManager> GetViewShellManager() const; + ::boost::shared_ptr<ViewShellManager> GetViewShellManager() const; /** Return the main view shell stacked on the called ViewShellBase object. This is usually the view shell displayed in the center pane. */ - std::shared_ptr<ViewShell> GetMainViewShell() const; + ::boost::shared_ptr<ViewShell> GetMainViewShell() const; /** When given a view frame this static method returns the corresponding sd::ViewShellBase object. @@ -200,15 +201,15 @@ public: events from various sources. This method must not be called before LateInit() has terminated. */ - std::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer(); + ::boost::shared_ptr<tools::EventMultiplexer> GetEventMultiplexer(); /** returns the complete area of the current view relative to the frame window */ const Rectangle& getClientRectangle() const; - std::shared_ptr<ToolBarManager> GetToolBarManager() const; - std::shared_ptr<FormShellManager> GetFormShellManager() const; + ::boost::shared_ptr<ToolBarManager> GetToolBarManager() const; + ::boost::shared_ptr<FormShellManager> GetFormShellManager() const; DrawController& GetDrawController() const; @@ -233,7 +234,7 @@ protected: private: class Implementation; - std::unique_ptr<Implementation> mpImpl; + ::boost::scoped_ptr<Implementation> mpImpl; DrawDocShell* mpDocShell; SdDrawDocument* mpDocument; |