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/inc/CustomAnimationEffect.hxx | |
| parent | 558b08d55f69b04eea42a37abd97fbb4dbe3602f (diff) | |
revert for mac and win unit case crashes after boost->std
Change-Id: I82c7084f203a834c2d42f9527705288e6036019b
Diffstat (limited to 'sd/inc/CustomAnimationEffect.hxx')
| -rw-r--r-- | sd/inc/CustomAnimationEffect.hxx | 13 |
1 files changed, 7 insertions, 6 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 { |