revert for mac and win unit case crashes after boost->std

Change-Id: I82c7084f203a834c2d42f9527705288e6036019b

4 files changed, 12 insertions, 12 deletions

diff --git a/sd/source/ui/slideshow/SlideShowRestarter.cxx b/sd/source/ui/slideshow/SlideShowRestarter.cxx
index be3db6ab1958..42417ad7ccaa 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.cxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.cxx
@@ -100,7 +100,7 @@ IMPL_LINK_NOARG_TYPED(SlideShowRestarter, EndPresentation, void*, void)
             // restart of the slide show.
             if (mpViewShellBase != NULL)
             {
-                ::std::shared_ptr<FrameworkHelper> pHelper(
+                ::boost::shared_ptr<FrameworkHelper> pHelper(
                     FrameworkHelper::Instance(*mpViewShellBase));
                 if (pHelper->GetConfigurationController()->getResource(
                     FrameworkHelper::CreateResourceId(FrameworkHelper::msFullScreenPaneURL)).is())
diff --git a/sd/source/ui/slideshow/SlideShowRestarter.hxx b/sd/source/ui/slideshow/SlideShowRestarter.hxx
index 240d6ec77ef7..42b494c91fd0 100644
--- a/sd/source/ui/slideshow/SlideShowRestarter.hxx
+++ b/sd/source/ui/slideshow/SlideShowRestarter.hxx
@@ -24,7 +24,7 @@
 #include "ViewShellBase.hxx"
 #include <rtl/ref.hxx>
 #include <tools/link.hxx>
-#include <memory>
+#include <boost/enable_shared_from_this.hpp>
 
 namespace sd {
 
@@ -37,7 +37,7 @@ namespace sd {
     opportunity to show or hide depending on the number of available displays.
 */
 class SlideShowRestarter
-    : public std::enable_shared_from_this<SlideShowRestarter>
+    : public boost::enable_shared_from_this<SlideShowRestarter>
 {
 public:
     /** Create a new SlideShowRestarter object.
@@ -64,7 +64,7 @@ private:
     ImplSVEvent * mnEventId;
     ::rtl::Reference<SlideShow> mpSlideShow;
     ViewShellBase* mpViewShellBase;
-    ::std::shared_ptr<SlideShowRestarter> mpSelf;
+    ::boost::shared_ptr<SlideShowRestarter> mpSelf;
     sal_Int32 mnDisplayCount;
     SfxDispatcher* mpDispatcher;
     sal_Int32 mnCurrentSlideNumber;
diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx
index a04d0cd08b0a..46cec5f87145 100644
--- a/sd/source/ui/slideshow/slideshow.cxx
+++ b/sd/source/ui/slideshow/slideshow.cxx
@@ -94,7 +94,7 @@ namespace {
         }
 
     private:
-        ::std::shared_ptr<SlideShowRestarter> mpRestarter;
+        ::boost::shared_ptr<SlideShowRestarter> mpRestarter;
     };
 }
 
@@ -701,7 +701,7 @@ void SAL_CALL SlideShow::end()
                 // Get the shell pointer in its own scope to be sure that
                 // the shared_ptr to the shell is released before DoClose()
                 // is called.
-                ::std::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
+                ::boost::shared_ptr<ViewShell> pSharedView (pFullScreenViewShellBase->GetMainViewShell());
                 pShell = dynamic_cast<PresentationViewShell*>(pSharedView.get());
             }
             if( pShell && pShell->GetViewFrame() )
@@ -973,7 +973,7 @@ void SlideShow::activate( ViewShellBase& rBase )
 {
     if( (mpFullScreenViewShellBase == &rBase) && !mxController.is() )
     {
-        ::std::shared_ptr<PresentationViewShell> pShell = std::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
+        ::boost::shared_ptr<PresentationViewShell> pShell = ::boost::dynamic_pointer_cast<PresentationViewShell>(rBase.GetMainViewShell());
         if(pShell.get() != NULL)
         {
             pShell->FinishInitialization( mpFullScreenFrameView );
@@ -1093,8 +1093,8 @@ void SlideShow::StartInPlacePresentation()
 
         ViewShell::ShellType eShell = ViewShell::ST_NONE;
 
-        ::std::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
-        ::std::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
+        ::boost::shared_ptr<FrameworkHelper> pHelper(FrameworkHelper::Instance(*mpCurrentViewShellBase));
+        ::boost::shared_ptr<ViewShell> pMainViewShell(pHelper->GetViewShell(FrameworkHelper::msCenterPaneURL));
 
         if( pMainViewShell.get() )
             eShell = pMainViewShell->GetShellType();
@@ -1170,7 +1170,7 @@ void SlideShow::StartFullscreenPresentation( )
         // changes made by the presentation have an effect on the other
         // view shells.
         FrameView* pOriginalFrameView = 0;
-        ::std::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
+        ::boost::shared_ptr<ViewShell> xShell(mpCurrentViewShellBase->GetMainViewShell());
         if (xShell.get())
             pOriginalFrameView = xShell->GetFrameView();
 
diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx
index 6cf680235c3d..a7af2838e268 100644
--- a/sd/source/ui/slideshow/slideshowimpl.hxx
+++ b/sd/source/ui/slideshow/slideshowimpl.hxx
@@ -112,7 +112,7 @@ struct WrappedShapeEventImpl
     WrappedShapeEventImpl() : meClickAction( css::presentation::ClickAction_NONE ), mnVerb( 0 ) {};
 };
 
-typedef std::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
+typedef boost::shared_ptr< WrappedShapeEventImpl > WrappedShapeEventImplPtr;
 typedef std::map< css::uno::Reference< css::drawing::XShape >, WrappedShapeEventImplPtr > WrappedShapeEventImplMap;
 
 class SlideShowListenerProxy : private ::cppu::BaseMutex,
@@ -336,7 +336,7 @@ private:
     VclPtr<ShowWindow>     mpShowWindow;
     VclPtr<PushButton>     mpTimeButton;
 
-    std::shared_ptr< AnimationSlideController > mpSlideController;
+    boost::shared_ptr< AnimationSlideController > mpSlideController;
 
     long            mnRestoreSlide;
     Point           maSlideOrigin;