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/slidesorter/shell/SlideSorter.cxx | |
parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/source/ui/slidesorter/shell/SlideSorter.cxx')
-rw-r--r-- | sd/source/ui/slidesorter/shell/SlideSorter.cxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/slidesorter/shell/SlideSorter.cxx b/sd/source/ui/slidesorter/shell/SlideSorter.cxx index dc574435e73b..fd45631f4a08 100644 --- a/sd/source/ui/slidesorter/shell/SlideSorter.cxx +++ b/sd/source/ui/slidesorter/shell/SlideSorter.cxx @@ -69,14 +69,14 @@ private: //===== SlideSorter =========================================================== -std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( +::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( ViewShell& rViewShell, sd::Window* pContentWindow, ScrollBar* pHorizontalScrollBar, ScrollBar* pVerticalScrollBar, ScrollBarBox* pScrollBarBox) { - std::shared_ptr<SlideSorter> pSlideSorter( + ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( rViewShell, pContentWindow, @@ -87,12 +87,12 @@ std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter( return pSlideSorter; } -std::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( +::boost::shared_ptr<SlideSorter> SlideSorter::CreateSlideSorter ( ViewShellBase& rBase, ViewShell* pViewShell, vcl::Window& rParentWindow) { - std::shared_ptr<SlideSorter> pSlideSorter( + ::boost::shared_ptr<SlideSorter> pSlideSorter( new SlideSorter( rBase, pViewShell, @@ -419,13 +419,13 @@ void SlideSorter::SetCurrentFunction (const rtl::Reference<FuPoor>& rpFunction) } } -std::shared_ptr<controller::Properties> SlideSorter::GetProperties() const +::boost::shared_ptr<controller::Properties> SlideSorter::GetProperties() const { OSL_ASSERT(mpProperties); return mpProperties; } -std::shared_ptr<view::Theme> SlideSorter::GetTheme() const +::boost::shared_ptr<view::Theme> SlideSorter::GetTheme() const { OSL_ASSERT(mpTheme); return mpTheme; |