diff options
author | Joseph Powers <jpowers27@cox.net> | 2011-08-31 07:35:52 -0700 |
---|---|---|
committer | Joseph Powers <jpowers27@cox.net> | 2011-08-31 07:37:32 -0700 |
commit | 41449a86c459746061931d609341c0db3ec276a0 (patch) | |
tree | f7972e87bf83c700d057395b1e14586723591b5f /slideshow | |
parent | fc2661c50bccc223175f04674a786191478d2ba1 (diff) |
unusedcode.easy: slideshow::internal cleanup
Diffstat (limited to 'slideshow')
28 files changed, 0 insertions, 372 deletions
diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 951f88bf1454..06a20ed0623b 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -170,11 +170,6 @@ namespace slideshow maContentPixelOffset = rPixelOffset; } - ::basegfx::B2DSize AnimatedSprite::getPixelOffset() const - { - return maContentPixelOffset; - } - void AnimatedSprite::movePixel( const ::basegfx::B2DPoint& rNewPos ) { maPosPixel.reset( rNewPos ); @@ -205,11 +200,6 @@ namespace slideshow mpSprite->transform( rTransform ); } - void AnimatedSprite::setPriority( double nPrio ) - { - mpSprite->setPriority( nPrio ); - } - void AnimatedSprite::hide() { mpSprite->hide(); diff --git a/slideshow/source/engine/animationnodes/nodetools.cxx b/slideshow/source/engine/animationnodes/nodetools.cxx index 756f6b1969b0..6146d4d74cce 100644 --- a/slideshow/source/engine/animationnodes/nodetools.cxx +++ b/slideshow/source/engine/animationnodes/nodetools.cxx @@ -109,22 +109,6 @@ namespace slideshow return true; } - /// Extract the node type from the user data - bool getNodeType( sal_Int16& o_rNodeType, - const uno::Sequence< beans::NamedValue >& rValues ) - { - beans::NamedValue aNamedValue; - - if( findNamedValue( &aNamedValue, - rValues, - ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("node-type") ) ) ) - { - if( (aNamedValue.Value >>= o_rNodeType) ) - return true; - } - - return false; - } } } diff --git a/slideshow/source/engine/animationnodes/nodetools.hxx b/slideshow/source/engine/animationnodes/nodetools.hxx index df120c159ac8..529e45711808 100644 --- a/slideshow/source/engine/animationnodes/nodetools.hxx +++ b/slideshow/source/engine/animationnodes/nodetools.hxx @@ -79,10 +79,6 @@ namespace slideshow */ bool isIndefiniteTiming( const ::com::sun::star::uno::Any& rAny ); - /// Extract the node type from the user data - bool getNodeType( sal_Int16& o_rNodeType, - const ::com::sun::star::uno::Sequence< - ::com::sun::star::beans::NamedValue >& rValues ); } } diff --git a/slideshow/source/engine/color.cxx b/slideshow/source/engine/color.cxx index dfa8b1409706..893500a2e5d6 100644 --- a/slideshow/source/engine/color.cxx +++ b/slideshow/source/engine/color.cxx @@ -188,15 +188,6 @@ namespace slideshow { } - HSLColor::HSLColor( ::cppcanvas::Color::IntSRGBA nRGBColor ) : - maHSLTriple( rgb2hsl( ::cppcanvas::getRed( nRGBColor ) / 255.0, - ::cppcanvas::getGreen( nRGBColor ) / 255.0, - ::cppcanvas::getBlue( nRGBColor ) / 255.0 ) ), - mnMagicValue( getMagic( maHSLTriple.mnLuminance, - maHSLTriple.mnSaturation ) ) - { - } - HSLColor::HSLColor( double nHue, double nSaturation, double nLuminance ) : maHSLTriple( nHue, nSaturation, nLuminance ), mnMagicValue( getMagic( maHSLTriple.mnLuminance, diff --git a/slideshow/source/engine/effectrewinder.cxx b/slideshow/source/engine/effectrewinder.cxx index 9d58ab9f19fd..b8305e39791e 100644 --- a/slideshow/source/engine/effectrewinder.cxx +++ b/slideshow/source/engine/effectrewinder.cxx @@ -299,18 +299,6 @@ sal_Int32 EffectRewinder::countMainSequenceEffects (void) } return nMainSequenceNodeCount; - - // // Skip all main sequence nodes. - // SkipSomeMainSequenceEffects(nMainSequenceNodeCount); -} - - - - -void EffectRewinder::skipSomeMainSequenceEffects (sal_Int32 nSkipCount) -{ - while (--nSkipCount >= 0) - skipSingleMainSequenceEffects(); } diff --git a/slideshow/source/engine/effectrewinder.hxx b/slideshow/source/engine/effectrewinder.hxx index 85b81722f5ef..6166b42870ab 100644 --- a/slideshow/source/engine/effectrewinder.hxx +++ b/slideshow/source/engine/effectrewinder.hxx @@ -150,10 +150,6 @@ private: */ void skipSingleMainSequenceEffects (void); - /** Skip the specified number of main sequence effects. - */ - void skipSomeMainSequenceEffects (const sal_Int32 nSkipCount); - /** Rewind the last effect of the main effect sequence by replaying all previous effects. @param nEffectCount diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index 1d2185cf8495..08b99a4c9b48 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -926,21 +926,6 @@ void EventMultiplexer::addUserPaintHandler( const UserPaintEventHandlerSharedPtr mpImpl->maUserPaintEventHandlers.add( rHandler ); } -void EventMultiplexer::removeUserPaintHandler( const UserPaintEventHandlerSharedPtr& rHandler ) -{ - mpImpl->maUserPaintEventHandlers.remove( rHandler ); -} - -void EventMultiplexer::addShapeCursorHandler( const ShapeCursorEventHandlerSharedPtr& rHandler ) -{ - mpImpl->maShapeCursorHandlers.add( rHandler ); -} - -void EventMultiplexer::removeShapeCursorHandler( const ShapeCursorEventHandlerSharedPtr& rHandler ) -{ - mpImpl->maShapeCursorHandlers.remove( rHandler ); -} - void EventMultiplexer::addClickHandler( const MouseEventHandlerSharedPtr& rHandler, double nPriority ) diff --git a/slideshow/source/engine/expressionnodefactory.cxx b/slideshow/source/engine/expressionnodefactory.cxx index f766eafdfabc..9922e91646ac 100644 --- a/slideshow/source/engine/expressionnodefactory.cxx +++ b/slideshow/source/engine/expressionnodefactory.cxx @@ -258,12 +258,6 @@ namespace slideshow return ExpressionNodeSharedPtr( new DividesExpression(rLHS, rRHS) ); } - ExpressionNodeSharedPtr ExpressionNodeFactory::createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ) - { - return ExpressionNodeSharedPtr( new ComposedExpression(rOuterFunction, rInnerFunction) ); - } - ExpressionNodeSharedPtr ExpressionNodeFactory::createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, const ExpressionNodeSharedPtr& rInnerFunction ) { diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.cxx b/slideshow/source/engine/shapes/drawshapesubsetting.cxx index 622f90317a09..bfe36dcc6c27 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.cxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.cxx @@ -245,22 +245,6 @@ namespace slideshow { } - DrawShapeSubsetting::DrawShapeSubsetting( const GDIMetaFileSharedPtr& rMtf ) : - maActionClassVector(), - mpMtf( rMtf ), - maSubset(), - maSubsetShapes(), - mnMinSubsetActionIndex( SAL_MAX_INT32 ), - mnMaxSubsetActionIndex(0), - maCurrentSubsets(), - mbNodeTreeInitialized( false ) - { - ENSURE_OR_THROW( mpMtf, - "DrawShapeSubsetting::DrawShapeSubsetting(): Invalid metafile" ); - - initCurrentSubsets(); - } - DrawShapeSubsetting::DrawShapeSubsetting( const DocTreeNode& rShapeSubset, const GDIMetaFileSharedPtr& rMtf ) : maActionClassVector(), diff --git a/slideshow/source/engine/shapes/drawshapesubsetting.hxx b/slideshow/source/engine/shapes/drawshapesubsetting.hxx index 1dc560a9b97c..be4fdc5c0a7d 100644 --- a/slideshow/source/engine/shapes/drawshapesubsetting.hxx +++ b/slideshow/source/engine/shapes/drawshapesubsetting.hxx @@ -62,17 +62,6 @@ namespace slideshow /** Create new shape subset handling. - This method creates a subset handler which initially - displays the whole shape. - - @param rMtf - Metafile to retrieve subset info from (must have been - generated with verbose text comments switched on). - */ - explicit DrawShapeSubsetting( const ::boost::shared_ptr< GDIMetaFile >& rMtf ); - - /** Create new shape subset handling. - @param rShapeSubset The subset this object represents (can be empty, then denoting 'represents a whole shape') diff --git a/slideshow/source/engine/shapes/gdimtftools.cxx b/slideshow/source/engine/shapes/gdimtftools.cxx index 220738b33d9c..aed27647642c 100644 --- a/slideshow/source/engine/shapes/gdimtftools.cxx +++ b/slideshow/source/engine/shapes/gdimtftools.cxx @@ -261,44 +261,6 @@ bool getMetaFile( const uno::Reference< lang::XComponent >& xSource, return true; } -void removeTextActions( GDIMetaFile& rMtf ) -{ - // search metafile for text output - MetaAction* pCurrAct; - - int nActionIndex(0); - pCurrAct = rMtf.FirstAction(); - while( pCurrAct ) - { - switch( pCurrAct->GetType() ) - { - case META_TEXTCOLOR_ACTION: - case META_TEXTFILLCOLOR_ACTION: - case META_TEXTLINECOLOR_ACTION: - case META_TEXTALIGN_ACTION: - case META_FONT_ACTION: - case META_LAYOUTMODE_ACTION: - case META_TEXT_ACTION: - case META_TEXTARRAY_ACTION: - case META_TEXTRECT_ACTION: - case META_STRETCHTEXT_ACTION: - case META_TEXTLINE_ACTION: - { - // remove every text-related actions - pCurrAct = rMtf.NextAction(); - - rMtf.RemoveAction( nActionIndex ); - break; - } - - default: - pCurrAct = rMtf.NextAction(); - ++nActionIndex; - break; - } - } -} - sal_Int32 getNextActionOffset( MetaAction * pCurrAct ) { // Special handling for actions that represent diff --git a/slideshow/source/engine/shapes/gdimtftools.hxx b/slideshow/source/engine/shapes/gdimtftools.hxx index 072880739e14..28a105589df2 100644 --- a/slideshow/source/engine/shapes/gdimtftools.hxx +++ b/slideshow/source/engine/shapes/gdimtftools.hxx @@ -114,10 +114,6 @@ namespace slideshow const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XComponentContext >& rxContext ); - /** Remove all text actions from the given metafile. - */ - void removeTextActions( GDIMetaFile& io_rMtf ); - /** Gets the next action offset for iterating meta actions which is most often returns 1. */ diff --git a/slideshow/source/engine/slide/layer.cxx b/slideshow/source/engine/slide/layer.cxx index c345e8012016..063a17cd3d65 100644 --- a/slideshow/source/engine/slide/layer.cxx +++ b/slideshow/source/engine/slide/layer.cxx @@ -138,40 +138,6 @@ namespace slideshow return pRet; } - void Layer::viewChanged( const ViewSharedPtr& rChangedView ) - { - ViewEntryVector::iterator aIter; - const ViewEntryVector::iterator aEnd( maViewEntries.end() ); - if( (aIter=std::find_if( maViewEntries.begin(), - aEnd, - boost::bind<bool>( - std::equal_to< ViewSharedPtr >(), - boost::bind( &ViewEntry::getView, _1 ), - boost::cref( rChangedView )))) != - aEnd ) - { - // adapt size of given ViewLayer - background layer - // resizes with view. - if( !mbBackgroundLayer ) - aIter->mpViewLayer->resize(maBounds); - } - } - - void Layer::viewsChanged() - { - // adapt size of given ViewLayer - background layer - // resizes with view. - if( !mbBackgroundLayer ) - { - std::for_each( maViewEntries.begin(), - maViewEntries.end(), - boost::bind( &ViewLayer::resize, - boost::bind( &ViewEntry::getViewLayer, - _1 ), - boost::cref(maBounds))); - } - } - void Layer::setShapeViews( ShapeSharedPtr const& rShape ) const { rShape->clearAllViewLayers(); diff --git a/slideshow/source/engine/slide/layer.hxx b/slideshow/source/engine/slide/layer.hxx index 6c257c21125c..27eacb73abc4 100644 --- a/slideshow/source/engine/slide/layer.hxx +++ b/slideshow/source/engine/slide/layer.hxx @@ -133,21 +133,6 @@ namespace slideshow */ ViewLayerSharedPtr removeView( const ViewSharedPtr& rView ); - /** Notify that given ViewLayer has changed - - @param rChangedView - This view's layer will get resized. Afterwards, a - complete repaint might be necessary. - */ - void viewChanged( const ViewSharedPtr& rChangedView ); - - /** Notify that all ViewLayer have changed - - This resizes all view layers. Afterwards, a complete - repaint might be necessary. - */ - void viewsChanged(); - /** Init shape with this layer's views @param rShape diff --git a/slideshow/source/engine/slide/layermanager.cxx b/slideshow/source/engine/slide/layermanager.cxx index e8d3a3aa23ab..632bf4c9ec98 100644 --- a/slideshow/source/engine/slide/layermanager.cxx +++ b/slideshow/source/engine/slide/layermanager.cxx @@ -323,19 +323,6 @@ namespace slideshow notifyShapeUpdate( rShape ); } - bool LayerManager::removeShape( const ShapeSharedPtr& rShape ) - { - // remove shape from XShape hash map - if( maXShapeHash.erase( rShape->getXShape() ) == 0 ) - return false; // shape not in map - - OSL_ASSERT( maAllShapes.find(rShape) != maAllShapes.end() ); - - implRemoveShape( rShape ); - - return true; - } - void LayerManager::implRemoveShape( const ShapeSharedPtr& rShape ) { OSL_ASSERT( !maLayers.empty() ); // always at least background layer diff --git a/slideshow/source/engine/slide/layermanager.hxx b/slideshow/source/engine/slide/layermanager.hxx index 74a643430192..bd480bb5a78f 100644 --- a/slideshow/source/engine/slide/layermanager.hxx +++ b/slideshow/source/engine/slide/layermanager.hxx @@ -127,12 +127,6 @@ namespace slideshow */ void addShape( const ShapeSharedPtr& rShape ); - /** Remove shape from this object - - This method removes a shape from the shape. - */ - bool removeShape( const ShapeSharedPtr& rShape ); - /** Lookup a Shape from an XShape model object This method looks up the internal shape map for one diff --git a/slideshow/source/engine/slide/userpaintoverlay.cxx b/slideshow/source/engine/slide/userpaintoverlay.cxx index d060f139f0d9..788ec328c690 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.cxx +++ b/slideshow/source/engine/slide/userpaintoverlay.cxx @@ -533,12 +533,6 @@ namespace slideshow mpHandler->drawPolygons(); } - void UserPaintOverlay::update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ) - { - mpHandler->update_settings( bUserPaintEnabled, aUserPaintColor, dUserPaintStrokeWidth ); - } - - UserPaintOverlay::~UserPaintOverlay() { try diff --git a/slideshow/source/engine/slide/userpaintoverlay.hxx b/slideshow/source/engine/slide/userpaintoverlay.hxx index 05abeaea2056..1f8cbd0c62ae 100644 --- a/slideshow/source/engine/slide/userpaintoverlay.hxx +++ b/slideshow/source/engine/slide/userpaintoverlay.hxx @@ -76,9 +76,6 @@ namespace slideshow PolyPolygonVector getPolygons(); void drawPolygons(); - void update_settings( bool bUserPaintEnabled, RGBColor const& aUserPaintColor, double dUserPaintStrokeWidth ); - - private: UserPaintOverlay( const RGBColor& rStrokeColor, double nStrokeWidth, diff --git a/slideshow/source/engine/transitions/slidechangebase.cxx b/slideshow/source/engine/transitions/slidechangebase.cxx index 44a2c73504c6..087c65b81bd6 100644 --- a/slideshow/source/engine/transitions/slidechangebase.cxx +++ b/slideshow/source/engine/transitions/slidechangebase.cxx @@ -157,13 +157,6 @@ SlideBitmapSharedPtr SlideChangeBase::createBitmap( const UnoViewSharedPtr& pView ); } -::basegfx::B2ISize SlideChangeBase::getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const -{ - return getSlideSizePixel( (*maLeavingSlide)->getSlideSize(), - pView ); -} - - void SlideChangeBase::renderBitmap( SlideBitmapSharedPtr const & pSlideBitmap, cppcanvas::CanvasSharedPtr const & pCanvas ) diff --git a/slideshow/source/engine/transitions/slidechangebase.hxx b/slideshow/source/engine/transitions/slidechangebase.hxx index 98c437671722..5f45ae420815 100644 --- a/slideshow/source/engine/transitions/slidechangebase.hxx +++ b/slideshow/source/engine/transitions/slidechangebase.hxx @@ -131,7 +131,6 @@ protected: const boost::optional<SlideSharedPtr>& rSlide_ ) const; ::basegfx::B2ISize getEnteringSlideSizePixel( const UnoViewSharedPtr& pView ) const; - ::basegfx::B2ISize getLeavingSlideSizePixel( const UnoViewSharedPtr& pView ) const; void renderBitmap( SlideBitmapSharedPtr const& pSlideBitmap, boost::shared_ptr<cppcanvas::Canvas> const& pCanvas ); diff --git a/slideshow/source/engine/unoviewcontainer.cxx b/slideshow/source/engine/unoviewcontainer.cxx index 08bbc1d90ed9..be1925950b48 100644 --- a/slideshow/source/engine/unoviewcontainer.cxx +++ b/slideshow/source/engine/unoviewcontainer.cxx @@ -115,30 +115,6 @@ namespace slideshow return pView; } - bool UnoViewContainer::removeView( const UnoViewSharedPtr& rView ) - { - // remove locally - const UnoViewVector::iterator aEnd( maViews.end() ); - UnoViewVector::iterator aIter; - if( (aIter=::std::find( maViews.begin(), - aEnd, - rView )) == aEnd ) - { - // view seemingly was not added, failed - return false; - } - - OSL_ENSURE( ::std::count( maViews.begin(), - aEnd, - rView ) == 1, - "UnoViewContainer::removeView(): View was added multiple times" ); - - // actually erase from container - maViews.erase( aIter ); - - return true; - } - void UnoViewContainer::dispose() { ::std::for_each( maViews.begin(), diff --git a/slideshow/source/engine/usereventqueue.cxx b/slideshow/source/engine/usereventqueue.cxx index c550a982b300..7bbda226febe 100644 --- a/slideshow/source/engine/usereventqueue.cxx +++ b/slideshow/source/engine/usereventqueue.cxx @@ -694,30 +694,6 @@ UserEventQueue::~UserEventQueue() } } -bool UserEventQueue::isEmpty() const -{ - // TODO(T2): This is not thread safe, the handlers are all - // only separately synchronized. This poses the danger of - // generating false empty status on XSlideShow::update(), such - // that the last events of a slide are not triggered. - - // we're empty iff all handler queues are empty - return - (mpStartEventHandler ? mpStartEventHandler->isEmpty() : true) && - (mpEndEventHandler ? mpEndEventHandler->isEmpty() : true) && - (mpAnimationStartEventHandler ? mpAnimationStartEventHandler->isEmpty() : true) && - (mpAnimationEndEventHandler ? mpAnimationEndEventHandler->isEmpty() : true) && - (mpAudioStoppedEventHandler ? mpAudioStoppedEventHandler->isEmpty() : true) && - (mpShapeClickEventHandler ? mpShapeClickEventHandler->isEmpty() : true) && - (mpClickEventHandler ? mpClickEventHandler->isEmpty() : true) && - (mpSkipEffectEventHandler ? mpSkipEffectEventHandler->isEmpty() : true) && - (mpRewindEffectEventHandler ? mpRewindEffectEventHandler->isEmpty() : true) && - (mpShapeDoubleClickEventHandler ? mpShapeDoubleClickEventHandler->isEmpty() : true) && - (mpDoubleClickEventHandler ? mpDoubleClickEventHandler->isEmpty() : true) && - (mpMouseEnterHandler ? mpMouseEnterHandler->isEmpty() : true) && - (mpMouseLeaveHandler ? mpMouseLeaveHandler->isEmpty() : true); -} - void UserEventQueue::clear() { // unregister and delete all handlers @@ -790,23 +766,6 @@ void UserEventQueue::setAdvanceOnClick( bool bAdvanceOnClick ) mpClickEventHandler->setAdvanceOnClick( bAdvanceOnClick ); } - -void UserEventQueue::registerSlideStartEvent( const EventSharedPtr& rEvent ) -{ - registerEvent( mpStartEventHandler, - rEvent, - boost::bind( &EventMultiplexer::addSlideStartHandler, - boost::ref( mrMultiplexer ), _1 ) ); -} - -void UserEventQueue::registerSlideEndEvent( const EventSharedPtr& rEvent ) -{ - registerEvent( mpEndEventHandler, - rEvent, - boost::bind( &EventMultiplexer::addSlideEndHandler, - boost::ref( mrMultiplexer ), _1 ) ); -} - void UserEventQueue::registerAnimationStartEvent( const EventSharedPtr& rEvent, const uno::Reference< animations::XAnimationNode>& xNode ) @@ -964,15 +923,6 @@ void UserEventQueue::registerShapeDoubleClickEvent( mpShapeDoubleClickEventHandler->addEvent( rEvent, rShape ); } -void UserEventQueue::registerDoubleClickEvent( const EventSharedPtr& rEvent ) -{ - registerEvent( mpDoubleClickEventHandler, - rEvent, - boost::bind( &EventMultiplexer::addDoubleClickHandler, - boost::ref( mrMultiplexer ), _1, - 0.0 /* default prio */ ) ); -} - void UserEventQueue::registerMouseEnterEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ) { diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index 578b78bcf309..af266c5b7eab 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -96,9 +96,6 @@ namespace slideshow */ void setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ); - /// Retrieve current pixel offset for content output. - ::basegfx::B2DSize getPixelOffset() const; - /// Show the sprite void show(); @@ -153,16 +150,6 @@ namespace slideshow */ void transform( const ::basegfx::B2DHomMatrix& rTransform ); - /** Set the sprite priority. - - The sprite priority determines the ordering of the - sprites on screen, i.e. which sprite lies before which. - - @param rPrio - The new sprite prio. Must be in the range [0,1] - */ - void setPriority( double rPrio ); - private: ViewLayerSharedPtr mpViewLayer; diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index 667ba145eee9..8a6b878a9715 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -169,22 +169,12 @@ public: void removeShapeListenerHandler( const ShapeListenerEventHandlerSharedPtr& rHandler ); /** Register an event handler that will be called when - XShapeListeners are changed. - - @param rHandler - Handler to call when a shape listener changes - */ - void addShapeCursorHandler( const ShapeCursorEventHandlerSharedPtr& rHandler ); - void removeShapeCursorHandler( const ShapeCursorEventHandlerSharedPtr& rHandler ); - - /** Register an event handler that will be called when user paint parameters change. @param rHandler Handler to call when a shape listener changes */ void addUserPaintHandler( const UserPaintEventHandlerSharedPtr& rHandler ); - void removeUserPaintHandler( const UserPaintEventHandlerSharedPtr& rHandler ); /** Register an event handler that will be called when the user requests the next effect. diff --git a/slideshow/source/inc/expressionnodefactory.hxx b/slideshow/source/inc/expressionnodefactory.hxx index f064b68cb9f0..720a0462e374 100644 --- a/slideshow/source/inc/expressionnodefactory.hxx +++ b/slideshow/source/inc/expressionnodefactory.hxx @@ -68,9 +68,6 @@ namespace slideshow The resulting expression will calculate rOuterFunction( rInnerFunction(t) ). */ - static ExpressionNodeSharedPtr createComposedExpression ( const ExpressionNodeSharedPtr& rOuterFunction, - const ExpressionNodeSharedPtr& rInnerFunction ); - static ExpressionNodeSharedPtr createMinExpression ( const ExpressionNodeSharedPtr& rOuterFunction, const ExpressionNodeSharedPtr& rInnerFunction ); diff --git a/slideshow/source/inc/hslcolor.hxx b/slideshow/source/inc/hslcolor.hxx index 5858212c3cbe..66599232925f 100644 --- a/slideshow/source/inc/hslcolor.hxx +++ b/slideshow/source/inc/hslcolor.hxx @@ -46,7 +46,6 @@ namespace slideshow { public: HSLColor(); - explicit HSLColor( ::cppcanvas::Color::IntSRGBA nRGBColor ); HSLColor( double nHue, double nSaturation, double nLuminance ); explicit HSLColor( const RGBColor& rColor ); diff --git a/slideshow/source/inc/unoviewcontainer.hxx b/slideshow/source/inc/unoviewcontainer.hxx index 16016cde55aa..47436d26e00f 100644 --- a/slideshow/source/inc/unoviewcontainer.hxx +++ b/slideshow/source/inc/unoviewcontainer.hxx @@ -67,13 +67,6 @@ namespace slideshow /** Remove a previously added a view from this container - @return true, if this view was successfully removed, false - otherwise (e.g. if this view wasn't added in the first place) - */ - bool removeView( const UnoViewSharedPtr& rView ); - - /** Remove a previously added a view from this container - @return the View object, if this view was successfully removed, and an empty shared_ptr otherwise (e.g. if this view wasn't added in the first place) diff --git a/slideshow/source/inc/usereventqueue.hxx b/slideshow/source/inc/usereventqueue.hxx index e49faf74811a..ae2e12cf5761 100644 --- a/slideshow/source/inc/usereventqueue.hxx +++ b/slideshow/source/inc/usereventqueue.hxx @@ -93,10 +93,6 @@ public: CursorManager& rCursorManager ); ~UserEventQueue(); - /** Query whether there are any events still pending. - */ - bool isEmpty() const; - /** Clear all registered events. This method clears all registered, but @@ -116,24 +112,6 @@ public: */ void setAdvanceOnClick( bool bAdvanceOnClick ); - /** Register an event that will be fired when the slide is - just shown. - - Note that <em>all</em> registered events will be fired - when the slide start occurs. This is in contrast to - the mouse events below. - */ - void registerSlideStartEvent( const EventSharedPtr& rEvent ); - - /** Register an event that will be fired when the slide is - about to vanish. - - Note that <em>all</em> registered events will be fired - when the slide end occurs. This is in contrast to - the mouse events below. - */ - void registerSlideEndEvent( const EventSharedPtr& rEvent ); - /** Register an event that will be fired when the given animation node starts. @@ -233,18 +211,6 @@ public: void registerShapeDoubleClickEvent( const EventSharedPtr& rEvent, const ShapeSharedPtr& rShape ); - /** Register an event that is fired on a double mouse click - - For every mouse double click, only one of the events - registered here is fired. The order of fired events is - the order of registration, i.e. the first event - registered will be the one fired for the first mouse - double click. It is irrelevant where on the slide the - mouse is clicked, i.e. the shape need not be hit by - the mouse. - */ - void registerDoubleClickEvent( const EventSharedPtr& rEvent ); - /** Register an event that is fired when the mouse enters the area of the given shape |