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

Change-Id: I82c7084f203a834c2d42f9527705288e6036019b

10 files changed, 42 insertions, 27 deletions

diff --git a/sd/inc/CustomAnimationEffect.hxx b/sd/inc/CustomAnimationEffect.hxx
index 97f1ccf7c4f9..c4f892b5f2ed 100644
--- a/sd/inc/CustomAnimationEffect.hxx
+++ b/sd/inc/CustomAnimationEffect.hxx
@@ -26,13 +26,14 @@
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/util/XChangesListener.hpp>
 
+#include <boost/shared_ptr.hpp>
+
 #include <vcl/timer.hxx>
 
 #include <sddllapi.h>
 
 #include <list>
 #include <map>
-#include <memory>
 
 class SdrPathObj;
 
@@ -43,9 +44,9 @@ enum EValue { VALUE_FROM, VALUE_TO, VALUE_BY, VALUE_FIRST, VALUE_LAST };
 class CustomAnimationEffect;
 
 class CustomAnimationPreset;
-typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
 
-typedef std::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
+typedef boost::shared_ptr< CustomAnimationEffect > CustomAnimationEffectPtr;
 
 typedef std::list< CustomAnimationEffectPtr > EffectSequence;
 
@@ -258,7 +259,7 @@ private:
     sal_Int32 mnGroupId;
 };
 
-typedef std::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
+typedef boost::shared_ptr< CustomAnimationTextGroup > CustomAnimationTextGroupPtr;
 typedef std::map< sal_Int32, CustomAnimationTextGroupPtr > CustomAnimationTextGroupMap;
 
 class SD_DLLPUBLIC EffectSequenceHelper
@@ -361,7 +362,7 @@ private:
     MainSequence*   mpMainSequence;
 };
 
-typedef std::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
+typedef boost::shared_ptr< InteractiveSequence > InteractiveSequencePtr;
 typedef std::list< InteractiveSequencePtr > InteractiveSequenceList;
 
 class MainSequence : public EffectSequenceHelper, public ISequenceListener
@@ -434,7 +435,7 @@ protected:
     sal_Int32 mbIgnoreChanges;
 };
 
-typedef std::shared_ptr< MainSequence > MainSequencePtr;
+typedef boost::shared_ptr< MainSequence > MainSequencePtr;
 
 class MainSequenceRebuildGuard
 {
diff --git a/sd/inc/CustomAnimationPreset.hxx b/sd/inc/CustomAnimationPreset.hxx
index 1f7abce5a724..1c447f0b4870 100644
--- a/sd/inc/CustomAnimationPreset.hxx
+++ b/sd/inc/CustomAnimationPreset.hxx
@@ -22,9 +22,9 @@
 
 #include <sal/config.h>
 
-#include <memory>
 #include <vector>
 
+#include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/animations/AnimationNodeType.hpp>
 
@@ -71,7 +71,7 @@ private:
     EffectsSubTypeMap maSubTypes;
 };
 
-typedef std::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
+typedef boost::shared_ptr< CustomAnimationPreset > CustomAnimationPresetPtr;
 typedef std::unordered_map<OUString, CustomAnimationPresetPtr, OUStringHash> EffectDescriptorMap;
 typedef std::vector< CustomAnimationPresetPtr > EffectDescriptorList;
 
@@ -83,7 +83,7 @@ struct PresetCategory
     PresetCategory( const OUString& rLabel, const EffectDescriptorList& rEffects )
         : maLabel( rLabel ), maEffects( rEffects ) {}
 };
-typedef std::shared_ptr< PresetCategory > PresetCategoryPtr;
+typedef boost::shared_ptr< PresetCategory > PresetCategoryPtr;
 typedef std::vector< PresetCategoryPtr > PresetCategoryList;
 
 class SD_DLLPUBLIC CustomAnimationPresets
diff --git a/sd/inc/Outliner.hxx b/sd/inc/Outliner.hxx
index fda3206e92d2..a97d2092ecc5 100644
--- a/sd/inc/Outliner.hxx
+++ b/sd/inc/Outliner.hxx
@@ -26,6 +26,8 @@
 #include "OutlinerIterator.hxx"
 #include <editeng/SpellPortions.hxx>
 #include <memory>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 #include <boost/noncopyable.hpp>
 
 class Dialog;
@@ -181,7 +183,7 @@ private:
         pointer to avoid keeping it alive when the view is changed
         during searching.
     */
-    std::weak_ptr<ViewShell> mpWeakViewShell;
+    ::boost::weak_ptr<ViewShell> mpWeakViewShell;
     /// This window contains the view.
     VclPtr< ::sd::Window> mpWindow;
     /// The document on whose objects and pages this class operates.
