summaryrefslogtreecommitdiff
path: root/slideshow/source/inc
diff options
context:
space:
mode:
authorNoel Grandin <noelgrandin@gmail.com>2016-02-01 18:53:50 +0200
committerNoel Grandin <noel@peralex.com>2016-02-24 09:37:56 +0200
commitf29c0b2b3e8861909fa2c6c37bf631ab01590541 (patch)
tree079aa9796ede8518a6b290f1184f25ac171173c0 /slideshow/source/inc
parent1b6a84a5a24e7e02c6066ca0fcb5a0011d2decd6 (diff)
boost::shared_ptr->std::shared_ptr in slideshow
Change-Id: I27da6bc550488ea65ccdf1d26f8178f803f495d6
Diffstat (limited to 'slideshow/source/inc')
-rw-r--r--slideshow/source/inc/activitiesqueue.hxx2
-rw-r--r--slideshow/source/inc/activity.hxx6
-rw-r--r--slideshow/source/inc/animatableshape.hxx4
-rw-r--r--slideshow/source/inc/animatedsprite.hxx4
-rw-r--r--slideshow/source/inc/animation.hxx5
-rw-r--r--slideshow/source/inc/animationactivity.hxx2
-rw-r--r--slideshow/source/inc/animationeventhandler.hxx4
-rw-r--r--slideshow/source/inc/animationnode.hxx8
-rw-r--r--slideshow/source/inc/attributableshape.hxx4
-rw-r--r--slideshow/source/inc/boolanimation.hxx2
-rw-r--r--slideshow/source/inc/coloranimation.hxx2
-rw-r--r--slideshow/source/inc/cursormanager.hxx4
-rw-r--r--slideshow/source/inc/disposable.hxx10
-rw-r--r--slideshow/source/inc/enumanimation.hxx2
-rw-r--r--slideshow/source/inc/event.hxx4
-rw-r--r--slideshow/source/inc/eventhandler.hxx4
-rw-r--r--slideshow/source/inc/eventmultiplexer.hxx16
-rw-r--r--slideshow/source/inc/expressionnode.hxx6
-rw-r--r--slideshow/source/inc/hslcoloranimation.hxx2
-rw-r--r--slideshow/source/inc/hyperlinkarea.hxx8
-rw-r--r--slideshow/source/inc/iexternalmediashapebase.hxx4
-rw-r--r--slideshow/source/inc/intrinsicanimationeventhandler.hxx4
-rw-r--r--slideshow/source/inc/listenercontainer.hxx8
-rw-r--r--slideshow/source/inc/mouseeventhandler.hxx4
-rw-r--r--slideshow/source/inc/numberanimation.hxx2
-rw-r--r--slideshow/source/inc/pairanimation.hxx2
-rw-r--r--slideshow/source/inc/pauseeventhandler.hxx4
-rw-r--r--slideshow/source/inc/screenupdater.hxx2
-rw-r--r--slideshow/source/inc/shape.hxx6
-rw-r--r--slideshow/source/inc/shapeattributelayer.hxx6
-rw-r--r--slideshow/source/inc/shapelistenereventhandler.hxx4
-rw-r--r--slideshow/source/inc/shapemanager.hxx14
-rw-r--r--slideshow/source/inc/shapemaps.hxx4
-rw-r--r--slideshow/source/inc/shapesubset.hxx4
-rw-r--r--slideshow/source/inc/slide.hxx4
-rw-r--r--slideshow/source/inc/slidebitmap.hxx4
-rw-r--r--slideshow/source/inc/slideshowcontext.hxx6
-rw-r--r--slideshow/source/inc/soundplayer.hxx8
-rw-r--r--slideshow/source/inc/stringanimation.hxx2
-rw-r--r--slideshow/source/inc/subsettableshapemanager.hxx12
-rw-r--r--slideshow/source/inc/tools.hxx29
-rw-r--r--slideshow/source/inc/unoviewcontainer.hxx4
-rw-r--r--slideshow/source/inc/usereventqueue.hxx24
-rw-r--r--slideshow/source/inc/view.hxx2
-rw-r--r--slideshow/source/inc/vieweventhandler.hxx10
-rw-r--r--slideshow/source/inc/viewlayer.hxx2
-rw-r--r--slideshow/source/inc/viewupdate.hxx4
-rw-r--r--slideshow/source/inc/wakeupevent.hxx2
48 files changed, 143 insertions, 137 deletions
diff --git a/slideshow/source/inc/activitiesqueue.hxx b/slideshow/source/inc/activitiesqueue.hxx
index 24a0031208b1..2b03b9ff47ed 100644
--- a/slideshow/source/inc/activitiesqueue.hxx
+++ b/slideshow/source/inc/activitiesqueue.hxx
@@ -27,7 +27,7 @@
#include <canvas/elapsedtime.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
diff --git a/slideshow/source/inc/activity.hxx b/slideshow/source/inc/activity.hxx
index 74d96e0268e2..9897170b9edf 100644
--- a/slideshow/source/inc/activity.hxx
+++ b/slideshow/source/inc/activity.hxx
@@ -22,7 +22,7 @@
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "disposable.hxx"
@@ -34,7 +34,7 @@ namespace slideshow
namespace internal
{
- class Activity : public Disposable
+ class Activity : public Disposable, public virtual SharedPtrAble
{
public:
/** Perform the activity associated with this interface's
@@ -84,7 +84,7 @@ namespace slideshow
virtual void end() = 0;
};
- typedef ::boost::shared_ptr< Activity > ActivitySharedPtr;
+ typedef ::std::shared_ptr< Activity > ActivitySharedPtr;
}
}
diff --git a/slideshow/source/inc/animatableshape.hxx b/slideshow/source/inc/animatableshape.hxx
index 2573eff985a5..b2dd7753fa90 100644
--- a/slideshow/source/inc/animatableshape.hxx
+++ b/slideshow/source/inc/animatableshape.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATABLESHAPE_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATABLESHAPE_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "shape.hxx"
@@ -72,7 +72,7 @@ namespace slideshow
};
- typedef ::boost::shared_ptr< AnimatableShape > AnimatableShapeSharedPtr;
+ typedef ::std::shared_ptr< AnimatableShape > AnimatableShapeSharedPtr;
}
}
diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx
index 8e9520296c57..a5980dab1787 100644
--- a/slideshow/source/inc/animatedsprite.hxx
+++ b/slideshow/source/inc/animatedsprite.hxx
@@ -30,7 +30,7 @@
#include "viewlayer.hxx"
#include <boost/optional.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
@@ -154,7 +154,7 @@ namespace slideshow
bool mbSpriteVisible;
};
- typedef ::boost::shared_ptr< AnimatedSprite > AnimatedSpriteSharedPtr;
+ typedef ::std::shared_ptr< AnimatedSprite > AnimatedSpriteSharedPtr;
}
}
diff --git a/slideshow/source/inc/animation.hxx b/slideshow/source/inc/animation.hxx
index 8f9e613b148f..9108b72101d6 100644
--- a/slideshow/source/inc/animation.hxx
+++ b/slideshow/source/inc/animation.hxx
@@ -22,6 +22,7 @@
#include <animatableshape.hxx>
#include <shapeattributelayer.hxx>
+#include <disposable.hxx>
/* Definition of Animation interface */
@@ -43,7 +44,7 @@ namespace slideshow
@see ColorAnimation
@see PairAnimation
*/
- class Animation
+ class Animation : public virtual SharedPtrAble
{
public:
virtual ~Animation() {}
@@ -81,7 +82,7 @@ namespace slideshow
virtual void end() = 0;
};
- typedef ::boost::shared_ptr< Animation > AnimationSharedPtr;
+ typedef ::std::shared_ptr< Animation > AnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/animationactivity.hxx b/slideshow/source/inc/animationactivity.hxx
index 45d3d387a416..95d0fd02c8b1 100644
--- a/slideshow/source/inc/animationactivity.hxx
+++ b/slideshow/source/inc/animationactivity.hxx
@@ -59,7 +59,7 @@ namespace slideshow
const ShapeAttributeLayerSharedPtr& rAttrLayer ) = 0;
};
- typedef ::boost::shared_ptr< AnimationActivity > AnimationActivitySharedPtr;
+ typedef ::std::shared_ptr< AnimationActivity > AnimationActivitySharedPtr;
}
}
diff --git a/slideshow/source/inc/animationeventhandler.hxx b/slideshow/source/inc/animationeventhandler.hxx
index 7a7489487d24..2d955e6b63cd 100644
--- a/slideshow/source/inc/animationeventhandler.hxx
+++ b/slideshow/source/inc/animationeventhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONEVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_ANIMATIONEVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "animationnode.hxx"
@@ -55,7 +55,7 @@ namespace slideshow
virtual bool handleAnimationEvent( const AnimationNodeSharedPtr& rNode ) = 0;
};
- typedef ::boost::shared_ptr< AnimationEventHandler > AnimationEventHandlerSharedPtr;
+ typedef ::std::shared_ptr< AnimationEventHandler > AnimationEventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx
index eb856cc5d613..f6a02dcf67ab 100644
--- a/slideshow/source/inc/animationnode.hxx
+++ b/slideshow/source/inc/animationnode.hxx
@@ -22,7 +22,7 @@
#include "disposable.hxx"
#include <com/sun/star/animations/XAnimationNode.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace slideshow {
namespace internal {
@@ -123,14 +123,14 @@ public:
@param rNotifee AnimationNode to notify
*/
virtual bool registerDeactivatingListener(
- const ::boost::shared_ptr< AnimationNode >& rNotifee ) = 0;
+ const ::std::shared_ptr< AnimationNode >& rNotifee ) = 0;
/** Called to notify another AnimationNode's deactivation
@param rNotifier The instance who calls this method.
*/
virtual void notifyDeactivating(
- const ::boost::shared_ptr< AnimationNode >& rNotifier ) = 0;
+ const ::std::shared_ptr< AnimationNode >& rNotifier ) = 0;
/** Query node whether it has an animation pending.
@@ -141,7 +141,7 @@ public:
virtual bool hasPendingAnimation() const = 0;
};
-typedef ::boost::shared_ptr< AnimationNode > AnimationNodeSharedPtr;
+typedef ::std::shared_ptr< AnimationNode > AnimationNodeSharedPtr;
} // namespace internal
} // namespace presentation
diff --git a/slideshow/source/inc/attributableshape.hxx b/slideshow/source/inc/attributableshape.hxx
index 55f683c8e8fe..4c250e67d14e 100644
--- a/slideshow/source/inc/attributableshape.hxx
+++ b/slideshow/source/inc/attributableshape.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_ATTRIBUTABLESHAPE_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_ATTRIBUTABLESHAPE_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "animatableshape.hxx"
#include "shapeattributelayer.hxx"
@@ -33,7 +33,7 @@ namespace slideshow
// forward declaration necessary, because methods use AttributableShapeSharedPtr
class AttributableShape;
- typedef ::boost::shared_ptr< AttributableShape > AttributableShapeSharedPtr;
+ typedef ::std::shared_ptr< AttributableShape > AttributableShapeSharedPtr;
/** Represents an animatable shape, that can have its
attributes changed.
diff --git a/slideshow/source/inc/boolanimation.hxx b/slideshow/source/inc/boolanimation.hxx
index d55fe7cd19d8..16b9271eaeb9 100644
--- a/slideshow/source/inc/boolanimation.hxx
+++ b/slideshow/source/inc/boolanimation.hxx
@@ -61,7 +61,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< BoolAnimation > BoolAnimationSharedPtr;
+ typedef ::std::shared_ptr< BoolAnimation > BoolAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/coloranimation.hxx b/slideshow/source/inc/coloranimation.hxx
index d9514bb3b978..77d394572aaf 100644
--- a/slideshow/source/inc/coloranimation.hxx
+++ b/slideshow/source/inc/coloranimation.hxx
@@ -61,7 +61,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< ColorAnimation > ColorAnimationSharedPtr;
+ typedef ::std::shared_ptr< ColorAnimation > ColorAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/cursormanager.hxx b/slideshow/source/inc/cursormanager.hxx
index 52473508fa2e..2607a2633cc3 100644
--- a/slideshow/source/inc/cursormanager.hxx
+++ b/slideshow/source/inc/cursormanager.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_CURSORMANAGER_HXX
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of CursorManager interface */
@@ -56,7 +56,7 @@ namespace slideshow
virtual void resetCursor() = 0;
};
- typedef ::boost::shared_ptr< CursorManager > CursorManagerSharedPtr;
+ typedef ::std::shared_ptr< CursorManager > CursorManagerSharedPtr;
}
}
diff --git a/slideshow/source/inc/disposable.hxx b/slideshow/source/inc/disposable.hxx
index 47dcbb2076c8..c85e3698e953 100644
--- a/slideshow/source/inc/disposable.hxx
+++ b/slideshow/source/inc/disposable.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_DISPOSABLE_HXX
#include <sal/types.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of Disposable interface */
@@ -30,6 +30,14 @@ namespace slideshow
{
namespace internal
{
+ /**
+ * Base class for being a shared pointer, since quite a few of the downstream classes
+ * want to be stored using std::shared_ptr.
+ */
+ class SharedPtrAble : public std::enable_shared_from_this<SharedPtrAble>
+ {
+ };
+
/** Disposable interface
With ref-counted objects, deleting object networks
diff --git a/slideshow/source/inc/enumanimation.hxx b/slideshow/source/inc/enumanimation.hxx
index e6490570462d..bb659b270f21 100644
--- a/slideshow/source/inc/enumanimation.hxx
+++ b/slideshow/source/inc/enumanimation.hxx
@@ -63,7 +63,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< EnumAnimation > EnumAnimationSharedPtr;
+ typedef ::std::shared_ptr< EnumAnimation > EnumAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/event.hxx b/slideshow/source/inc/event.hxx
index 60e9727a3874..15fd0d9d65df 100644
--- a/slideshow/source/inc/event.hxx
+++ b/slideshow/source/inc/event.hxx
@@ -21,7 +21,7 @@
#include "disposable.hxx"
#include <rtl/ustring.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
namespace slideshow {
@@ -70,7 +70,7 @@ private:
const OUString msDescription;
};
-typedef ::boost::shared_ptr< Event > EventSharedPtr;
+typedef ::std::shared_ptr< Event > EventSharedPtr;
typedef ::std::vector< EventSharedPtr > VectorOfEvents;
} // namespace internal
diff --git a/slideshow/source/inc/eventhandler.hxx b/slideshow/source/inc/eventhandler.hxx
index 4ab58e689f15..3efc5f0b4059 100644
--- a/slideshow/source/inc/eventhandler.hxx
+++ b/slideshow/source/inc/eventhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_EVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_EVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of EventHandler interface */
@@ -51,7 +51,7 @@ namespace slideshow
virtual bool handleEvent() = 0;
};
- typedef ::boost::shared_ptr< EventHandler > EventHandlerSharedPtr;
+ typedef ::std::shared_ptr< EventHandler > EventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx
index 4ae4feaa54e7..e39c79ec6c1b 100644
--- a/slideshow/source/inc/eventmultiplexer.hxx
+++ b/slideshow/source/inc/eventmultiplexer.hxx
@@ -28,8 +28,6 @@
#include <boost/noncopyable.hpp>
#include <memory>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <com/sun/star/uno/Reference.hxx>
#include "unoview.hxx"
@@ -73,7 +71,7 @@ public:
virtual void viewClobbered( const UnoViewSharedPtr& rView ) = 0;
};
-typedef ::boost::shared_ptr< ViewRepaintHandler > ViewRepaintHandlerSharedPtr;
+typedef ::std::shared_ptr< ViewRepaintHandler > ViewRepaintHandlerSharedPtr;
/** Interface for handling hyperlink clicks.
@@ -100,7 +98,7 @@ protected:
~HyperlinkHandler() {}
};
-typedef ::boost::shared_ptr< HyperlinkHandler > HyperlinkHandlerSharedPtr;
+typedef ::std::shared_ptr< HyperlinkHandler > HyperlinkHandlerSharedPtr;
/** Interface for handling user paint state changes.
@@ -121,7 +119,7 @@ public:
virtual bool disable() = 0;
};
-typedef ::boost::shared_ptr< UserPaintEventHandler > UserPaintEventHandlerSharedPtr;
+typedef ::std::shared_ptr< UserPaintEventHandler > UserPaintEventHandlerSharedPtr;
/** This class multiplexes user-activated and
slide-show global events.
@@ -587,7 +585,7 @@ public:
anybody. If false is returned, no handler processed
this event (and probably, nothing will happen at all)
*/
- bool notifyAnimationStart( const boost::shared_ptr<AnimationNode>& rNode );
+ bool notifyAnimationStart( const std::shared_ptr<AnimationNode>& rNode );
/** Notify that the given node leaves its active duration.
@@ -603,7 +601,7 @@ public:
anybody. If false is returned, no handler processed
this event (and probably, nothing will happen at all)
*/
- bool notifyAnimationEnd( const boost::shared_ptr<AnimationNode>& rNode );
+ bool notifyAnimationEnd( const std::shared_ptr<AnimationNode>& rNode );
/** Notify that the slide animations sequence leaves its
active duration.
@@ -628,7 +626,7 @@ public:
anybody. If false is returned, no handler processed
this event (and probably, nothing will happen at all)
*/
- bool notifyAudioStopped( const boost::shared_ptr<AnimationNode>& rNode );
+ bool notifyAudioStopped( const std::shared_ptr<AnimationNode>& rNode );
/** Notify that the show has entered or exited pause mode
@@ -649,7 +647,7 @@ public:
anybody. If false is returned, no handler processed
this event (and probably, nothing will happen at all)
*/
- bool notifyCommandStopAudio( const boost::shared_ptr<AnimationNode>& rNode );
+ bool notifyCommandStopAudio( const std::shared_ptr<AnimationNode>& rNode );
/** Notifies that a hyperlink has been clicked.
*/
diff --git a/slideshow/source/inc/expressionnode.hxx b/slideshow/source/inc/expressionnode.hxx
index c80fa807ed36..8bd0b14e2e85 100644
--- a/slideshow/source/inc/expressionnode.hxx
+++ b/slideshow/source/inc/expressionnode.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODE_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_EXPRESSIONNODE_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of ExpressionNode interface */
@@ -53,7 +53,7 @@ namespace slideshow
};
- typedef ::boost::shared_ptr< AnimationFunction > AnimationFunctionSharedPtr;
+ typedef ::std::shared_ptr< AnimationFunction > AnimationFunctionSharedPtr;
/** Refinement of AnimationFunction
@@ -77,7 +77,7 @@ namespace slideshow
virtual bool isConstant() const = 0;
};
- typedef ::boost::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
+ typedef ::std::shared_ptr< ExpressionNode > ExpressionNodeSharedPtr;
}
}
diff --git a/slideshow/source/inc/hslcoloranimation.hxx b/slideshow/source/inc/hslcoloranimation.hxx
index 5efc57e06233..159c1255e47a 100644
--- a/slideshow/source/inc/hslcoloranimation.hxx
+++ b/slideshow/source/inc/hslcoloranimation.hxx
@@ -61,7 +61,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< HSLColorAnimation > HSLColorAnimationSharedPtr;
+ typedef ::std::shared_ptr< HSLColorAnimation > HSLColorAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/hyperlinkarea.hxx b/slideshow/source/inc/hyperlinkarea.hxx
index 38dd8fd2c614..52e51f8224d9 100644
--- a/slideshow/source/inc/hyperlinkarea.hxx
+++ b/slideshow/source/inc/hyperlinkarea.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_HYPERLINKAREA_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_HYPERLINKAREA_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
#include <utility>
@@ -74,8 +74,8 @@ namespace slideshow
// make functor adaptable (to boost::bind)
typedef bool result_type;
- bool operator()(const boost::shared_ptr< HyperlinkArea >& rLHS,
- const boost::shared_ptr< HyperlinkArea >& rRHS) const
+ bool operator()(const std::shared_ptr< HyperlinkArea >& rLHS,
+ const std::shared_ptr< HyperlinkArea >& rRHS) const
{
const double nPrioL( rLHS->getHyperlinkPriority() );
const double nPrioR( rRHS->getHyperlinkPriority() );
@@ -89,7 +89,7 @@ namespace slideshow
~HyperlinkArea() {}
};
- typedef boost::shared_ptr< HyperlinkArea > HyperlinkAreaSharedPtr;
+ typedef std::shared_ptr< HyperlinkArea > HyperlinkAreaSharedPtr;
}
}
diff --git a/slideshow/source/inc/iexternalmediashapebase.hxx b/slideshow/source/inc/iexternalmediashapebase.hxx
index f382c1094adf..3a174e977c82 100644
--- a/slideshow/source/inc/iexternalmediashapebase.hxx
+++ b/slideshow/source/inc/iexternalmediashapebase.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_IEXTERNALMEDIASHAPEBASE_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_IEXTERNALMEDIASHAPEBASE_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "shape.hxx"
@@ -76,7 +76,7 @@ namespace slideshow
virtual void setMediaTime(double fTime) = 0;
};
- typedef ::boost::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr;
+ typedef ::std::shared_ptr< IExternalMediaShapeBase > IExternalMediaShapeBaseSharedPtr;
}
}
diff --git a/slideshow/source/inc/intrinsicanimationeventhandler.hxx b/slideshow/source/inc/intrinsicanimationeventhandler.hxx
index f712592734a1..6016bb22745c 100644
--- a/slideshow/source/inc/intrinsicanimationeventhandler.hxx
+++ b/slideshow/source/inc/intrinsicanimationeventhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_INTRINSICANIMATIONEVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_INTRINSICANIMATIONEVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of IntrinsicAnimationEventHandler interface */
@@ -44,7 +44,7 @@ namespace slideshow
virtual bool disableAnimations() = 0;
};
- typedef ::boost::shared_ptr< IntrinsicAnimationEventHandler > IntrinsicAnimationEventHandlerSharedPtr;
+ typedef ::std::shared_ptr< IntrinsicAnimationEventHandler > IntrinsicAnimationEventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx
index 91529069462f..e07cf3ecdecf 100644
--- a/slideshow/source/inc/listenercontainer.hxx
+++ b/slideshow/source/inc/listenercontainer.hxx
@@ -126,7 +126,7 @@ template< typename ListenerT > struct ListenerOperations
};
template< typename ListenerTargetT >
-struct ListenerOperations< boost::weak_ptr<ListenerTargetT> >
+struct ListenerOperations< std::weak_ptr<ListenerTargetT> >
{
template< typename ContainerT,
typename FuncT >
@@ -135,7 +135,7 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> >
{
for( const auto& rCurr : rContainer )
{
- boost::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
+ std::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
if( pListener && func(pListener) )
return true;
@@ -152,11 +152,11 @@ struct ListenerOperations< boost::weak_ptr<ListenerTargetT> >
bool bRet(false);
for( const auto& rCurr : rContainer )
{
- boost::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
+ std::shared_ptr<ListenerTargetT> pListener( rCurr.lock() );
if( pListener.get() &&
FunctionApply< typename ::std::result_of< FuncT( const typename ContainerT::value_type& ) >::type,
- boost::shared_ptr<ListenerTargetT> >::apply(func,pListener) )
+ std::shared_ptr<ListenerTargetT> >::apply(func,pListener) )
{
bRet = true;
}
diff --git a/slideshow/source/inc/mouseeventhandler.hxx b/slideshow/source/inc/mouseeventhandler.hxx
index 2a7d716e1170..0a25b4170bab 100644
--- a/slideshow/source/inc/mouseeventhandler.hxx
+++ b/slideshow/source/inc/mouseeventhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_MOUSEEVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_MOUSEEVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace awt
{
@@ -107,7 +107,7 @@ namespace slideshow
virtual bool handleMouseMoved( const css::awt::MouseEvent& e ) = 0;
};
- typedef ::boost::shared_ptr< MouseEventHandler > MouseEventHandlerSharedPtr;
+ typedef ::std::shared_ptr< MouseEventHandler > MouseEventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/numberanimation.hxx b/slideshow/source/inc/numberanimation.hxx
index 23f3fa99ea11..147b24fa5925 100644
--- a/slideshow/source/inc/numberanimation.hxx
+++ b/slideshow/source/inc/numberanimation.hxx
@@ -63,7 +63,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< NumberAnimation > NumberAnimationSharedPtr;
+ typedef ::std::shared_ptr< NumberAnimation > NumberAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/pairanimation.hxx b/slideshow/source/inc/pairanimation.hxx
index 34897964b44b..ae28f9b44fcc 100644
--- a/slideshow/source/inc/pairanimation.hxx
+++ b/slideshow/source/inc/pairanimation.hxx
@@ -62,7 +62,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< PairAnimation > PairAnimationSharedPtr;
+ typedef ::std::shared_ptr< PairAnimation > PairAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/pauseeventhandler.hxx b/slideshow/source/inc/pauseeventhandler.hxx
index faa758be25fe..6ac8971ae834 100644
--- a/slideshow/source/inc/pauseeventhandler.hxx
+++ b/slideshow/source/inc/pauseeventhandler.hxx
@@ -20,7 +20,7 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_PAUSEEVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_PAUSEEVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of PauseHandler interface */
@@ -56,7 +56,7 @@ namespace slideshow
~PauseEventHandler() {}
};
- typedef ::boost::shared_ptr< PauseEventHandler > PauseEventHandlerSharedPtr;
+ typedef ::std::shared_ptr< PauseEventHandler > PauseEventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index 85075e870e1a..384e676c6f50 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -115,7 +115,7 @@ namespace slideshow
locked. When <FALSE/> then Activate() has to be called in order
to lock the lock.
*/
- ::boost::shared_ptr<UpdateLock> createLock (const bool bStartLocked);
+ ::std::shared_ptr<UpdateLock> createLock (const bool bStartLocked);
/** Lock updates to prevent intermediate repaints.
*/
diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx
index 7bcb7147a72a..59bbd99b71d3 100644
--- a/slideshow/source/inc/shape.hxx
+++ b/slideshow/source/inc/shape.hxx
@@ -28,8 +28,8 @@
#include "viewlayer.hxx"
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
+#include <memory>
#include <set>
#include <vector>
@@ -44,7 +44,7 @@ namespace slideshow
// forward declaration necessary, because methods use ShapeSharedPtr
class Shape;
- typedef ::boost::shared_ptr< Shape > ShapeSharedPtr;
+ typedef ::std::shared_ptr< Shape > ShapeSharedPtr;
/** Represents a slide's shape object.
@@ -249,7 +249,7 @@ namespace slideshow
};
};
- typedef ::boost::shared_ptr< Shape > ShapeSharedPtr;
+ typedef ::std::shared_ptr< Shape > ShapeSharedPtr;
/** A set which contains all shapes in an ordered fashion.
*/
diff --git a/slideshow/source/inc/shapeattributelayer.hxx b/slideshow/source/inc/shapeattributelayer.hxx
index c4b23db7fbdc..31c8ebaf1e78 100644
--- a/slideshow/source/inc/shapeattributelayer.hxx
+++ b/slideshow/source/inc/shapeattributelayer.hxx
@@ -32,7 +32,7 @@
#include "rgbcolor.hxx"
#include <stack>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace slideshow
@@ -67,11 +67,11 @@ namespace slideshow
;
};
- typedef ::boost::shared_ptr< State > StateSharedPtr;
+ typedef ::std::shared_ptr< State > StateSharedPtr;
class ShapeAttributeLayer;
- typedef ::boost::shared_ptr< ShapeAttributeLayer > ShapeAttributeLayerSharedPtr;
+ typedef ::std::shared_ptr< ShapeAttributeLayer > ShapeAttributeLayerSharedPtr;
/** Encapsulates all modifiable attributes of a shape.
diff --git a/slideshow/source/inc/shapelistenereventhandler.hxx b/slideshow/source/inc/shapelistenereventhandler.hxx
index b52c3d2c9886..fbbd6ef38ae3 100644
--- a/slideshow/source/inc/shapelistenereventhandler.hxx
+++ b/slideshow/source/inc/shapelistenereventhandler.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_SHAPELISTENEREVENTHANDLER_HXX
#include <com/sun/star/uno/Reference.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace drawing
{
@@ -55,7 +55,7 @@ namespace slideshow
const css::uno::Reference<css::drawing::XShape>& xShape ) = 0;
};
- typedef ::boost::shared_ptr< ShapeListenerEventHandler > ShapeListenerEventHandlerSharedPtr;
+ typedef ::std::shared_ptr< ShapeListenerEventHandler > ShapeListenerEventHandlerSharedPtr;
}
}
diff --git a/slideshow/source/inc/shapemanager.hxx b/slideshow/source/inc/shapemanager.hxx
index 1a81e024f7b5..c2c72e231f76 100644
--- a/slideshow/source/inc/shapemanager.hxx
+++ b/slideshow/source/inc/shapemanager.hxx
@@ -22,7 +22,7 @@
#include "disposable.hxx"
#include <com/sun/star/uno/Reference.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star { namespace drawing {
class XShape;
@@ -55,7 +55,7 @@ namespace slideshow
after a corresponding number of leaveAnimationMode()
calls.
*/
- virtual void enterAnimationMode( const boost::shared_ptr<AnimatableShape>& rShape ) = 0;
+ virtual void enterAnimationMode( const std::shared_ptr<AnimatableShape>& rShape ) = 0;
/** Notify the ShapeManager that the given Shape is no
longer animated.
@@ -66,7 +66,7 @@ namespace slideshow
to call this method more often than
enterAnimationMode().
*/
- virtual void leaveAnimationMode( const boost::shared_ptr<AnimatableShape>& rShape ) = 0;
+ virtual void leaveAnimationMode( const std::shared_ptr<AnimatableShape>& rShape ) = 0;
/** Notify that a shape needs an update
@@ -77,7 +77,7 @@ namespace slideshow
@param rShape
Shape which needs an update
*/
- virtual void notifyShapeUpdate( const boost::shared_ptr<Shape>& rShape ) = 0;
+ virtual void notifyShapeUpdate( const std::shared_ptr<Shape>& rShape ) = 0;
/** Lookup a Shape from an XShape model object
@@ -88,7 +88,7 @@ namespace slideshow
The XShape object, for which the representing Shape
should be looked up.
*/
- virtual boost::shared_ptr<Shape> lookupShape(
+ virtual std::shared_ptr<Shape> lookupShape(
css::uno::Reference< css::drawing::XShape > const & xShape ) const = 0;
/** Register given shape as a hyperlink target
@@ -98,10 +98,10 @@ namespace slideshow
hyperlink region lookup. Must be in absolute user
space coordinates.
*/
- virtual void addHyperlinkArea( const boost::shared_ptr<HyperlinkArea>& rArea ) = 0;
+ virtual void addHyperlinkArea( const std::shared_ptr<HyperlinkArea>& rArea ) = 0;
};
- typedef ::boost::shared_ptr< ShapeManager > ShapeManagerSharedPtr;
+ typedef ::std::shared_ptr< ShapeManager > ShapeManagerSharedPtr;
}
}
diff --git a/slideshow/source/inc/shapemaps.hxx b/slideshow/source/inc/shapemaps.hxx
index 87fce1eefd2d..83d665af7598 100644
--- a/slideshow/source/inc/shapemaps.hxx
+++ b/slideshow/source/inc/shapemaps.hxx
@@ -23,7 +23,7 @@
#include <comphelper/interfacecontainer2.hxx>
#include <com/sun/star/uno/Reference.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <map>
namespace com { namespace sun { namespace star { namespace drawing
@@ -39,7 +39,7 @@ namespace slideshow
{
/// Maps XShape to shape listener
typedef ::std::map< css::uno::Reference< css::drawing::XShape>,
- boost::shared_ptr< ::comphelper::OInterfaceContainerHelper2 >
+ std::shared_ptr< ::comphelper::OInterfaceContainerHelper2 >
> ShapeEventListenerMap;
/// Maps XShape to mouse cursor
diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx
index 6405da78ab1d..b1241870edfc 100644
--- a/slideshow/source/inc/shapesubset.hxx
+++ b/slideshow/source/inc/shapesubset.hxx
@@ -24,14 +24,14 @@
#include "subsettableshapemanager.hxx"
#include "doctreenode.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace slideshow
{
namespace internal
{
class ShapeSubset;
- typedef ::boost::shared_ptr< ShapeSubset > ShapeSubsetSharedPtr;
+ typedef ::std::shared_ptr< ShapeSubset > ShapeSubsetSharedPtr;
/* Definition of ShapeSubset class */
diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx
index 264b2a235bd5..8715931bf33b 100644
--- a/slideshow/source/inc/slide.hxx
+++ b/slideshow/source/inc/slide.hxx
@@ -26,7 +26,7 @@
#include "slidebitmap.hxx"
#include "shapemaps.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com { namespace sun { namespace star {
namespace drawing {
@@ -149,7 +149,7 @@ namespace slideshow
~Slide() {}
};
- typedef ::boost::shared_ptr< Slide > SlideSharedPtr;
+ typedef ::std::shared_ptr< Slide > SlideSharedPtr;
class EventQueue;
class CursorManager;
diff --git a/slideshow/source/inc/slidebitmap.hxx b/slideshow/source/inc/slidebitmap.hxx
index cce00ae09c81..6d3d0b974b50 100644
--- a/slideshow/source/inc/slidebitmap.hxx
+++ b/slideshow/source/inc/slidebitmap.hxx
@@ -27,7 +27,7 @@
#include <basegfx/point/b2dpoint.hxx>
#include <basegfx/polygon/b2dpolypolygon.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <boost/noncopyable.hpp>
namespace com { namespace sun { namespace star { namespace rendering
@@ -77,7 +77,7 @@ namespace slideshow
css::uno::Reference< css::rendering::XBitmap > mxBitmap;
};
- typedef ::boost::shared_ptr< SlideBitmap > SlideBitmapSharedPtr;
+ typedef ::std::shared_ptr< SlideBitmap > SlideBitmapSharedPtr;
}
}
diff --git a/slideshow/source/inc/slideshowcontext.hxx b/slideshow/source/inc/slideshowcontext.hxx
index 3f414aa8ab4d..7c1907321760 100644
--- a/slideshow/source/inc/slideshowcontext.hxx
+++ b/slideshow/source/inc/slideshowcontext.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_SLIDESHOWCONTEXT_HXX
#include <com/sun/star/uno/Reference.hxx>
-#include <boost/shared_ptr.hpp>
+#include <memory>
namespace com{ namespace sun{ namespace star{ namespace uno
{
@@ -81,7 +81,7 @@ namespace slideshow
@param rComponentContext
To create UNO services from
*/
- SlideShowContext( boost::shared_ptr<SubsettableShapeManager>& rSubsettableShapeManager,
+ SlideShowContext( std::shared_ptr<SubsettableShapeManager>& rSubsettableShapeManager,
EventQueue& rEventQueue,
EventMultiplexer& rEventMultiplexer,
ScreenUpdater& rScreenUpdater,
@@ -92,7 +92,7 @@ namespace slideshow
const css::uno::Reference< css::uno::XComponentContext>& rComponentContext );
void dispose();
- boost::shared_ptr<SubsettableShapeManager>& mpSubsettableShapeManager;
+ std::shared_ptr<SubsettableShapeManager>& mpSubsettableShapeManager;
EventQueue& mrEventQueue;
EventMultiplexer& mrEventMultiplexer;
ScreenUpdater& mrScreenUpdater;
diff --git a/slideshow/source/inc/soundplayer.hxx b/slideshow/source/inc/soundplayer.hxx
index 1d6da3d0fbcf..737103512dec 100644
--- a/slideshow/source/inc/soundplayer.hxx
+++ b/slideshow/source/inc/soundplayer.hxx
@@ -26,7 +26,7 @@
#include <com/sun/star/media/XManager.hpp>
#include <com/sun/star/media/XPlayer.hpp>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include "pauseeventhandler.hxx"
#include "disposable.hxx"
@@ -61,7 +61,7 @@ namespace slideshow
the sound file is invalid, or not supported by the
player service.
*/
- static ::boost::shared_ptr<SoundPlayer> create(
+ static ::std::shared_ptr<SoundPlayer> create(
EventMultiplexer & rEventMultiplexer,
const OUString& rSoundURL,
const css::uno::Reference< css::uno::XComponentContext>& rComponentContext );
@@ -97,11 +97,11 @@ namespace slideshow
EventMultiplexer & mrEventMultiplexer;
// TODO(Q3): obsolete when boost::enable_shared_ptr_from_this
// is available
- ::boost::shared_ptr<SoundPlayer> mThis;
+ ::std::shared_ptr<SoundPlayer> mThis;
css::uno::Reference< css::media::XPlayer > mxPlayer;
};
- typedef ::boost::shared_ptr< SoundPlayer > SoundPlayerSharedPtr;
+ typedef ::std::shared_ptr< SoundPlayer > SoundPlayerSharedPtr;
}
}
diff --git a/slideshow/source/inc/stringanimation.hxx b/slideshow/source/inc/stringanimation.hxx
index 686edab66291..2cb26c0a94b5 100644
--- a/slideshow/source/inc/stringanimation.hxx
+++ b/slideshow/source/inc/stringanimation.hxx
@@ -61,7 +61,7 @@ namespace slideshow
virtual ValueType getUnderlyingValue() const = 0;
};
- typedef ::boost::shared_ptr< StringAnimation > StringAnimationSharedPtr;
+ typedef ::std::shared_ptr< StringAnimation > StringAnimationSharedPtr;
}
}
diff --git a/slideshow/source/inc/subsettableshapemanager.hxx b/slideshow/source/inc/subsettableshapemanager.hxx
index 54cc34db4200..5f6c5f473cc0 100644
--- a/slideshow/source/inc/subsettableshapemanager.hxx
+++ b/slideshow/source/inc/subsettableshapemanager.hxx
@@ -22,7 +22,7 @@
#include "shapemanager.hxx"
#include "intrinsicanimationeventhandler.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of SubsettableShapeManager interface */
@@ -62,8 +62,8 @@ namespace slideshow
@param rSubsetShape
The subset to display in the generated shape.
*/
- virtual boost::shared_ptr<AttributableShape> getSubsetShape(
- const boost::shared_ptr<AttributableShape>& rOrigShape,
+ virtual std::shared_ptr<AttributableShape> getSubsetShape(
+ const std::shared_ptr<AttributableShape>& rOrigShape,
const DocTreeNode& rTreeNode ) = 0;
/** Revoke a previously queried subset shape.
@@ -80,8 +80,8 @@ namespace slideshow
The subset created from rOrigShape
*/
virtual void revokeSubset(
- const boost::shared_ptr<AttributableShape>& rOrigShape,
- const boost::shared_ptr<AttributableShape>& rSubsetShape ) = 0;
+ const std::shared_ptr<AttributableShape>& rOrigShape,
+ const std::shared_ptr<AttributableShape>& rSubsetShape ) = 0;
// Evil hackish way of getting intrinsic animation slide-wise
@@ -103,7 +103,7 @@ namespace slideshow
virtual void notifyIntrinsicAnimationsDisabled() = 0;
};
- typedef ::boost::shared_ptr< SubsettableShapeManager > SubsettableShapeManagerSharedPtr;
+ typedef ::std::shared_ptr< SubsettableShapeManager > SubsettableShapeManagerSharedPtr;
}
}
diff --git a/slideshow/source/inc/tools.hxx b/slideshow/source/inc/tools.hxx
index 8075743d3ad4..811face5ca6c 100644
--- a/slideshow/source/inc/tools.hxx
+++ b/slideshow/source/inc/tools.hxx
@@ -37,8 +37,7 @@
#include "rgbcolor.hxx"
#include "hslcolor.hxx"
-#include <boost/shared_ptr.hpp>
-
+#include <memory>
#include <functional>
#include <cstdlib>
#include <string.h>
@@ -67,7 +66,7 @@ namespace slideshow
class Shape;
class ShapeAttributeLayer;
- typedef ::boost::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
+ typedef ::std::shared_ptr< GDIMetaFile > GDIMetaFileSharedPtr;
template <typename T>
inline ::std::size_t hash_value( T const * p )
@@ -123,49 +122,49 @@ namespace slideshow
/// extract unary double value from Any
bool extractValue( double& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract int from Any
bool extractValue( sal_Int32& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract enum/constant group value from Any
bool extractValue( sal_Int16& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract color value from Any
bool extractValue( RGBColor& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract color value from Any
bool extractValue( HSLColor& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract plain string from Any
bool extractValue( OUString& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract bool value from Any
bool extractValue( bool& o_rValue,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/// extract double 2-tuple from Any
bool extractValue( basegfx::B2DTuple& o_rPair,
const css::uno::Any& rSourceAny,
- const boost::shared_ptr<Shape>& rShape,
+ const std::shared_ptr<Shape>& rShape,
const basegfx::B2DVector& rSlideBounds );
/** Search a sequence of NamedValues for a given element.
@@ -191,7 +190,7 @@ namespace slideshow
*/
basegfx::B2DHomMatrix getShapeTransformation(
const basegfx::B2DRange& rBounds,
- const boost::shared_ptr<ShapeAttributeLayer>& pAttr );
+ const std::shared_ptr<ShapeAttributeLayer>& pAttr );
/** Get a shape's sprite transformation from the attribute set
@@ -211,7 +210,7 @@ namespace slideshow
basegfx::B2DHomMatrix getSpriteTransformation(
const basegfx::B2DVector& rPixelSize,
const basegfx::B2DVector& rOrigSize,
- const boost::shared_ptr<ShapeAttributeLayer>& pAttr );
+ const std::shared_ptr<ShapeAttributeLayer>& pAttr );
/** Calc update area for a shape.
@@ -234,7 +233,7 @@ namespace slideshow
basegfx::B2DRange getShapeUpdateArea(
const basegfx::B2DRange& rUnitBounds,
const basegfx::B2DHomMatrix& rShapeTransform,
- const boost::shared_ptr<ShapeAttributeLayer>& pAttr );
+ const std::shared_ptr<ShapeAttributeLayer>& pAttr );
/** Calc update area for a shape.
@@ -267,7 +266,7 @@ namespace slideshow
*/
basegfx::B2DRange getShapePosSize(
const basegfx::B2DRange& rOrigBounds,
- const boost::shared_ptr<ShapeAttributeLayer>& pAttr );
+ const std::shared_ptr<ShapeAttributeLayer>& pAttr );
/** Convert a plain UNO API 32 bit int to RGBColor
*/
diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx
index a82e12eafc41..c1f013e41e2c 100644
--- a/slideshow/source/inc/unoviewcontainer.hxx
+++ b/slideshow/source/inc/unoviewcontainer.hxx
@@ -22,10 +22,10 @@
#include <com/sun/star/uno/Reference.hxx>
-#include <boost/shared_ptr.hpp>
#include <boost/noncopyable.hpp>
#include <vector>
+#include <memory>
#include "unoview.hxx"
@@ -82,7 +82,7 @@ namespace slideshow
UnoViewVector maViews;
};
- typedef ::boost::shared_ptr< UnoViewContainer > UnoViewContainerSharedPtr;
+ typedef ::std::shared_ptr< UnoViewContainer > UnoViewContainerSharedPtr;
}
}
diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx
index 00d6d955a64f..25225266dcd1 100644
--- a/slideshow/source/inc/usereventqueue.hxx
+++ b/slideshow/source/inc/usereventqueue.hxx
@@ -228,7 +228,7 @@ private:
register it via the Functor
*/
template< typename Handler, typename Functor >
- void registerEvent( ::boost::shared_ptr< Handler >& rHandler,
+ void registerEvent( ::std::shared_ptr< Handler >& rHandler,
const EventSharedPtr& rEvent,
const Functor& rRegistrationFunctor );
@@ -241,7 +241,7 @@ private:
rHandler's addEvent() method.
*/
template< typename Handler, typename Arg, typename Functor >
- void registerEvent( ::boost::shared_ptr< Handler >& rHandler,
+ void registerEvent( ::std::shared_ptr< Handler >& rHandler,
const EventSharedPtr& rEvent,
const Arg& rArg,
const Functor& rRegistrationFunctor );
@@ -250,16 +250,16 @@ private:
EventQueue& mrEventQueue;
CursorManager& mrCursorManager;
- ::boost::shared_ptr<AllAnimationEventHandler> mpAnimationStartEventHandler;
- ::boost::shared_ptr<AllAnimationEventHandler> mpAnimationEndEventHandler;
- ::boost::shared_ptr<AllAnimationEventHandler> mpAudioStoppedEventHandler;
- ::boost::shared_ptr<ShapeClickEventHandler> mpShapeClickEventHandler;
- ::boost::shared_ptr<ClickEventHandler> mpClickEventHandler;
- ::boost::shared_ptr<SkipEffectEventHandler> mpSkipEffectEventHandler;
- ::boost::shared_ptr<ShapeClickEventHandler> mpShapeDoubleClickEventHandler;
- ::boost::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler;
- ::boost::shared_ptr<MouseEnterHandler> mpMouseEnterHandler;
- ::boost::shared_ptr<MouseLeaveHandler> mpMouseLeaveHandler;
+ ::std::shared_ptr<AllAnimationEventHandler> mpAnimationStartEventHandler;
+ ::std::shared_ptr<AllAnimationEventHandler> mpAnimationEndEventHandler;
+ ::std::shared_ptr<AllAnimationEventHandler> mpAudioStoppedEventHandler;
+ ::std::shared_ptr<ShapeClickEventHandler> mpShapeClickEventHandler;
+ ::std::shared_ptr<ClickEventHandler> mpClickEventHandler;
+ ::std::shared_ptr<SkipEffectEventHandler> mpSkipEffectEventHandler;
+ ::std::shared_ptr<ShapeClickEventHandler> mpShapeDoubleClickEventHandler;
+ ::std::shared_ptr<ClickEventHandler> mpDoubleClickEventHandler;
+ ::std::shared_ptr<MouseEnterHandler> mpMouseEnterHandler;
+ ::std::shared_ptr<MouseLeaveHandler> mpMouseLeaveHandler;
bool mbAdvanceOnClick;
};
diff --git a/slideshow/source/inc/view.hxx b/slideshow/source/inc/view.hxx
index bce9d0c75217..1eaea033793a 100644
--- a/slideshow/source/inc/view.hxx
+++ b/slideshow/source/inc/view.hxx
@@ -22,7 +22,7 @@
#include "viewlayer.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <vector>
diff --git a/slideshow/source/inc/vieweventhandler.hxx b/slideshow/source/inc/vieweventhandler.hxx
index 9f4aa3d80a4c..1c658bb90ace 100644
--- a/slideshow/source/inc/vieweventhandler.hxx
+++ b/slideshow/source/inc/vieweventhandler.hxx
@@ -20,10 +20,10 @@
#ifndef INCLUDED_SLIDESHOW_SOURCE_INC_VIEWEVENTHANDLER_HXX
#define INCLUDED_SLIDESHOW_SOURCE_INC_VIEWEVENTHANDLER_HXX
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
+#include <memory>
#include "unoview.hxx"
+#include "disposable.hxx"
/* Definition of ViewEventHandler interface */
@@ -39,7 +39,7 @@ namespace slideshow
EventMultiplexer object, and are called from there to
handle view events.
*/
- class ViewEventHandler
+ class ViewEventHandler : public virtual SharedPtrAble
{
public:
virtual ~ViewEventHandler() {}
@@ -82,8 +82,8 @@ namespace slideshow
virtual void viewsChanged() = 0;
};
- typedef ::boost::shared_ptr< ViewEventHandler > ViewEventHandlerSharedPtr;
- typedef ::boost::weak_ptr< ViewEventHandler > ViewEventHandlerWeakPtr;
+ typedef ::std::shared_ptr< ViewEventHandler > ViewEventHandlerSharedPtr;
+ typedef ::std::weak_ptr< ViewEventHandler > ViewEventHandlerWeakPtr;
}
}
diff --git a/slideshow/source/inc/viewlayer.hxx b/slideshow/source/inc/viewlayer.hxx
index b3d3a8d647ad..0b701d472b1e 100644
--- a/slideshow/source/inc/viewlayer.hxx
+++ b/slideshow/source/inc/viewlayer.hxx
@@ -21,7 +21,7 @@
#define INCLUDED_SLIDESHOW_SOURCE_INC_VIEWLAYER_HXX
#include <sal/config.h>
-#include <boost/shared_ptr.hpp>
+#include <memory>
#include <com/sun/star/geometry/IntegerSize2D.hpp>
namespace basegfx
diff --git a/slideshow/source/inc/viewupdate.hxx b/slideshow/source/inc/viewupdate.hxx
index d6fe16f89532..8c2e512ba3d9 100644
--- a/slideshow/source/inc/viewupdate.hxx
+++ b/slideshow/source/inc/viewupdate.hxx
@@ -22,7 +22,7 @@
#include "disposable.hxx"
#include "view.hxx"
-#include <boost/shared_ptr.hpp>
+#include <memory>
/* Definition of ViewUpdate interface */
@@ -54,7 +54,7 @@ namespace slideshow
virtual bool needsUpdate() const = 0;
};
- typedef ::boost::shared_ptr< ViewUpdate > ViewUpdateSharedPtr;
+ typedef ::std::shared_ptr< ViewUpdate > ViewUpdateSharedPtr;
}
}
diff --git a/slideshow/source/inc/wakeupevent.hxx b/slideshow/source/inc/wakeupevent.hxx
index 9a29c61fb60d..441579cd5c3e 100644
--- a/slideshow/source/inc/wakeupevent.hxx
+++ b/slideshow/source/inc/wakeupevent.hxx
@@ -76,7 +76,7 @@ private:
ActivitiesQueue& mrActivityQueue;
};
-typedef ::boost::shared_ptr< WakeupEvent > WakeupEventSharedPtr;
+typedef ::std::shared_ptr< WakeupEvent > WakeupEventSharedPtr;
} // namespace internal
} // namespace presentation