summaryrefslogtreecommitdiff
path: root/slideshow
diff options
context:
space:
mode:
Diffstat (limited to 'slideshow')
-rw-r--r--slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx4
-rw-r--r--slideshow/source/engine/animationnodes/animationpathmotionnode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/animationtransformnode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.cxx2
-rw-r--r--slideshow/source/engine/animationnodes/basecontainernode.hxx2
-rw-r--r--slideshow/source/engine/animationnodes/propertyanimationnode.cxx6
-rw-r--r--slideshow/source/engine/rehearsetimingsactivity.cxx2
-rw-r--r--slideshow/source/inc/animationfactory.hxx10
-rw-r--r--slideshow/source/inc/screenupdater.hxx2
9 files changed, 16 insertions, 16 deletions
diff --git a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
index 02cf96d11b96..35845c2abd60 100644
--- a/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
+++ b/slideshow/source/engine/OGLTrans/generic/OGLTrans_TransitionImpl.cxx
@@ -2028,7 +2028,7 @@ void GlitterTransition::finish( double, double, double, double, double )
std::shared_ptr<OGLTransitionImpl>
makeGlitterTransition(const Primitives_t& rLeavingSlidePrimitives,
const Primitives_t& rEnteringSlidePrimitives,
- const TransitionSettings& rSettings = TransitionSettings())
+ const TransitionSettings& rSettings)
{
return std::make_shared<GlitterTransition>(TransitionScene(rLeavingSlidePrimitives, rEnteringSlidePrimitives),
rSettings);
@@ -2051,7 +2051,7 @@ std::shared_ptr<OGLTransitionImpl> makeGlitter()
aSlide.push_back(aHexagon);
- return makeGlitterTransition(aSlide, aEmptySlide);
+ return makeGlitterTransition(aSlide, aEmptySlide, TransitionSettings());
}
namespace
diff --git a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
index 5831fb2ed640..3f830428c6a8 100644
--- a/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationpathmotionnode.cxx
@@ -44,7 +44,7 @@ AnimationActivitySharedPtr AnimationPathMotionNode::createActivity() const
mxPathMotionNode->getAdditive(),
getShape(),
getContext().mpSubsettableShapeManager,
- getSlideSize() ),
+ getSlideSize(), 0 ),
true );
}
diff --git a/slideshow/source/engine/animationnodes/animationtransformnode.cxx b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
index ee451ea2cb89..bc9c86462336 100644
--- a/slideshow/source/engine/animationnodes/animationtransformnode.cxx
+++ b/slideshow/source/engine/animationnodes/animationtransformnode.cxx
@@ -59,7 +59,7 @@ AnimationActivitySharedPtr AnimationTransformNode::createActivity() const
rShape,
getContext().mpSubsettableShapeManager,
getSlideSize(),
- nTransformType ),
+ nTransformType, 0 ),
getXAnimateNode() );
case animations::AnimationTransformType::ROTATE:
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx
index 229e26dd5c7b..83f72a96b457 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.cxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx
@@ -47,7 +47,7 @@ BaseContainerNode::BaseContainerNode(
void BaseContainerNode::dispose()
{
- forEachChildNode( std::mem_fn(&Disposable::dispose) );
+ forEachChildNode( std::mem_fn(&Disposable::dispose), -1 );
maChildren.clear();
BaseNode::dispose();
}
diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx
index cc65be6fdb85..b36f7f5aba03 100644
--- a/slideshow/source/engine/animationnodes/basecontainernode.hxx
+++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx
@@ -70,7 +70,7 @@ protected:
template <typename FuncT>
inline void forEachChildNode( FuncT func,
- int nodeStateMask = -1 ) const
+ int nodeStateMask ) const
{
VectorOfNodes::const_iterator iPos( maChildren.begin() );
VectorOfNodes::const_iterator const iEnd( maChildren.end() );
diff --git a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
index 68bf6497df9c..e768572ad7aa 100644
--- a/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
+++ b/slideshow/source/engine/animationnodes/propertyanimationnode.cxx
@@ -59,7 +59,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
attrName,
pShape,
getContext().mpSubsettableShapeManager,
- getSlideSize() ),
+ getSlideSize(), 0 ),
xAnimateNode );
case AnimationFactory::CLASS_COLOR_PROPERTY:
@@ -79,7 +79,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
attrName,
pShape,
getContext().mpSubsettableShapeManager,
- getSlideSize() ),
+ getSlideSize(), 0 ),
xAnimateNode );
case AnimationFactory::CLASS_BOOL_PROPERTY:
@@ -89,7 +89,7 @@ AnimationActivitySharedPtr PropertyAnimationNode::createActivity() const
attrName,
pShape,
getContext().mpSubsettableShapeManager,
- getSlideSize() ),
+ getSlideSize(), 0 ),
xAnimateNode );
}
diff --git a/slideshow/source/engine/rehearsetimingsactivity.cxx b/slideshow/source/engine/rehearsetimingsactivity.cxx
index 4dc66f19c109..c7f8cd934582 100644
--- a/slideshow/source/engine/rehearsetimingsactivity.cxx
+++ b/slideshow/source/engine/rehearsetimingsactivity.cxx
@@ -385,7 +385,7 @@ void RehearseTimingsActivity::viewChanged( const UnoViewSharedPtr& rView )
aModifiedEntry->second->move( maSpriteRectangle.getMinimum() );
// sprites changed, need screen update
- mrScreenUpdater.notifyUpdate( rView );
+ mrScreenUpdater.notifyUpdate( rView, false );
}
void RehearseTimingsActivity::viewsChanged()
diff --git a/slideshow/source/inc/animationfactory.hxx b/slideshow/source/inc/animationfactory.hxx
index 29c0613b8068..1b9891339e5d 100644
--- a/slideshow/source/inc/animationfactory.hxx
+++ b/slideshow/source/inc/animationfactory.hxx
@@ -89,7 +89,7 @@ namespace slideshow
const AnimatableShapeSharedPtr& rShape,
const ShapeManagerSharedPtr& rShapeManager,
const ::basegfx::B2DVector& rSlideSize,
- int nFlags=0 );
+ int nFlags );
ColorAnimationSharedPtr createColorPropertyAnimation( const OUString& rAttrName,
const AnimatableShapeSharedPtr& rShape,
@@ -108,26 +108,26 @@ namespace slideshow
const ShapeManagerSharedPtr& rShapeManager,
const ::basegfx::B2DVector& rSlideSize,
sal_Int16 nTransformType,
- int nFlags=0 );
+ int nFlags );
StringAnimationSharedPtr createStringPropertyAnimation( const OUString& rAttrName,
const AnimatableShapeSharedPtr& rShape,
const ShapeManagerSharedPtr& rShapeManager,
const ::basegfx::B2DVector& rSlideSize,
- int nFlags=0 );
+ int nFlags );
BoolAnimationSharedPtr createBoolPropertyAnimation( const OUString& rAttrName,
const AnimatableShapeSharedPtr& rShape,
const ShapeManagerSharedPtr& rShapeManager,
const ::basegfx::B2DVector& rSlideSize,
- int nFlags=0 );
+ int nFlags );
NumberAnimationSharedPtr createPathMotionAnimation( const OUString& rSVGDPath,
sal_Int16 nAdditive,
const AnimatableShapeSharedPtr& rShape,
const ShapeManagerSharedPtr& rShapeManager,
const ::basegfx::B2DVector& rSlideSize,
- int nFlags=0);
+ int nFlags);
}
}
}
diff --git a/slideshow/source/inc/screenupdater.hxx b/slideshow/source/inc/screenupdater.hxx
index 4140ed4af725..dcf299b18586 100644
--- a/slideshow/source/inc/screenupdater.hxx
+++ b/slideshow/source/inc/screenupdater.hxx
@@ -71,7 +71,7 @@ namespace slideshow
implementation 'thinks' it does not need to render
something to screen.
*/
- void notifyUpdate( const UnoViewSharedPtr& rView, bool bViewClobbered=false );
+ void notifyUpdate( const UnoViewSharedPtr& rView, bool bViewClobbered );
/** Commits collected update actions
*/