@@ -502,7 +504,7 @@ private:
         It handles i.e. registering at the associated view as selection
         change listener.
     */
-    void SetViewShell (const std::shared_ptr<ViewShell>& rpViewShell);
+    void SetViewShell (const ::boost::shared_ptr<ViewShell>& rpViewShell);
 
     /** Activate or deactivate the search in the current selection.  Call
         this method whenever the selection has changed.  This method creates
diff --git a/sd/inc/OutlinerIterator.hxx b/sd/inc/OutlinerIterator.hxx
index 6d9b9189d0f2..43c47b3a2ffb 100644
--- a/sd/inc/OutlinerIterator.hxx
+++ b/sd/inc/OutlinerIterator.hxx
@@ -24,8 +24,8 @@
 
 #include "pres.hxx"
 #include "sal/types.h"
-#include <memory>
 #include <vector>
+#include <boost/shared_ptr.hpp>
 
 class SdDrawDocument;
 
@@ -244,7 +244,7 @@ private:
     static Iterator CreateSelectionIterator (
         const ::std::vector<SdrObjectWeakRef>& rObjectList,
         SdDrawDocument* pDocument,
-        const std::shared_ptr<ViewShell>& rpViewShell,
+        const ::boost::shared_ptr<ViewShell>& rpViewShell,
         bool bDirectionIsForward=true,
         IteratorLocation aLocation=BEGIN);
 
@@ -261,7 +261,7 @@ private:
     */
     static Iterator CreateDocumentIterator (
         SdDrawDocument* pDocument,
-        const std::shared_ptr<ViewShell>& rpViewShell,
+        const ::boost::shared_ptr<ViewShell>& rpViewShell,
         bool bDirectionIsForward=true,
         IteratorLocation aLocation=BEGIN);
 
