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

Change-Id: I82c7084f203a834c2d42f9527705288e6036019b

3 files changed, 13 insertions, 13 deletions

diff --git a/sd/source/ui/tools/PreviewRenderer.cxx b/sd/source/ui/tools/PreviewRenderer.cxx
index 81b7ab176041..b5b9645a6587 100644
--- a/sd/source/ui/tools/PreviewRenderer.cxx
+++ b/sd/source/ui/tools/PreviewRenderer.cxx
@@ -36,7 +36,7 @@
 #include <svx/sdr/contact/viewobjectcontact.hxx>
 #include <svx/sdr/contact/viewcontact.hxx>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
@@ -308,7 +308,7 @@ void PreviewRenderer::PaintPage (
     }
 
     // Use a special redirector to prevent PresObj shapes from being painted.
-    std::unique_ptr<ViewRedirector> pRedirector;
+    boost::scoped_ptr<ViewRedirector> pRedirector;
     if ( ! bDisplayPresentationObjects)
         pRedirector.reset(new ViewRedirector());
 
diff --git a/sd/source/ui/tools/SdGlobalResourceContainer.cxx b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
index d6c0a02cf701..88eab7dd0518 100644
--- a/sd/source/ui/tools/SdGlobalResourceContainer.cxx
+++ b/sd/source/ui/tools/SdGlobalResourceContainer.cxx
@@ -43,7 +43,7 @@ private:
     typedef ::std::vector<SdGlobalResource*> ResourceList;
     ResourceList maResources;
 
-    typedef ::std::vector<std::shared_ptr<SdGlobalResource> > SharedResourceList;
+    typedef ::std::vector<boost::shared_ptr<SdGlobalResource> > SharedResourceList;
     SharedResourceList maSharedResources;
 
     typedef ::std::vector<Reference<XInterface> > XInterfaceResourceList;
@@ -89,7 +89,7 @@ void SdGlobalResourceContainer::AddResource (
 }
 
 void SdGlobalResourceContainer::AddResource (
-    std::shared_ptr<SdGlobalResource> pResource)
+    ::boost::shared_ptr<SdGlobalResource> pResource)
 {
     ::osl::MutexGuard aGuard (mpImpl->maMutex);
 
diff --git a/sd/source/ui/tools/TimerBasedTaskExecution.cxx b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
index 039606ea62a1..a6b1299834ce 100644
--- a/sd/source/ui/tools/TimerBasedTaskExecution.cxx
+++ b/sd/source/ui/tools/TimerBasedTaskExecution.cxx
@@ -21,8 +21,8 @@
 #include "tools/AsynchronousTask.hxx"
 #include <tools/time.hxx>
 #include <osl/diagnose.h>
+#include <boost/weak_ptr.hpp>
 #include "sal/log.hxx"
-#include <memory>
 
 namespace sd { namespace tools {
 
@@ -37,12 +37,12 @@ public:
     }
 };
 
-std::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create (
-    const std::shared_ptr<AsynchronousTask>& rpTask,
+::boost::shared_ptr<TimerBasedTaskExecution> TimerBasedTaskExecution::Create (
+    const ::boost::shared_ptr<AsynchronousTask>& rpTask,
     sal_uInt32 nMillisecondsBetweenSteps,
     sal_uInt32 nMaxTimePerStep)
 {
-    std::shared_ptr<TimerBasedTaskExecution> pExecution(
+    ::boost::shared_ptr<TimerBasedTaskExecution> pExecution(
         new TimerBasedTaskExecution(rpTask,nMillisecondsBetweenSteps,nMaxTimePerStep),
         Deleter());
     // Let the new object have a shared_ptr to itself, so that it can
@@ -60,16 +60,16 @@ void TimerBasedTaskExecution::Release()
 
 //static
 void TimerBasedTaskExecution::ReleaseTask (
-    const std::weak_ptr<TimerBasedTaskExecution>& rpExecution)
+    const ::boost::weak_ptr<TimerBasedTaskExecution>& rpExecution)
 {
     if ( ! rpExecution.expired())
     {
         try
         {
-            std::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution);
+            ::boost::shared_ptr<tools::TimerBasedTaskExecution> pExecution (rpExecution);
             pExecution->Release();
         }
-        catch (const std::bad_weak_ptr&)
+        catch (const ::boost::bad_weak_ptr&)
         {
             // When a bad_weak_ptr has been thrown then the object pointed
             // to by rpTask has been released right after we checked that it
@@ -80,7 +80,7 @@ void TimerBasedTaskExecution::ReleaseTask (
 }
 
 TimerBasedTaskExecution::TimerBasedTaskExecution (
-    const std::shared_ptr<AsynchronousTask>& rpTask,
+    const ::boost::shared_ptr<AsynchronousTask>& rpTask,
     sal_uInt32 nMillisecondsBetweenSteps,
     sal_uInt32 nMaxTimePerStep)
     : mpTask(rpTask),
@@ -100,7 +100,7 @@ TimerBasedTaskExecution::~TimerBasedTaskExecution()
 }
 
 void TimerBasedTaskExecution::SetSelf (
-    const std::shared_ptr<TimerBasedTaskExecution>& rpSelf)
+    const ::boost::shared_ptr<TimerBasedTaskExecution>& rpSelf)
 {
     if (mpTask.get() != NULL)
         mpSelf = rpSelf;