diff options
Diffstat (limited to 'slideshow/source/engine')
6 files changed, 13 insertions, 13 deletions
diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 29c37c050d34..0d3c391ad88b 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -262,7 +262,7 @@ struct EventMultiplexerImpl double nPriority, RegisterFunction pRegisterListener ); - bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, + static bool notifyAllAnimationHandlers( ImplAnimationHandlers const& rContainer, AnimationNodeSharedPtr const& rNode ); bool notifyMouseHandlers( @@ -1110,14 +1110,14 @@ bool EventMultiplexer::notifySlideEndEvent() bool EventMultiplexer::notifyAnimationStart( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers, + return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationStartHandlers, rNode ); } bool EventMultiplexer::notifyAnimationEnd( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers, + return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAnimationEndHandlers, rNode ); } @@ -1130,7 +1130,7 @@ bool EventMultiplexer::notifySlideAnimationsEnd() bool EventMultiplexer::notifyAudioStopped( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( + return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maAudioStoppedHandlers, rNode ); } @@ -1138,7 +1138,7 @@ bool EventMultiplexer::notifyAudioStopped( bool EventMultiplexer::notifyCommandStopAudio( const AnimationNodeSharedPtr& rNode ) { - return mpImpl->notifyAllAnimationHandlers( + return EventMultiplexerImpl::notifyAllAnimationHandlers( mpImpl->maCommandStopAudioHandlers, rNode ); } diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index ee0272750f0f..cc0828a13f40 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -672,7 +672,7 @@ namespace slideshow sal_Int32 DrawShapeSubsetting::implGetNumberOfTreeNodes( const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rBegin, const DrawShapeSubsetting::IndexClassificatorVector::const_iterator& rEnd, - DocTreeNode::NodeType eNodeType ) const + DocTreeNode::NodeType eNodeType ) { const IndexClassificator eRequestedClass( mapDocTreeNode( eNodeType ) ); diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index cb1cc556b1c9..12b1f97e988c 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -204,9 +204,9 @@ namespace slideshow void initCurrentSubsets(); void reset(); - sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin, + static sal_Int32 implGetNumberOfTreeNodes( const IndexClassificatorVector::const_iterator& rBegin, const IndexClassificatorVector::const_iterator& rEnd, - DocTreeNode::NodeType eNodeType ) const; + DocTreeNode::NodeType eNodeType ); DocTreeNode implGetTreeNode( const IndexClassificatorVector::const_iterator& rBegin, const IndexClassificatorVector::const_iterator& rEnd, sal_Int32 nNodeIndex, diff --git a/slideshow/source/engine/shapes/viewshape.cxx b/slideshow/source/engine/shapes/viewshape.cxx index bb87b65534e6..2653c9753270 100644 --- a/slideshow/source/engine/shapes/viewshape.cxx +++ b/slideshow/source/engine/shapes/viewshape.cxx @@ -63,7 +63,7 @@ namespace slideshow bool ViewShape::prefetch( RendererCacheEntry& io_rCacheEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const + const ShapeAttributeLayerSharedPtr& rAttr ) { ENSURE_OR_RETURN_FALSE( rMtf, "ViewShape::prefetch(): no valid metafile!" ); diff --git a/slideshow/source/engine/shapes/viewshape.hxx b/slideshow/source/engine/shapes/viewshape.hxx index 199fcfd63737..fcddf74c9884 100644 --- a/slideshow/source/engine/shapes/viewshape.hxx +++ b/slideshow/source/engine/shapes/viewshape.hxx @@ -236,10 +236,10 @@ namespace slideshow /** Prefetch Renderer for given canvas */ - bool prefetch( RendererCacheEntry& io_rCacheEntry, + static bool prefetch( RendererCacheEntry& io_rCacheEntry, const ::cppcanvas::CanvasSharedPtr& rDestinationCanvas, const GDIMetaFileSharedPtr& rMtf, - const ShapeAttributeLayerSharedPtr& rAttr ) const; + const ShapeAttributeLayerSharedPtr& rAttr ); /** Draw with prefetched Renderer to stored canvas diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 78725937ed90..7887ae2ad2eb 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -123,7 +123,7 @@ protected: ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const; - void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, + static void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); /** Called on derived classes to perform actions before first run. @@ -182,7 +182,7 @@ private: double nPrio ) const; void addSprites( ViewEntry& rEntry ); - void clearViewEntry( ViewEntry& rEntry ); + static void clearViewEntry( ViewEntry& rEntry ); ViewsVecT::iterator lookupView( UnoViewSharedPtr const & pView ); ViewsVecT::const_iterator lookupView( UnoViewSharedPtr const & pView ) const; |