@@ -284,7 +284,7 @@ private:
     */
     static sal_Int32 GetPageIndex (
         SdDrawDocument* pDocument,
-        const std::shared_ptr<ViewShell>& rpViewShell,
+        const ::boost::shared_ptr<ViewShell>& rpViewShell,
         PageKind ePageKind,
         EditMode eEditMode,
         bool bDirectionIsForward,
diff --git a/sd/inc/TransitionPreset.hxx b/sd/inc/TransitionPreset.hxx
index 7c4054d65fdd..7420fc84c163 100644
--- a/sd/inc/TransitionPreset.hxx
+++ b/sd/inc/TransitionPreset.hxx
@@ -20,10 +20,10 @@
 #ifndef INCLUDED_SD_INC_TRANSITIONPRESET_HXX
 #define INCLUDED_SD_INC_TRANSITIONPRESET_HXX
 
+#include <boost/shared_ptr.hpp>
 #include <com/sun/star/lang/XMultiServiceFactory.hpp>
 
 #include <list>
-#include <memory>
 #include <unordered_map>
 
 namespace com { namespace sun { namespace star {
@@ -36,7 +36,7 @@ class SdPage;
 namespace sd {
 
 class TransitionPreset;
-typedef std::shared_ptr< TransitionPreset > TransitionPresetPtr;
+typedef boost::shared_ptr< TransitionPreset > TransitionPresetPtr;
 typedef std::list< TransitionPresetPtr > TransitionPresetList;
 typedef std::unordered_map< OUString, OUString, OUStringHash > UStringMap;
 
diff --git a/sd/inc/pch/precompiled_sd.hxx b/sd/inc/pch/precompiled_sd.hxx
index 05d49c8ec761..e8ac76af66d5 100644
--- a/sd/inc/pch/precompiled_sd.hxx
+++ b/sd/inc/pch/precompiled_sd.hxx
@@ -68,11 +68,16 @@
 #include <basic/sbstar.hxx>
 #include <basic/sbx.hxx>
 #include <boost/bind.hpp>
+#include <boost/enable_shared_from_this.hpp>
 #include <boost/limits.hpp>
+#include <boost/make_shared.hpp>
 #include <boost/noncopyable.hpp>
 #include <boost/optional.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 #include <memory>
+#include <boost/scoped_ptr.hpp>
+#include <boost/shared_ptr.hpp>
+#include <boost/weak_ptr.hpp>
 #include <canvas/canvastools.hxx>
 #include <canvas/elapsedtime.hxx>
 #include <com/sun/star/accessibility/AccessibleEventId.hpp>
diff --git a/sd/inc/pch/precompiled_sdui.hxx b/sd/inc/pch/precompiled_sdui.hxx
index 10a15b477353..63f5bd6cd592 100644
--- a/sd/inc/pch/precompiled_sdui.hxx
+++ b/sd/inc/pch/precompiled_sdui.hxx
@@ -29,6 +29,7 @@
 #include <basic/sbmod.hxx>
 #include <basic/sbstar.hxx>
 #include <boost/ptr_container/ptr_vector.hpp>
+#include <boost/scoped_ptr.hpp>
 #include <com/sun/star/beans/PropertyValue.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
diff --git a/sd/inc/sdpage.hxx b/sd/inc/sdpage.hxx
index bd065a519c3e..08d49afaab01 100644
--- a/sd/inc/sdpage.hxx
+++ b/sd/inc/sdpage.hxx
@@ -20,13 +20,14 @@
 #ifndef INCLUDED_SD_INC_SDPAGE_HXX
 #define INCLUDED_SD_INC_SDPAGE_HXX
 
+#include <boost/shared_ptr.hpp>
+
+#include <functional>
 #include <com/sun/star/drawing/XDrawPage.hpp>
 #include <com/sun/star/presentation/FadeEffect.hpp>
 #include <com/sun/star/office/XAnnotation.hpp>
 
-#include <functional>
 #include <list>
-#include <memory>
 #include <vector>
 #include <svx/svdobj.hxx>
 #include <svx/fmpage.hxx>
@@ -58,6 +59,11 @@ namespace sd
     class MainSequence;
 }
 
+namespace boost
+{
+    template<class X> class shared_ptr;
+}
+
 namespace sd {
 
     struct SD_DLLPUBLIC HeaderFooterSettings
@@ -132,7 +138,7 @@ protected:
     ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode > mxAnimationNode;
 
     /** a helper class to manipulate effects inside the main sequence */
-    std::shared_ptr< sd::MainSequence > mpMainSequence;
+    boost::shared_ptr< sd::MainSequence > mpMainSequence;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > createUnoPage() SAL_OVERRIDE;
 
@@ -301,7 +307,7 @@ public:
     void setAnimationNode( ::com::sun::star::uno::Reference< ::com::sun::star::animations::XAnimationNode >& xNode ) throw (::com::sun::star::uno::RuntimeException);
 
     /// @return a helper class to manipulate effects inside the main sequence
-    std::shared_ptr< sd::MainSequence > getMainSequence();
+    boost::shared_ptr< sd::MainSequence > getMainSequence();
 
     /** quick check if this slide has an animation node.
         This can be used to have a cost free check if there are no animations ad this slide.
diff --git a/sd/inc/stlsheet.hxx b/sd/inc/stlsheet.hxx
index d1e64baa7f61..9e05c2e043fc 100644
--- a/sd/inc/stlsheet.hxx
+++ b/sd/inc/stlsheet.hxx
@@ -37,7 +37,7 @@
 
 #include <editeng/unoipset.hxx>
 
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 #include "prlayout.hxx"
 
@@ -146,7 +146,7 @@ protected:
     /** broadcast helper for events */
     ::cppu::OBroadcastHelper mrBHelper;
 
-    std::unique_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
+    boost::scoped_ptr< ModifyListenerForewarder > mpModifyListenerForewarder;
 
 private:
     SdStyleSheet& operator=( const SdStyleSheet& ) SAL_DELETED_FUNCTION;
diff --git a/sd/inc/undoanim.hxx b/sd/inc/undoanim.hxx
index 66e2823ab225..d08f64071965 100644
--- a/sd/inc/undoanim.hxx
+++ b/sd/inc/undoanim.hxx
@@ -23,7 +23,7 @@
 #include <com/sun/star/uno/Any.hxx>
 #include <com/sun/star/animations/XAnimationNode.hpp>
 #include <svx/svdundo.hxx>
-#include <memory>
+#include <boost/scoped_ptr.hpp>
 
 #include "sdundo.hxx"
 
@@ -46,7 +46,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    std::unique_ptr<UndoAnimationImpl>  mpImpl;
+    boost::scoped_ptr<UndoAnimationImpl>  mpImpl;
 };
 
 struct UndoAnimationPathImpl;
@@ -62,7 +62,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    std::unique_ptr<UndoAnimationPathImpl> mpImpl;
+    boost::scoped_ptr<UndoAnimationPathImpl> mpImpl;
 };
 
 struct UndoTransitionImpl;
@@ -79,7 +79,7 @@ public:
     virtual OUString GetComment() const SAL_OVERRIDE;
 
 private:
-    std::unique_ptr<UndoTransitionImpl> mpImpl;
+    boost::scoped_ptr<UndoTransitionImpl> mpImpl;
 };
 
 }