scripting/source/stringresource/stringresource.cxx | 19 -- scripting/source/stringresource/stringresource.hxx | 4 sd/inc/drawdoc.hxx | 2 sd/inc/pglink.hxx | 2 sd/inc/shapelist.hxx | 5 sd/source/core/drawdoc3.cxx | 4 sd/source/core/shapelist.cxx | 6 sd/source/filter/eppt/eppt.cxx | 3 sd/source/filter/eppt/eppt.hxx | 2 sd/source/filter/eppt/epptbase.hxx | 2 sd/source/filter/eppt/pptx-epptbase.cxx | 6 sd/source/filter/html/pubdlg.cxx | 10 - sd/source/filter/ppt/pptinanimations.cxx | 7 sd/source/filter/ppt/pptinanimations.hxx | 4 sd/source/ui/animations/CustomAnimationCreateDialog.cxx | 6 sd/source/ui/app/optsitem.cxx | 25 --- sd/source/ui/dlg/assclass.cxx | 11 - sd/source/ui/func/futext.cxx | 7 sd/source/ui/inc/DrawViewShell.hxx | 2 sd/source/ui/inc/OutlineView.hxx | 2 sd/source/ui/inc/OutlineViewShell.hxx | 8 - sd/source/ui/inc/View.hxx | 6 sd/source/ui/inc/ViewShell.hxx | 4 sd/source/ui/inc/assclass.hxx | 4 sd/source/ui/inc/futext.hxx | 2 sd/source/ui/inc/optsitem.hxx | 3 sd/source/ui/inc/pubdlg.hxx | 2 sd/source/ui/inc/slideshow.hxx | 2 sd/source/ui/presenter/PresenterTextView.cxx | 5 sd/source/ui/sidebar/MasterPageContainerProviders.cxx | 25 --- sd/source/ui/sidebar/MasterPageContainerProviders.hxx | 5 sd/source/ui/slideshow/showwin.cxx | 4 sd/source/ui/slideshow/showwindow.hxx | 2 sd/source/ui/slideshow/slideshow.cxx | 3 sd/source/ui/slideshow/slideshowimpl.cxx | 8 - sd/source/ui/slideshow/slideshowimpl.hxx | 4 sd/source/ui/slideshow/slideshowviewimpl.cxx | 3 sd/source/ui/slideshow/slideshowviewimpl.hxx | 2 sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx | 6 sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx | 6 sd/source/ui/slidesorter/controller/SlideSorterController.cxx | 11 - sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx | 9 - sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx | 2 sd/source/ui/slidesorter/model/SlsVisualState.cxx | 5 sd/source/ui/view/drviewsh.cxx | 6 sd/source/ui/view/outlnvsh.cxx | 20 -- sd/source/ui/view/outlview.cxx | 3 sd/source/ui/view/sdview.cxx | 4 sd/source/ui/view/sdview4.cxx | 11 - sd/source/ui/view/viewshe2.cxx | 8 - sdext/source/minimizer/impoptimizer.cxx | 9 - sdext/source/minimizer/impoptimizer.hxx | 2 sdext/source/minimizer/informationdialog.cxx | 3 sdext/source/minimizer/informationdialog.hxx | 2 sdext/source/minimizer/optimizerdialog.cxx | 3 sdext/source/minimizer/optimizerdialog.hxx | 2 sdext/source/pdfimport/inc/pdfparse.hxx | 2 sdext/source/pdfimport/pdfparse/pdfentries.cxx | 8 - sdext/source/presenter/PresenterPaneBorderPainter.cxx | 8 - sdext/source/presenter/PresenterPaneBorderPainter.hxx | 2 sfx2/source/doc/doctemplates.cxx | 6 sfx2/source/inc/sfxtypes.hxx | 2 sfx2/source/inc/virtmenu.hxx | 7 slideshow/source/engine/animatedsprite.cxx | 4 slideshow/source/engine/animationnodes/basecontainernode.cxx | 3 slideshow/source/engine/animationnodes/basecontainernode.hxx | 2 slideshow/source/engine/animationnodes/basenode.cxx | 10 - slideshow/source/engine/animationnodes/basenode.hxx | 2 slideshow/source/engine/eventmultiplexer.cxx | 72 +++++----- slideshow/source/engine/shapes/appletshape.cxx | 10 - slideshow/source/engine/shapes/backgroundshape.cxx | 5 slideshow/source/engine/shapes/drawshape.cxx | 9 - slideshow/source/engine/shapes/drawshape.hxx | 4 slideshow/source/engine/shapes/externalshapebase.hxx | 2 slideshow/source/engine/shapes/mediashape.cxx | 11 - slideshow/source/engine/shapes/shapeimporter.cxx | 5 slideshow/source/engine/shapes/viewappletshape.cxx | 7 slideshow/source/engine/shapes/viewappletshape.hxx | 4 slideshow/source/engine/shapes/viewmediashape.cxx | 8 - slideshow/source/engine/shapes/viewmediashape.hxx | 6 slideshow/source/engine/shapesubset.cxx | 4 slideshow/source/engine/slide/shapemanagerimpl.cxx | 14 - slideshow/source/engine/slide/shapemanagerimpl.hxx | 6 slideshow/source/engine/slide/slideimpl.cxx | 29 +--- slideshow/source/inc/animatedsprite.hxx | 5 slideshow/source/inc/animationnode.hxx | 6 slideshow/source/inc/eventmultiplexer.hxx | 70 ++------- slideshow/source/inc/listenercontainer.hxx | 9 - slideshow/source/inc/shape.hxx | 6 slideshow/source/inc/shapesubset.hxx | 4 slideshow/source/inc/slide.hxx | 4 slideshow/source/inc/subsettableshapemanager.hxx | 12 - sot/source/sdstor/stgelem.cxx | 3 sot/source/sdstor/stgelem.hxx | 2 sot/source/sdstor/ucbstorage.cxx | 23 +-- starmath/inc/caret.hxx | 3 starmath/inc/dialog.hxx | 8 - starmath/inc/document.hxx | 2 starmath/inc/parse.hxx | 2 starmath/inc/utility.hxx | 1 starmath/source/document.cxx | 4 starmath/source/parse.cxx | 4 starmath/source/rtfexport.cxx | 5 starmath/source/rtfexport.hxx | 2 starmath/source/utility.cxx | 5 105 files changed, 233 insertions(+), 532 deletions(-)
New commits: commit ac91a81b7b47fc9eba24455d34e2168309ea51d1 Author: Noel Grandin <n...@peralex.com> Date: Thu Jan 14 11:45:08 2016 +0200 loplugin:unusedmethods unused return value in sot Change-Id: Icb5382a411a1cb035581f0cef5f6fae60bfb4940 diff --git a/sot/source/sdstor/stgelem.cxx b/sot/source/sdstor/stgelem.cxx index 356edc5..b0b7ac0 100644 --- a/sot/source/sdstor/stgelem.cxx +++ b/sot/source/sdstor/stgelem.cxx @@ -258,7 +258,7 @@ void StgHeader::SetMasters( sal_Int32 n ) ///////////////////////////// class StgEntry -bool StgEntry::Init() +void StgEntry::Init() { memset( m_nName, 0, sizeof( m_nName ) ); m_nNameLen = 0; @@ -279,7 +279,6 @@ bool StgEntry::Init() SetLeaf( STG_RIGHT, STG_FREE ); SetLeaf( STG_CHILD, STG_FREE ); SetLeaf( STG_DATA, STG_EOF ); - return true; } static OUString ToUpperUnicode( const OUString & rStr ) diff --git a/sot/source/sdstor/stgelem.hxx b/sot/source/sdstor/stgelem.hxx index 790fadd..4ae4731 100644 --- a/sot/source/sdstor/stgelem.hxx +++ b/sot/source/sdstor/stgelem.hxx @@ -124,7 +124,7 @@ class StgEntry sal_Int32 m_nUnknown; // 7C unknown OUString m_aName; // Name as Compare String (ascii, upper) public: - bool Init(); // initialize the data + void Init(); // initialize the data bool SetName( const OUString& ); // store a name (ASCII, up to 32 chars) void GetName( OUString& rName ) const; // fill in the name diff --git a/sot/source/sdstor/ucbstorage.cxx b/sot/source/sdstor/ucbstorage.cxx index a8586fd..6c1f908 100644 --- a/sot/source/sdstor/ucbstorage.cxx +++ b/sot/source/sdstor/ucbstorage.cxx @@ -443,7 +443,7 @@ public: bool Init(); bool Clear(); sal_Int16 Commit(); // if modified and committed: transfer an XInputStream to the content - bool Revert(); // discard all changes + void Revert(); // discard all changes BaseStorage* CreateStorage();// create an OLE Storage on the UCBStorageStream sal_uLong GetSize(); @@ -451,7 +451,7 @@ public: // no seeking is produced sal_uLong ReadSourceWriteTemporary(); // read source till the end and copy to temporary, - sal_uLong CopySourceToTemporary(); // same as ReadSourceWriteToTemporary() + void CopySourceToTemporary(); // same as ReadSourceWriteToTemporary() // but the writing is done at the end of temporary // pointer position is not changed using SvStream::SetError; @@ -507,7 +507,7 @@ public: bool Revert(); bool Insert( ::ucbhelper::Content *pContent ); UCBStorage_Impl* OpenStorage( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect ); - UCBStorageStream_Impl* OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey=nullptr ); + void OpenStream( UCBStorageElement_Impl*, StreamMode, bool, const OString* pKey=nullptr ); void SetProps( const Sequence < Sequence < PropertyValue > >& rSequence, const OUString& ); void GetProps( sal_Int32&, Sequence < Sequence < PropertyValue > >& rSequence, const OUString& ); sal_Int32 GetObjectCount(); @@ -862,21 +862,16 @@ sal_uInt64 UCBStorageStream_Impl::ReadSourceWriteTemporary(sal_uInt64 aLength) return aResult; } -sal_uLong UCBStorageStream_Impl::CopySourceToTemporary() +void UCBStorageStream_Impl::CopySourceToTemporary() { // current position of the temporary stream is not changed - sal_uLong aResult = 0; - if( m_bSourceRead ) { sal_uLong aPos = m_pStream->Tell(); m_pStream->Seek( STREAM_SEEK_TO_END ); - aResult = ReadSourceWriteTemporary(); + ReadSourceWriteTemporary(); m_pStream->Seek( aPos ); } - - return aResult; - } // UCBStorageStream_Impl must have a SvStream interface, because it then can be used as underlying stream @@ -1151,13 +1146,13 @@ sal_Int16 UCBStorageStream_Impl::Commit() return COMMIT_RESULT_NOTHING_TO_DO; } -bool UCBStorageStream_Impl::Revert() +void UCBStorageStream_Impl::Revert() { // if an OLEStorage is created on this stream, no "revert" is necessary because OLEStorages do nothing on "Revert" ! if ( m_bCommited ) { OSL_FAIL("Revert while commit is in progress!" ); - return false; // ??? + return; // ??? } Free(); @@ -1200,7 +1195,6 @@ bool UCBStorageStream_Impl::Revert() m_bModified = false; m_aName = m_aOriginalName; m_aContentType = m_aOriginalContentType; - return ( GetError() == ERRCODE_NONE ); } bool UCBStorageStream_Impl::Clear() @@ -2708,13 +2702,12 @@ BaseStorageStream* UCBStorage::OpenStream( const OUString& rEleName, StreamMode return nullptr; } -UCBStorageStream_Impl* UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect, const OString* pKey ) +void UCBStorage_Impl::OpenStream( UCBStorageElement_Impl* pElement, StreamMode nMode, bool bDirect, const OString* pKey ) { OUString aName( m_aURL ); aName += "/"; aName += pElement->m_aOriginalName; pElement->m_xStream = new UCBStorageStream_Impl( aName, nMode, nullptr, bDirect, pKey, m_bRepairPackage, m_xProgressHandler ); - return pElement->m_xStream; } BaseStorage* UCBStorage::OpenUCBStorage( const OUString& rEleName, StreamMode nMode, bool bDirect ) commit 21595018cd22345ef15dc13d0ccf9cc5a89660fe Author: Noel Grandin <n...@peralex.com> Date: Thu Jan 14 11:45:01 2016 +0200 loplugin:unusedmethods unused return value in slideshow Change-Id: I1ed955a0e474a755949e80eef60c8cd19f43fd0e diff --git a/slideshow/source/engine/animatedsprite.cxx b/slideshow/source/engine/animatedsprite.cxx index 48edbca..2c18701 100644 --- a/slideshow/source/engine/animatedsprite.cxx +++ b/slideshow/source/engine/animatedsprite.cxx @@ -89,7 +89,7 @@ namespace slideshow return pContentCanvas; } - bool AnimatedSprite::resize( const ::basegfx::B2DSize& rSpriteSizePixel ) + void AnimatedSprite::resize( const ::basegfx::B2DSize& rSpriteSizePixel ) { // Enlarge or reduce the sprite size, if necessary. This // method employs a strategy similar to container, when @@ -148,8 +148,6 @@ namespace slideshow mpSprite->setClip( *maClip ); } } - - return static_cast< bool >(mpSprite); } void AnimatedSprite::setPixelOffset( const ::basegfx::B2DSize& rPixelOffset ) diff --git a/slideshow/source/engine/animationnodes/basecontainernode.cxx b/slideshow/source/engine/animationnodes/basecontainernode.cxx index 95e9ef1..cd4aa9b 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.cxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.cxx @@ -163,13 +163,12 @@ bool BaseContainerNode::notifyDeactivatedChild( return bFinished; } -bool BaseContainerNode::repeat() +void BaseContainerNode::repeat() { forEachChildNode( boost::mem_fn(&AnimationNode::end), ~ENDED ); bool bState = init_children(); if( bState ) activate_st(); - return bState; } #if defined(DBG_UTIL) diff --git a/slideshow/source/engine/animationnodes/basecontainernode.hxx b/slideshow/source/engine/animationnodes/basecontainernode.hxx index 7549039..7fb308c 100644 --- a/slideshow/source/engine/animationnodes/basecontainernode.hxx +++ b/slideshow/source/engine/animationnodes/basecontainernode.hxx @@ -66,7 +66,7 @@ protected: /// @return true: if all children have been deactivated bool notifyDeactivatedChild( AnimationNodeSharedPtr const& pChildNode ); - bool repeat(); + void repeat(); template <typename FuncT> inline void forEachChildNode( FuncT const& func, diff --git a/slideshow/source/engine/animationnodes/basenode.cxx b/slideshow/source/engine/animationnodes/basenode.cxx index b2e66b0..d7af870 100644 --- a/slideshow/source/engine/animationnodes/basenode.cxx +++ b/slideshow/source/engine/animationnodes/basenode.cxx @@ -490,14 +490,14 @@ bool BaseNode::resolve_st() } -bool BaseNode::activate() +void BaseNode::activate() { if (! checkValidNode()) - return false; + return; OSL_ASSERT( meCurrState != ACTIVE ); if (inStateOrTransition( ACTIVE )) - return true; + return; StateTransition st(this); if (st.enter( ACTIVE )) { @@ -507,11 +507,7 @@ bool BaseNode::activate() st.commit(); // changing state maContext.mrEventMultiplexer.notifyAnimationStart( mpSelf ); - - return true; } - - return false; } void BaseNode::activate_st() diff --git a/slideshow/source/engine/animationnodes/basenode.hxx b/slideshow/source/engine/animationnodes/basenode.hxx index 25dd2b9..0d24483 100644 --- a/slideshow/source/engine/animationnodes/basenode.hxx +++ b/slideshow/source/engine/animationnodes/basenode.hxx @@ -106,7 +106,7 @@ public: // AnimationNode: virtual bool init() override; virtual bool resolve() override; - virtual bool activate() override; + virtual void activate() override; virtual void deactivate() override; virtual void end() override; virtual css::uno::Reference<css::animations::XAnimationNode> getXAnimationNode() const override; diff --git a/slideshow/source/engine/eventmultiplexer.cxx b/slideshow/source/engine/eventmultiplexer.cxx index ef9a959..c587340 100644 --- a/slideshow/source/engine/eventmultiplexer.cxx +++ b/slideshow/source/engine/eventmultiplexer.cxx @@ -981,66 +981,66 @@ void EventMultiplexer::removeHyperlinkHandler( const HyperlinkHandlerSharedPtr& 0.0) ); } -bool EventMultiplexer::notifyShapeListenerAdded( +void EventMultiplexer::notifyShapeListenerAdded( const uno::Reference<presentation::XShapeEventListener>& xListener, const uno::Reference<drawing::XShape>& xShape ) { - return mpImpl->maShapeListenerHandlers.applyAll( + mpImpl->maShapeListenerHandlers.applyAll( [&xListener, &xShape]( const ShapeListenerEventHandlerSharedPtr& pHandler ) { return pHandler->listenerAdded( xListener, xShape ); } ); } -bool EventMultiplexer::notifyShapeListenerRemoved( +void EventMultiplexer::notifyShapeListenerRemoved( const uno::Reference<presentation::XShapeEventListener>& xListener, const uno::Reference<drawing::XShape>& xShape ) { - return mpImpl->maShapeListenerHandlers.applyAll( + mpImpl->maShapeListenerHandlers.applyAll( [&xListener, &xShape]( const ShapeListenerEventHandlerSharedPtr& pHandler ) { return pHandler->listenerRemoved( xListener, xShape ); } ); } -bool EventMultiplexer::notifyUserPaintColor( RGBColor const& rUserColor ) +void EventMultiplexer::notifyUserPaintColor( RGBColor const& rUserColor ) { - return mpImpl->maUserPaintEventHandlers.applyAll( + mpImpl->maUserPaintEventHandlers.applyAll( [&rUserColor]( const UserPaintEventHandlerSharedPtr& pHandler ) { return pHandler->colorChanged( rUserColor ); } ); } -bool EventMultiplexer::notifyUserPaintStrokeWidth( double rUserStrokeWidth ) +void EventMultiplexer::notifyUserPaintStrokeWidth( double rUserStrokeWidth ) { - return mpImpl->maUserPaintEventHandlers.applyAll( + mpImpl->maUserPaintEventHandlers.applyAll( [&rUserStrokeWidth]( const UserPaintEventHandlerSharedPtr& pHandler ) { return pHandler->widthChanged( rUserStrokeWidth ); } ); } -bool EventMultiplexer::notifyUserPaintDisabled() +void EventMultiplexer::notifyUserPaintDisabled() { - return mpImpl->maUserPaintEventHandlers.applyAll( + mpImpl->maUserPaintEventHandlers.applyAll( boost::mem_fn(&UserPaintEventHandler::disable)); } -bool EventMultiplexer::notifySwitchPenMode(){ - return mpImpl->maUserPaintEventHandlers.applyAll( +void EventMultiplexer::notifySwitchPenMode(){ + mpImpl->maUserPaintEventHandlers.applyAll( boost::mem_fn(&UserPaintEventHandler::switchPenMode)); } -bool EventMultiplexer::notifySwitchEraserMode(){ - return mpImpl->maUserPaintEventHandlers.applyAll( +void EventMultiplexer::notifySwitchEraserMode(){ + mpImpl->maUserPaintEventHandlers.applyAll( boost::mem_fn(&UserPaintEventHandler::switchEraserMode)); } //adding erasing all ink features with UserPaintOverlay -bool EventMultiplexer::notifyEraseAllInk( bool const& rEraseAllInk ) +void EventMultiplexer::notifyEraseAllInk( bool const& rEraseAllInk ) { - return mpImpl->maUserPaintEventHandlers.applyAll( + mpImpl->maUserPaintEventHandlers.applyAll( [&rEraseAllInk]( const UserPaintEventHandlerSharedPtr& pHandler ) { return pHandler->eraseAllInkChanged( rEraseAllInk ); } ); } //adding erasing features with UserPaintOverlay -bool EventMultiplexer::notifyEraseInkWidth( sal_Int32 rEraseInkSize ) +void EventMultiplexer::notifyEraseInkWidth( sal_Int32 rEraseInkSize ) { - return mpImpl->maUserPaintEventHandlers.applyAll( + mpImpl->maUserPaintEventHandlers.applyAll( [&rEraseInkSize]( const UserPaintEventHandlerSharedPtr& pHandler ) { return pHandler->eraseInkWidthChanged( rEraseInkSize ); } ); } @@ -1050,9 +1050,9 @@ bool EventMultiplexer::notifyNextEffect() return mpImpl->notifyNextEffect(); } -bool EventMultiplexer::notifySlideStartEvent() +void EventMultiplexer::notifySlideStartEvent() { - return mpImpl->maSlideStartHandlers.applyAll( + mpImpl->maSlideStartHandlers.applyAll( boost::mem_fn(&EventHandler::handleEvent) ); } @@ -1098,14 +1098,14 @@ bool EventMultiplexer::notifyCommandStopAudio( rNode ); } -bool EventMultiplexer::notifyPauseMode( bool bPauseShow ) +void EventMultiplexer::notifyPauseMode( bool bPauseShow ) { - return mpImpl->maPauseHandlers.applyAll( + mpImpl->maPauseHandlers.applyAll( [&bPauseShow]( const PauseEventHandlerSharedPtr& pHandler ) { return pHandler->handlePause( bPauseShow ); } ); } -bool EventMultiplexer::notifyViewAdded( const UnoViewSharedPtr& rView ) +void EventMultiplexer::notifyViewAdded( const UnoViewSharedPtr& rView ) { ENSURE_OR_THROW( rView, "EventMultiplexer::notifyViewAdded(): Invalid view"); @@ -1121,12 +1121,12 @@ bool EventMultiplexer::notifyViewAdded( const UnoViewSharedPtr& rView ) rUnoView->addMouseMotionListener( mpImpl->mxListener.get() ); - return mpImpl->maViewHandlers.applyAll( + mpImpl->maViewHandlers.applyAll( [&rView]( const ViewEventHandlerWeakPtr& pHandler ) { return pHandler.lock()->viewAdded( rView ); } ); } -bool EventMultiplexer::notifyViewRemoved( const UnoViewSharedPtr& rView ) +void EventMultiplexer::notifyViewRemoved( const UnoViewSharedPtr& rView ) { ENSURE_OR_THROW( rView, "EventMultiplexer::removeView(): Invalid view" ); @@ -1143,7 +1143,7 @@ bool EventMultiplexer::notifyViewRemoved( const UnoViewSharedPtr& rView ) rUnoView->removeMouseMotionListener( mpImpl->mxListener.get() ); - return mpImpl->maViewHandlers.applyAll( + mpImpl->maViewHandlers.applyAll( [&rView]( const ViewEventHandlerWeakPtr& pHandler ) { return pHandler.lock()->viewRemoved( rView ); } ); } @@ -1155,39 +1155,39 @@ bool EventMultiplexer::notifyViewChanged( const UnoViewSharedPtr& rView ) { return pHandler.lock()->viewChanged( rView ); } ); } -bool EventMultiplexer::notifyViewChanged( const uno::Reference<presentation::XSlideShowView>& xView ) +void EventMultiplexer::notifyViewChanged( const uno::Reference<presentation::XSlideShowView>& xView ) { UnoViewSharedPtr pView( mpImpl->findUnoView(xView) ); if( !pView ) - return false; // view not registered here + return; // view not registered here - return notifyViewChanged( pView ); + notifyViewChanged( pView ); } -bool EventMultiplexer::notifyViewsChanged() +void EventMultiplexer::notifyViewsChanged() { - return mpImpl->maViewHandlers.applyAll( + mpImpl->maViewHandlers.applyAll( boost::mem_fn( &ViewEventHandler::viewsChanged )); } -bool EventMultiplexer::notifyViewClobbered( +void EventMultiplexer::notifyViewClobbered( const uno::Reference<presentation::XSlideShowView>& xView ) { UnoViewSharedPtr pView( mpImpl->findUnoView(xView) ); if( !pView ) - return false; // view not registered here + return; // view not registered here - return mpImpl->maViewRepaintHandlers.applyAll( + mpImpl->maViewRepaintHandlers.applyAll( [&pView]( const ViewRepaintHandlerSharedPtr& pHandler ) { return pHandler->viewClobbered( pView ); } ); } -bool EventMultiplexer::notifyHyperlinkClicked( +void EventMultiplexer::notifyHyperlinkClicked( OUString const& hyperLink ) { - return mpImpl->maHyperlinkHandlers.apply( + mpImpl->maHyperlinkHandlers.apply( [&hyperLink]( const PrioritizedHandlerEntry< HyperlinkHandler >& pHandler ) { return pHandler.getHandler()->handleHyperlink( hyperLink ); } ); } diff --git a/slideshow/source/engine/shapes/appletshape.cxx b/slideshow/source/engine/shapes/appletshape.cxx index 5bf2347..a034e28 100644 --- a/slideshow/source/engine/shapes/appletshape.cxx +++ b/slideshow/source/engine/shapes/appletshape.cxx @@ -82,7 +82,7 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) override; virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; - virtual bool clearAllViewLayers() override; + virtual void clearAllViewLayers() override; // ExternalShapeBase methods @@ -93,7 +93,7 @@ namespace slideshow virtual void implViewsChanged() override; virtual bool implStartIntrinsicAnimation() override; virtual bool implEndIntrinsicAnimation() override; - virtual bool implPauseIntrinsicAnimation() override; + virtual void implPauseIntrinsicAnimation() override; virtual bool implIsIntrinsicAnimationPlaying() const override; virtual void implSetIntrinsicAnimationTime(double) override; @@ -207,10 +207,9 @@ namespace slideshow - bool AppletShape::clearAllViewLayers() + void AppletShape::clearAllViewLayers() { maViewAppletShapes.clear(); - return true; } @@ -260,11 +259,10 @@ namespace slideshow - bool AppletShape::implPauseIntrinsicAnimation() + void AppletShape::implPauseIntrinsicAnimation() { // TODO(F1): any way of temporarily disabling/deactivating // applets? - return true; } diff --git a/slideshow/source/engine/shapes/backgroundshape.cxx b/slideshow/source/engine/shapes/backgroundshape.cxx index a0dcb61..80c1526 100644 --- a/slideshow/source/engine/shapes/backgroundshape.cxx +++ b/slideshow/source/engine/shapes/backgroundshape.cxx @@ -80,7 +80,7 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) override; virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; - virtual bool clearAllViewLayers() override; + virtual void clearAllViewLayers() override; // attribute methods @@ -209,10 +209,9 @@ namespace slideshow return true; } - bool BackgroundShape::clearAllViewLayers() + void BackgroundShape::clearAllViewLayers() { maViewShapes.clear(); - return true; } ::basegfx::B2DRectangle BackgroundShape::getBounds() const diff --git a/slideshow/source/engine/shapes/drawshape.cxx b/slideshow/source/engine/shapes/drawshape.cxx index 16b1579..fb80f609 100644 --- a/slideshow/source/engine/shapes/drawshape.cxx +++ b/slideshow/source/engine/shapes/drawshape.cxx @@ -681,10 +681,9 @@ namespace slideshow return true; } - bool DrawShape::clearAllViewLayers() + void DrawShape::clearAllViewLayers() { maViewShapes.clear(); - return true; } bool DrawShape::update() const @@ -836,9 +835,9 @@ namespace slideshow return (!maAnimationFrames.empty() || mbDrawingLayerAnim); } - bool DrawShape::setIntrinsicAnimationFrame( ::std::size_t nCurrFrame ) + void DrawShape::setIntrinsicAnimationFrame( ::std::size_t nCurrFrame ) { - ENSURE_OR_RETURN_FALSE( nCurrFrame < maAnimationFrames.size(), + ENSURE_OR_RETURN_VOID( nCurrFrame < maAnimationFrames.size(), "DrawShape::setIntrinsicAnimationFrame(): frame index out of bounds" ); if( mnCurrFrame != nCurrFrame ) @@ -847,8 +846,6 @@ namespace slideshow mpCurrMtf = maAnimationFrames[ mnCurrFrame ].mpMtf; mbForceUpdate = true; } - - return true; } // hyperlink support diff --git a/slideshow/source/engine/shapes/drawshape.hxx b/slideshow/source/engine/shapes/drawshape.hxx index b6f6cb2..5cc1d59 100644 --- a/slideshow/source/engine/shapes/drawshape.hxx +++ b/slideshow/source/engine/shapes/drawshape.hxx @@ -125,7 +125,7 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) override; virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; - virtual bool clearAllViewLayers() override; + virtual void clearAllViewLayers() override; // attribute methods @@ -195,7 +195,7 @@ namespace slideshow Used by IntrinsicAnimationActivity, to show the next animation frame. */ - bool setIntrinsicAnimationFrame( ::std::size_t nCurrFrame ); + void setIntrinsicAnimationFrame( ::std::size_t nCurrFrame ); /** forces the drawshape to load and return a specially crafted metafile, usable to display drawing layer text diff --git a/slideshow/source/engine/shapes/externalshapebase.hxx b/slideshow/source/engine/shapes/externalshapebase.hxx index 5e89d82..4455b1c 100644 --- a/slideshow/source/engine/shapes/externalshapebase.hxx +++ b/slideshow/source/engine/shapes/externalshapebase.hxx @@ -109,7 +109,7 @@ namespace slideshow /// override in derived class to stop external viewer virtual bool implEndIntrinsicAnimation() = 0; /// override in derived class to pause external viewer - virtual bool implPauseIntrinsicAnimation() = 0; + virtual void implPauseIntrinsicAnimation() = 0; /// override in derived class to return status of animation virtual bool implIsIntrinsicAnimationPlaying() const = 0; /// override in derived class to set media time diff --git a/slideshow/source/engine/shapes/mediashape.cxx b/slideshow/source/engine/shapes/mediashape.cxx index 00c029d..2961be5 100644 --- a/slideshow/source/engine/shapes/mediashape.cxx +++ b/slideshow/source/engine/shapes/mediashape.cxx @@ -68,7 +68,7 @@ namespace slideshow virtual void addViewLayer( const ViewLayerSharedPtr& rNewLayer, bool bRedrawLayer ) override; virtual bool removeViewLayer( const ViewLayerSharedPtr& rNewLayer ) override; - virtual bool clearAllViewLayers() override; + virtual void clearAllViewLayers() override; // ExternalShapeBase methods @@ -79,7 +79,7 @@ namespace slideshow virtual void implViewsChanged() override; virtual bool implStartIntrinsicAnimation() override; virtual bool implEndIntrinsicAnimation() override; - virtual bool implPauseIntrinsicAnimation() override; + virtual void implPauseIntrinsicAnimation() override; virtual bool implIsIntrinsicAnimationPlaying() const override; virtual void implSetIntrinsicAnimationTime(double) override; @@ -171,10 +171,9 @@ namespace slideshow - bool MediaShape::clearAllViewLayers() + void MediaShape::clearAllViewLayers() { maViewMediaShapes.clear(); - return true; } @@ -223,14 +222,12 @@ namespace slideshow - bool MediaShape::implPauseIntrinsicAnimation() + void MediaShape::implPauseIntrinsicAnimation() { for( const auto& pViewMediaShape : maViewMediaShapes ) pViewMediaShape->pauseMedia(); mbIsPlaying = false; - - return true; } diff --git a/slideshow/source/engine/shapes/shapeimporter.cxx b/slideshow/source/engine/shapes/shapeimporter.cxx index fc247ca..79d4392 100644 --- a/slideshow/source/engine/shapes/shapeimporter.cxx +++ b/slideshow/source/engine/shapes/shapeimporter.cxx @@ -157,7 +157,7 @@ public: virtual void addViewLayer( ViewLayerSharedPtr const& pNewLayer, bool bRedrawLayer ) override; virtual bool removeViewLayer( ViewLayerSharedPtr const& pNewLayer ) override; - virtual bool clearAllViewLayers() override; + virtual void clearAllViewLayers() override; virtual bool update() const override; virtual bool render() const override; virtual bool isContentChanged() const override; @@ -210,9 +210,8 @@ bool ShapeOfGroup::removeViewLayer( ViewLayerSharedPtr const& /*pNewLayer*/ ) return true; } -bool ShapeOfGroup::clearAllViewLayers() +void ShapeOfGroup::clearAllViewLayers() { - return true; } bool ShapeOfGroup::update() const diff --git a/slideshow/source/engine/shapes/viewappletshape.cxx b/slideshow/source/engine/shapes/viewappletshape.cxx index 7afef45..495e24f 100644 --- a/slideshow/source/engine/shapes/viewappletshape.cxx +++ b/slideshow/source/engine/shapes/viewappletshape.cxx @@ -123,9 +123,9 @@ namespace slideshow - bool ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds ) + void ViewAppletShape::startApplet( const ::basegfx::B2DRectangle& rBounds ) { - ENSURE_OR_RETURN_FALSE( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(), + ENSURE_OR_RETURN_VOID( mpViewLayer && mpViewLayer->getCanvas() && mpViewLayer->getCanvas()->getUNOCanvas().is(), "ViewAppletShape::startApplet(): Invalid or disposed view" ); try { @@ -203,10 +203,7 @@ namespace slideshow } catch (uno::Exception &) { - return false; } - - return true; } diff --git a/slideshow/source/engine/shapes/viewappletshape.hxx b/slideshow/source/engine/shapes/viewappletshape.hxx index f6e266e..0f0591b 100644 --- a/slideshow/source/engine/shapes/viewappletshape.hxx +++ b/slideshow/source/engine/shapes/viewappletshape.hxx @@ -98,10 +98,8 @@ namespace slideshow @param rBounds The current applet shape bounds - - @return whether the mode change finished successfully. */ - bool startApplet( const ::basegfx::B2DRectangle& rBounds ); + void startApplet( const ::basegfx::B2DRectangle& rBounds ); /** Notify the ViewShape that it is no longer animated diff --git a/slideshow/source/engine/shapes/viewmediashape.cxx b/slideshow/source/engine/shapes/viewmediashape.cxx index e3674d98..05d5cf7 100644 --- a/slideshow/source/engine/shapes/viewmediashape.cxx +++ b/slideshow/source/engine/shapes/viewmediashape.cxx @@ -120,15 +120,13 @@ namespace slideshow - bool ViewMediaShape::startMedia() + void ViewMediaShape::startMedia() { if( !mxPlayer.is() ) implInitialize( maBounds ); if (mxPlayer.is()) mxPlayer->start(); - - return true; } @@ -431,7 +429,7 @@ namespace slideshow - bool ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, + void ViewMediaShape::implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, const uno::Sequence< uno::Any >& rVCLDeviceParams, const OUString& rMimeType ) { @@ -534,8 +532,6 @@ namespace slideshow RTL_TEXTENCODING_UTF8 ).getStr() ); } } - - return mxPlayerWindow.is(); } } } diff --git a/slideshow/source/engine/shapes/viewmediashape.hxx b/slideshow/source/engine/shapes/viewmediashape.hxx index d001dda..0bd98b9 100644 --- a/slideshow/source/engine/shapes/viewmediashape.hxx +++ b/slideshow/source/engine/shapes/viewmediashape.hxx @@ -84,10 +84,8 @@ namespace slideshow This method enters animation mode on the associate target view. The shape can be animated in parallel on different views. - - @return whether the mode change finished successfully. */ - bool startMedia(); + void startMedia(); /** Notify the ViewShape that it is no longer animated @@ -141,7 +139,7 @@ namespace slideshow bool implInitialize( const ::basegfx::B2DRectangle& rBounds ); void implSetMediaProperties( const css::uno::Reference< css::beans::XPropertySet >& rxProps ); void implInitializeMediaPlayer( const OUString& rMediaURL, const OUString& rMimeType ); - bool implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, + void implInitializePlayerWindow( const ::basegfx::B2DRectangle& rBounds, const css::uno::Sequence< css::uno::Any >& rVCLDeviceParams, const OUString& rMimeType ); ViewLayerSharedPtr mpViewLayer; diff --git a/slideshow/source/engine/shapesubset.cxx b/slideshow/source/engine/shapesubset.cxx index 04b1fbf..e5c5eee 100644 --- a/slideshow/source/engine/shapesubset.cxx +++ b/slideshow/source/engine/shapesubset.cxx @@ -93,7 +93,7 @@ namespace slideshow return mpSubsetShape ? mpSubsetShape : mpOriginalShape; } - bool ShapeSubset::enableSubsetShape() + void ShapeSubset::enableSubsetShape() { if( !mpSubsetShape && !maTreeNode.isEmpty() ) @@ -102,8 +102,6 @@ namespace slideshow mpOriginalShape, maTreeNode ); } - - return static_cast< bool >(mpSubsetShape); } void ShapeSubset::disableSubsetShape() diff --git a/slideshow/source/engine/slide/shapemanagerimpl.cxx b/slideshow/source/engine/slide/shapemanagerimpl.cxx index a484cae..de54668 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.cxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.cxx @@ -323,14 +323,14 @@ bool ShapeManagerImpl::listenerRemoved( return true; } -bool ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& xShape, +void ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& xShape, sal_Int16 nCursor ) { ShapeSharedPtr pShape( lookupShape(xShape) ); // is this one of our shapes? other shapes are ignored. if( !pShape ) - return false; + return; if( mrGlobalCursorMap.find(xShape) == mrGlobalCursorMap.end() ) { @@ -354,8 +354,6 @@ bool ShapeManagerImpl::cursorChanged( const uno::Reference<drawing::XShape>& x aIter->second = nCursor; } } - - return true; } OUString ShapeManagerImpl::checkForHyperlink( basegfx::B2DPoint const& hitPos ) const @@ -392,15 +390,15 @@ void ShapeManagerImpl::removeIntrinsicAnimationHandler( const IntrinsicAnimation maIntrinsicAnimationEventHandlers.remove( rHandler ); } -bool ShapeManagerImpl::notifyIntrinsicAnimationsEnabled() +void ShapeManagerImpl::notifyIntrinsicAnimationsEnabled() { - return maIntrinsicAnimationEventHandlers.applyAll( + maIntrinsicAnimationEventHandlers.applyAll( boost::mem_fn(&IntrinsicAnimationEventHandler::enableAnimations)); } -bool ShapeManagerImpl::notifyIntrinsicAnimationsDisabled() +void ShapeManagerImpl::notifyIntrinsicAnimationsDisabled() { - return maIntrinsicAnimationEventHandlers.applyAll( + maIntrinsicAnimationEventHandlers.applyAll( boost::mem_fn(&IntrinsicAnimationEventHandler::disableAnimations)); } diff --git a/slideshow/source/engine/slide/shapemanagerimpl.hxx b/slideshow/source/engine/slide/shapemanagerimpl.hxx index 5fbe14f..1e0fd89 100644 --- a/slideshow/source/engine/slide/shapemanagerimpl.hxx +++ b/slideshow/source/engine/slide/shapemanagerimpl.hxx @@ -136,8 +136,8 @@ private: const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; virtual void removeIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) override; - virtual bool notifyIntrinsicAnimationsEnabled() override; - virtual bool notifyIntrinsicAnimationsDisabled() override; + virtual void notifyIntrinsicAnimationsEnabled() override; + virtual void notifyIntrinsicAnimationsDisabled() override; // ShapeListenerEventHandler @@ -149,7 +149,7 @@ private: virtual bool listenerRemoved( const css::uno::Reference< css::presentation::XShapeEventListener>& xListener, const css::uno::Reference< css::drawing::XShape>& xShape ) override; - bool cursorChanged( const css::uno::Reference< css::drawing::XShape>& xShape, + void cursorChanged( const css::uno::Reference< css::drawing::XShape>& xShape, sal_Int16 nCursor ); diff --git a/slideshow/source/engine/slide/slideimpl.cxx b/slideshow/source/engine/slide/slideimpl.cxx index 45c9855..e289ea6 100644 --- a/slideshow/source/engine/slide/slideimpl.cxx +++ b/slideshow/source/engine/slide/slideimpl.cxx @@ -108,8 +108,8 @@ public: // Slide interface - virtual bool prefetch() override; - virtual bool show( bool ) override; + virtual void prefetch() override; + virtual void show( bool ) override; virtual void hide() override; virtual basegfx::B2ISize getSlideSize() const override; @@ -410,32 +410,26 @@ SlideImpl::~SlideImpl() } } -bool SlideImpl::prefetch() +void SlideImpl::prefetch() { if( !mxRootNode.is() ) - return false; + return; - return applyInitialShapeAttributes(mxRootNode); + applyInitialShapeAttributes(mxRootNode); } -bool SlideImpl::show( bool bSlideBackgoundPainted ) +void SlideImpl::show( bool bSlideBackgoundPainted ) { - - if( mbActive ) - return true; // already active + return; // already active if( !mpShapeManager || !mpLayerManager ) - return false; // disposed - - + return; // disposed // set initial shape attributes (e.g. hide shapes that have // 'appear' effect set) if( !applyInitialShapeAttributes(mxRootNode) ) - return false; - - + return; // activate and take over view - clears view, if necessary mbActive = true; @@ -486,17 +480,12 @@ bool SlideImpl::show( bool bSlideBackgoundPainted ) if( mbIntrinsicAnimationsAllowed ) startIntrinsicAnimations(); - - // enable paint overlay, if maUserPaintColor is valid activatePaintOverlay(); - // from now on, animations might be showing meAnimationState = SHOWING_STATE; - - return true; } void SlideImpl::hide() diff --git a/slideshow/source/inc/animatedsprite.hxx b/slideshow/source/inc/animatedsprite.hxx index c6c1e4b..8e95202 100644 --- a/slideshow/source/inc/animatedsprite.hxx +++ b/slideshow/source/inc/animatedsprite.hxx @@ -73,11 +73,8 @@ namespace slideshow @param rSpriteSizePixel The new size in pixel - - @return true, if the resize was successful. If false - is returned, the sprite might be invalid. */ - bool resize( const ::basegfx::B2DSize& rSpriteSizePixel ); + void resize( const ::basegfx::B2DSize& rSpriteSizePixel ); /** Set an offset for the content output in pixel diff --git a/slideshow/source/inc/animationnode.hxx b/slideshow/source/inc/animationnode.hxx index 8eabe47..eb856cc 100644 --- a/slideshow/source/inc/animationnode.hxx +++ b/slideshow/source/inc/animationnode.hxx @@ -86,12 +86,8 @@ public: This method starts the animation on this node, without begin timeout. The node will change its state to ACTIVE. - - @return true, if start was successful. This method - might return false, if e.g. a restart is not permitted - on this node. */ - virtual bool activate() = 0; + virtual void activate() = 0; /** Immediately stop this node diff --git a/slideshow/source/inc/eventmultiplexer.hxx b/slideshow/source/inc/eventmultiplexer.hxx index e808b6d..4ae4fea 100644 --- a/slideshow/source/inc/eventmultiplexer.hxx +++ b/slideshow/source/inc/eventmultiplexer.hxx @@ -445,14 +445,14 @@ public: displayed on. On every added view, the EventMultiplexer registers mouse and motion event listeners. */ - bool notifyViewAdded( const UnoViewSharedPtr& rView ); + void notifyViewAdded( const UnoViewSharedPtr& rView ); /** View removed This method removes a view. Registered mouse and motion event listeners are revoked. */ - bool notifyViewRemoved( const UnoViewSharedPtr& rView ); + void notifyViewRemoved( const UnoViewSharedPtr& rView ); /** View changed @@ -472,7 +472,7 @@ public: @param xView View that has changed */ - bool notifyViewChanged( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); + void notifyViewChanged( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); /** All Views changed @@ -480,7 +480,7 @@ public: <em>every</em> known view has changed. View changes include size and transformation. */ - bool notifyViewsChanged(); + void notifyViewsChanged(); /** View clobbered @@ -490,28 +490,22 @@ public: @param xView View that has been clobbered */ - bool notifyViewClobbered( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); + void notifyViewClobbered( const css::uno::Reference<css::presentation::XSlideShowView>& xView ); /** New shape event listener added This method announces that the given listener was added for the specified shape. - - @return true, if at least one handler successfully processed - the notification. */ - bool notifyShapeListenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + void notifyShapeListenerAdded( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, const css::uno::Reference<css::drawing::XShape>& xShape ); /** A shape event listener was removed This method announces that the given listener was removed for the specified shape. - - @return true, if at least one handler successfully processed - the notification. */ - bool notifyShapeListenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, + void notifyShapeListenerRemoved( const css::uno::Reference<css::presentation::XShapeEventListener>& xListener, const css::uno::Reference<css::drawing::XShape>& xShape ); /** Notify a new user paint color @@ -519,23 +513,15 @@ public: Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifyUserPaintColor( RGBColor const& rUserColor ); + void notifyUserPaintColor( RGBColor const& rUserColor ); /** Notify a new user paint width Sending this notification also implies that user paint is enabled. . - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) - */ - bool notifyUserPaintStrokeWidth( double rUserStrokeWidth ); + */ + void notifyUserPaintStrokeWidth( double rUserStrokeWidth ); /** Notify a new user paint erase all ink mode @@ -543,26 +529,18 @@ public: Sending this notification also implies that user paint is enabled. User paint denotes the feature to draw colored lines on top of the slide content. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifyEraseAllInk( bool const& rEraseAllInk ); - bool notifySwitchPenMode(); - bool notifySwitchEraserMode(); - bool notifyEraseInkWidth( sal_Int32 rEraseInkSize ); + void notifyEraseAllInk( bool const& rEraseAllInk ); + void notifySwitchPenMode(); + void notifySwitchEraserMode(); + void notifyEraseInkWidth( sal_Int32 rEraseInkSize ); /** Notify that user paint is disabled User paint denotes the feature to draw colored lines on top of the slide content. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifyUserPaintDisabled(); + void notifyUserPaintDisabled(); /** Notify that the user requested the next effect. @@ -580,12 +558,8 @@ public: This method is to be used from the Presentation object to signal that a new slide is starting now. This will invoke all registered slide start handlers. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifySlideStartEvent(); + void notifySlideStartEvent(); /** Notify that a slide has ended @@ -662,12 +636,8 @@ public: to signal that a slide is entering (bPauseShow=true) or exiting (bPauseShow=false) pause mode. This will invoke all registered slide end handlers. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifyPauseMode( bool bPauseShow ); + void notifyPauseMode( bool bPauseShow ); /** Notify that all audio has to be stopped. @@ -682,12 +652,8 @@ public: bool notifyCommandStopAudio( const boost::shared_ptr<AnimationNode>& rNode ); /** Notifies that a hyperlink has been clicked. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - bool notifyHyperlinkClicked( OUString const& hyperLink ); + void notifyHyperlinkClicked( OUString const& hyperLink ); private: std::unique_ptr<EventMultiplexerImpl> mpImpl; diff --git a/slideshow/source/inc/listenercontainer.hxx b/slideshow/source/inc/listenercontainer.hxx index db9f2ae..4416c6a 100644 --- a/slideshow/source/inc/listenercontainer.hxx +++ b/slideshow/source/inc/listenercontainer.hxx @@ -252,25 +252,20 @@ public: @param rListener Listener to add - - @return false, if the listener is already added, true - otherwise */ - bool add( listener_type const& rListener ) + void add( listener_type const& rListener ) { Guard aGuard(*this); // ensure uniqueness if( isAdded(rListener) ) - return false; // already added + return; // already added maListeners.push_back( rListener ); ListenerOperations<ListenerT>::pruneListeners( maListeners, MaxDeceasedListenerUllage); - - return true; } /** Add new listener into sorted container diff --git a/slideshow/source/inc/shape.hxx b/slideshow/source/inc/shape.hxx index a0ed0d3..7bcb714 100644 --- a/slideshow/source/inc/shape.hxx +++ b/slideshow/source/inc/shape.hxx @@ -99,7 +99,7 @@ namespace slideshow This method will be faster than repeated removeViewLayer() calls. */ - virtual bool clearAllViewLayers() = 0; + virtual void clearAllViewLayers() = 0; // render methods @@ -246,10 +246,6 @@ namespace slideshow return compare(rLHS.get(),rRHS.get()); } - bool operator()(const Shape* pLHS, const Shape* pRHS) const - { - return compare(pLHS, pRHS); - } }; }; diff --git a/slideshow/source/inc/shapesubset.hxx b/slideshow/source/inc/shapesubset.hxx index e32fb0c..6405da7 100644 --- a/slideshow/source/inc/shapesubset.hxx +++ b/slideshow/source/inc/shapesubset.hxx @@ -104,10 +104,8 @@ namespace slideshow successful completion of this method, the original shape will cease to show the subset range, and getSubsetShape() will return a valid shape. - - @return true, if subsetting was successfully enabled. */ - bool enableSubsetShape(); + void enableSubsetShape(); /** Disable the subset shape. diff --git a/slideshow/source/inc/slide.hxx b/slideshow/source/inc/slide.hxx index 8c3b40f..264b2a2 100644 --- a/slideshow/source/inc/slide.hxx +++ b/slideshow/source/inc/slide.hxx @@ -67,7 +67,7 @@ namespace slideshow prefetch() is not called explicitly, the named methods will call it implicitly. */ - virtual bool prefetch() = 0; + virtual void prefetch() = 0; /** Shows the slide on all registered views @@ -80,7 +80,7 @@ namespace slideshow transition). When false, Slide renders initial content of slide. */ - virtual bool show( bool bSlideBackgoundPainted ) = 0; + virtual void show( bool bSlideBackgoundPainted ) = 0; /** Force-ends the slide diff --git a/slideshow/source/inc/subsettableshapemanager.hxx b/slideshow/source/inc/subsettableshapemanager.hxx index 42f58bb..54cc34d 100644 --- a/slideshow/source/inc/subsettableshapemanager.hxx +++ b/slideshow/source/inc/subsettableshapemanager.hxx @@ -95,20 +95,12 @@ namespace slideshow virtual void removeIntrinsicAnimationHandler( const IntrinsicAnimationEventHandlerSharedPtr& rHandler ) = 0; /** Notify that shape-intrinsic animations are now enabled. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - virtual bool notifyIntrinsicAnimationsEnabled() = 0; + virtual void notifyIntrinsicAnimationsEnabled() = 0; /** Notify that shape-intrinsic animations are now disabled. - - @return true, if this event was processed by - anybody. If false is returned, no handler processed - this event (and probably, nothing will happen at all) */ - virtual bool notifyIntrinsicAnimationsDisabled() = 0; + virtual void notifyIntrinsicAnimationsDisabled() = 0; }; typedef ::boost::shared_ptr< SubsettableShapeManager > SubsettableShapeManagerSharedPtr; commit 8ac02b48579c18c1f3c394ea1ae8eb76262eb1e7 Author: Noel Grandin <n...@peralex.com> Date: Thu Jan 14 11:44:48 2016 +0200 loplugin:unusedmethods unused return value in sfx2 Change-Id: I9c16c3f2754f181571faf7d5e1c48fa8bda59f7d diff --git a/sfx2/source/doc/doctemplates.cxx b/sfx2/source/doc/doctemplates.cxx index e493e5a..31f603f 100644 --- a/sfx2/source/doc/doctemplates.cxx +++ b/sfx2/source/doc/doctemplates.cxx @@ -229,7 +229,7 @@ class SfxDocTplService_Impl const OUString& aFsysGroupName, const OUString& aOldGroupName, const OUString& aNewGroupName ); - bool RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, + void RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName ); bool WriteUINamesForTemplateDir_Impl( const OUString& aUserPath, const uno::Sequence< beans::StringPair >& aUINames ); @@ -1322,7 +1322,7 @@ bool SfxDocTplService_Impl::ReplaceUINamesForTemplateDir_Impl( const OUString& a } -bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, +void SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aUserPath, const OUString& aGroupName ) { uno::Sequence< beans::StringPair > aUINames = ReadUINamesForTemplateDir_Impl( aUserPath ); @@ -1343,7 +1343,7 @@ bool SfxDocTplService_Impl::RemoveUINamesForTemplateDir_Impl( const OUString& aU aNewUINames.realloc( nNewLen ); - return !bChanged || WriteUINamesForTemplateDir_Impl( aUserPath, aNewUINames ); + !bChanged || WriteUINamesForTemplateDir_Impl( aUserPath, aNewUINames ); } diff --git a/sfx2/source/inc/sfxtypes.hxx b/sfx2/source/inc/sfxtypes.hxx index 487142b..a5c5d54 100644 --- a/sfx2/source/inc/sfxtypes.hxx +++ b/sfx2/source/inc/sfxtypes.hxx @@ -79,8 +79,6 @@ struct StringList_Impl : private Resource : Resource( rErrIdP ), aResId(nId, *rErrIdP.GetResMgr()) {} ~StringList_Impl() { FreeResource(); } - operator bool() { return IsAvailableRes(aResId.SetRT(RSC_STRING)); } - }; #endif // INCLUDED_SFX2_SOURCE_INC_SFXTYPES_HXX diff --git a/sfx2/source/inc/virtmenu.hxx b/sfx2/source/inc/virtmenu.hxx index bf892ee..2f5e8b1 100644 --- a/sfx2/source/inc/virtmenu.hxx +++ b/sfx2/source/inc/virtmenu.hxx @@ -89,7 +89,6 @@ public: void SetItemText( sal_uInt16 nItemId, const OUString& rText ); Menu* GetSVMenu() const { return pSVMenu;} - SfxMenuControl& operator[]( sal_uInt16 nPos ) const; void SetPopupMenu( sal_uInt16 nId, PopupMenu *pMenu ); void InitPopup(sal_uInt16 nPos, bool bOLE = true); @@ -100,12 +99,6 @@ public: -inline SfxMenuControl& SfxVirtualMenu::operator[]( sal_uInt16 nPos ) const -{ - return *(pItems+nPos); -} - - #endif /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ commit b696725cf63788f703cc76ae2bf455574b64bff7 Author: Noel Grandin <n...@peralex.com> Date: Thu Jan 14 11:44:39 2016 +0200 loplugin:unusedmethods unused return value in sdext Change-Id: Ie919a094630da57371b13081ab2f04984dd96c78 diff --git a/sdext/source/minimizer/impoptimizer.cxx b/sdext/source/minimizer/impoptimizer.cxx index f2be936..7108347 100644 --- a/sdext/source/minimizer/impoptimizer.cxx +++ b/sdext/source/minimizer/impoptimizer.cxx @@ -592,10 +592,8 @@ static void DispatchURL( Reference< XComponentContext > xContext, const OUString -bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) +void ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) { - bool bRet = true; - if ( mxModel.is() ) { sal_Int64 nEstimatedFileSize = 0; @@ -692,7 +690,7 @@ bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) if ( xStorable.is() && !xStorable->isReadonly() ) { mxModel->lockControllers(); - bRet = Optimize(); + Optimize(); mxModel->unlockControllers(); // clearing undo stack: @@ -741,9 +739,6 @@ bool ImpOptimizer::Optimize( const Sequence< PropertyValue >& rArguments ) DispatchStatus(); } } - else - bRet = false; - return bRet; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sdext/source/minimizer/impoptimizer.hxx b/sdext/source/minimizer/impoptimizer.hxx index 080fd10..1b4a29e 100644 --- a/sdext/source/minimizer/impoptimizer.hxx +++ b/sdext/source/minimizer/impoptimizer.hxx @@ -67,7 +67,7 @@ public: const css::uno::Reference< css::frame::XModel >& rxModel ); ~ImpOptimizer(); - bool Optimize( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ); + void Optimize( const css::uno::Sequence< css::beans::PropertyValue >& rArguments ); void DispatchStatus(); }; diff --git a/sdext/source/minimizer/informationdialog.cxx b/sdext/source/minimizer/informationdialog.cxx index fcb2e5c..45733ba 100644 --- a/sdext/source/minimizer/informationdialog.cxx +++ b/sdext/source/minimizer/informationdialog.cxx @@ -338,7 +338,7 @@ InformationDialog::~InformationDialog() -bool InformationDialog::execute() +void InformationDialog::execute() { UnoDialog::execute(); @@ -352,7 +352,6 @@ bool InformationDialog::execute() mrbOpenNewDocument = bOpenNewDocument; } } - return mbStatus; } diff --git a/sdext/source/minimizer/informationdialog.hxx b/sdext/source/minimizer/informationdialog.hxx index ba60bb8..163da92 100644 --- a/sdext/source/minimizer/informationdialog.hxx +++ b/sdext/source/minimizer/informationdialog.hxx @@ -52,7 +52,7 @@ public: bool& bOpenNewDocument, const sal_Int64& nSourceSize, const sal_Int64& nDestSize, const sal_Int64& nApproxDest ); ~InformationDialog(); - bool execute(); + void execute(); private: diff --git a/sdext/source/minimizer/optimizerdialog.cxx b/sdext/source/minimizer/optimizerdialog.cxx index 2de2347..db3b535 100644 --- a/sdext/source/minimizer/optimizerdialog.cxx +++ b/sdext/source/minimizer/optimizerdialog.cxx @@ -249,14 +249,13 @@ OptimizerDialog::~OptimizerDialog() -bool OptimizerDialog::execute() +void OptimizerDialog::execute() { Reference< XItemEventBroadcaster > maRoadmapBroadcaster( mxRoadmapControl, UNO_QUERY_THROW ); maRoadmapBroadcaster->addItemListener( mxItemListener ); UnoDialog::execute(); UpdateConfiguration(); // taking actual control settings for the configuration maRoadmapBroadcaster->removeItemListener( mxItemListener ); - return mbStatus; } diff --git a/sdext/source/minimizer/optimizerdialog.hxx b/sdext/source/minimizer/optimizerdialog.hxx index 6f65426..789df68 100644 --- a/sdext/source/minimizer/optimizerdialog.hxx +++ b/sdext/source/minimizer/optimizerdialog.hxx @@ -65,7 +65,7 @@ public: css::uno::Reference< css::frame::XDispatch > rxStatusDispatcher ); ~OptimizerDialog(); - bool execute(); + void execute(); sal_Int16 mnCurrentStep; sal_Int16 mnTabIndex; diff --git a/sdext/source/pdfimport/inc/pdfparse.hxx b/sdext/source/pdfimport/inc/pdfparse.hxx index 888e6e6..037714b 100644 --- a/sdext/source/pdfimport/inc/pdfparse.hxx +++ b/sdext/source/pdfimport/inc/pdfparse.hxx @@ -273,7 +273,7 @@ struct PDFObject : public PDFContainer virtual PDFEntry* clone() const override; // writes only the contained stream, deflated if necessary - bool writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const; + void writeStream( EmitContext& rContext, const PDFFile* pPDFFile ) const; private: // returns true if stream is deflated diff --git a/sdext/source/pdfimport/pdfparse/pdfentries.cxx b/sdext/source/pdfimport/pdfparse/pdfentries.cxx index 67fbc02..7ccd8e2 100644 --- a/sdext/source/pdfimport/pdfparse/pdfentries.cxx +++ b/sdext/source/pdfimport/pdfparse/pdfentries.cxx @@ -74,11 +74,11 @@ struct EmitImplData m_nDecryptGeneration( 0 ) {} ~EmitImplData() {} - bool decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, + void decrypt( const sal_uInt8* pInBuffer, sal_uInt32 nLen, sal_uInt8* pOutBuffer, unsigned int nObject, unsigned int nGeneration ) const { const PDFFile* pFile = dynamic_cast<const PDFFile*>(m_pObjectContainer); - return pFile && pFile->decrypt( pInBuffer, nLen, pOutBuffer, nObject, nGeneration ); + pFile && pFile->decrypt( pInBuffer, nLen, pOutBuffer, nObject, nGeneration ); } void setDecryptObject( unsigned int nObject, unsigned int nGeneration ) @@ -769,9 +769,8 @@ static void unzipToBuffer( char* pBegin, unsigned int nLen, } } -bool PDFObject::writeStream( EmitContext& rWriteContext, const PDFFile* pParsedFile ) const +void PDFObject::writeStream( EmitContext& rWriteContext, const PDFFile* pParsedFile ) const { - bool bSuccess = false; if( m_pStream ) { char* pStream = nullptr; @@ -788,7 +787,6 @@ bool PDFObject::writeStream( EmitContext& rWriteContext, const PDFFile* pParsedF rWriteContext.write( pStream, nBytes ); rtl_freeMemory( pStream ); } - return bSuccess; } bool PDFObject::emit( EmitContext& rWriteContext ) const diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.cxx b/sdext/source/presenter/PresenterPaneBorderPainter.cxx index 6a08ed8..07bbc49 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.cxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.cxx @@ -326,19 +326,15 @@ bool PresenterPaneBorderPainter::ProvideTheme (const Reference<rendering::XCanva return bModified; } -bool PresenterPaneBorderPainter::ProvideTheme() +void PresenterPaneBorderPainter::ProvideTheme() { if (mpTheme.get() == nullptr) { // Create a theme without bitmaps (no canvas => no bitmaps). - return ProvideTheme(nullptr); + ProvideTheme(nullptr); } - else - { // When there already is a theme then without a canvas we can not // add anything new. - return false; - } } void PresenterPaneBorderPainter::SetTheme (const std::shared_ptr<PresenterTheme>& rpTheme) diff --git a/sdext/source/presenter/PresenterPaneBorderPainter.hxx b/sdext/source/presenter/PresenterPaneBorderPainter.hxx index a891030..324f7e9 100644 --- a/sdext/source/presenter/PresenterPaneBorderPainter.hxx +++ b/sdext/source/presenter/PresenterPaneBorderPainter.hxx @@ -135,7 +135,7 @@ private: */ bool ProvideTheme ( const css::uno::Reference<css::rendering::XCanvas>& rxCanvas); - bool ProvideTheme(); + void ProvideTheme(); void ThrowIfDisposed() const throw (css::lang::DisposedException); commit 06d68fb0a14149dbf6580df78d00aee2f545d460 Author: Noel Grandin <n...@peralex.com> Date: Thu Jan 14 11:44:28 2016 +0200 loplugin:unusedmethods unused return value in sd Change-Id: I9bf87cad19b7371076fd0b2333c83697021fe0e1 diff --git a/sd/inc/drawdoc.hxx b/sd/inc/drawdoc.hxx index e2ff20c..9208e6c 100644 --- a/sd/inc/drawdoc.hxx +++ b/sd/inc/drawdoc.hxx @@ -262,7 +262,7 @@ public: SdDrawDocument* OpenBookmarkDoc(const OUString& rBookmarkFile); SAL_DLLPRIVATE SdDrawDocument* OpenBookmarkDoc(SfxMedium& rMedium); - SAL_DLLPRIVATE bool InsertBookmark(const std::vector<OUString> &rBookmarkList, + SAL_DLLPRIVATE void InsertBookmark(const std::vector<OUString> &rBookmarkList, std::vector<OUString> &rExchangeList, bool bLink, bool bReplace, sal_uInt16 nPgPos, bool bNoDialogs, ::sd::DrawDocShell* pBookmarkDocSh, bool bCopy, diff --git a/sd/inc/pglink.hxx b/sd/inc/pglink.hxx index 968799b..222a1f6 100644 --- a/sd/inc/pglink.hxx +++ b/sd/inc/pglink.hxx @@ -35,7 +35,7 @@ public: virtual void Closed() override; virtual ::sfx2::SvBaseLink::UpdateResult DataChanged( const OUString& rMimeType, const css::uno::Any & rValue ) override; - bool Connect() { return nullptr != SvBaseLink::GetRealObject(); } + void Connect() { SvBaseLink::GetRealObject(); } }; #endif // INCLUDED_SD_INC_PGLINK_HXX diff --git a/sd/inc/shapelist.hxx b/sd/inc/shapelist.hxx index bbb0cbc..0b10084 100644 --- a/sd/inc/shapelist.hxx +++ b/sd/inc/shapelist.hxx @@ -35,9 +35,8 @@ namespace sd /** adds the given shape to this list */ void addShape( SdrObject& rObject ); - /** removes the shape from this list and returns - a pointer to the next shape in list or 0*/ - SdrObject* removeShape( SdrObject& rObject ); + /** removes the shape from this list*/ + void removeShape( SdrObject& rObject ); /** removes all shapes from this list */ void clear(); diff --git a/sd/source/core/drawdoc3.cxx b/sd/source/core/drawdoc3.cxx index b326667..7e11c55 100644 --- a/sd/source/core/drawdoc3.cxx +++ b/sd/source/core/drawdoc3.cxx @@ -277,7 +277,7 @@ SdDrawDocument* SdDrawDocument::OpenBookmarkDoc(const OUString& rBookmarkFile) } // Inserts a bookmark (page or object) -bool SdDrawDocument::InsertBookmark( +void SdDrawDocument::InsertBookmark( const std::vector<OUString> &rBookmarkList, // List of names of the bookmarks to be inserted std::vector<OUString> &rExchangeList, // List of the names to be used bool bLink, // Insert bookmarks as links? @@ -339,8 +339,6 @@ bool SdDrawDocument::InsertBookmark( bOK = InsertBookmarkAsObject(rBookmarkList, rExchangeList, bLink, pBookmarkDocSh, pObjPos, bCalcObjCount); } - - return bOK; } namespace diff --git a/sd/source/core/shapelist.cxx b/sd/source/core/shapelist.cxx index bbdcc96..bdeda09 100644 --- a/sd/source/core/shapelist.cxx +++ b/sd/source/core/shapelist.cxx @@ -50,7 +50,7 @@ void ShapeList::addShape( SdrObject& rObject ) } /** removes the given shape from this list */ -SdrObject* ShapeList::removeShape( SdrObject& rObject ) +void ShapeList::removeShape( SdrObject& rObject ) { ListImpl::iterator aIter( std::find( maShapeList.begin(), maShapeList.end(), &rObject ) ); if( aIter != maShapeList.end() ) @@ -62,15 +62,11 @@ SdrObject* ShapeList::removeShape( SdrObject& rObject ) if( bIterErased ) maIter = aIter; - - if( aIter != maShapeList.end() ) - return (*aIter); } else { OSL_FAIL("sd::ShapeList::removeShape(), given shape not part of list!"); } - return nullptr; } /** removes all shapes from this list diff --git a/sd/source/filter/eppt/eppt.cxx b/sd/source/filter/eppt/eppt.cxx index 71ef6f5..9e93b31 100644 --- a/sd/source/filter/eppt/eppt.cxx +++ b/sd/source/filter/eppt/eppt.cxx @@ -922,7 +922,7 @@ bool PPTWriter::ImplCreateDocument() return true; }; -bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) +void PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) { sal_uInt32 nCurrentOfs, nParaOfs, nParaCount = 0; @@ -1000,7 +1000,6 @@ bool PPTWriter::ImplCreateHyperBlob( SvMemoryStream& rStrm ) rStrm.WriteUInt32( nCurrentOfs - ( nParaOfs + 4 ) ); rStrm.WriteUInt32( nParaCount ); rStrm.Seek( nCurrentOfs ); - return true; } bool PPTWriter::ImplCreateMainNotes() diff --git a/sd/source/filter/eppt/eppt.hxx b/sd/source/filter/eppt/eppt.hxx index ea0a7fc..a1e2789 100644 --- a/sd/source/filter/eppt/eppt.hxx +++ b/sd/source/filter/eppt/eppt.hxx @@ -219,7 +219,7 @@ class PPTWriter : public PPTWriterBase, public PPTExBulletProvider css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet ); void ImplCreateHeaderFooters( css::uno::Reference< css::beans::XPropertySet >& rXPagePropSet ); virtual bool ImplCreateDocument() override; - bool ImplCreateHyperBlob( SvMemoryStream& rStream ); + void ImplCreateHyperBlob( SvMemoryStream& rStream ); sal_uInt32 ImplInsertBookmarkURL( const OUString& rBookmark, const sal_uInt32 nType, const OUString& rStringVer0, const OUString& rStringVer1, const OUString& rStringVer2, const OUString& rStringVer3 ); virtual bool ImplCreateMainNotes() override; diff --git a/sd/source/filter/eppt/epptbase.hxx b/sd/source/filter/eppt/epptbase.hxx index e0e9208..af0901f 100644 --- a/sd/source/filter/eppt/epptbase.hxx +++ b/sd/source/filter/eppt/epptbase.hxx @@ -394,7 +394,7 @@ public: bool InitSOIface(); bool GetPageByIndex( sal_uInt32 nIndex, PageType ); sal_uInt32 GetMasterIndex( PageType ePageType ); - bool SetCurrentStyleSheet( sal_uInt32 nPageNum ); + void SetCurrentStyleSheet( sal_uInt32 nPageNum ); bool GetPresObj() { return mbPresObj; } diff --git a/sd/source/filter/eppt/pptx-epptbase.cxx b/sd/source/filter/eppt/pptx-epptbase.cxx index 450b835..1dc3cd1 100644 --- a/sd/source/filter/eppt/pptx-epptbase.cxx +++ b/sd/source/filter/eppt/pptx-epptbase.cxx @@ -505,15 +505,11 @@ sal_uInt32 PPTWriterBase::GetMasterIndex( PageType ePageType ) return nRetValue; } -bool PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) +void PPTWriterBase::SetCurrentStyleSheet( sal_uInt32 nPageNum ) { - bool bRet = false; if ( nPageNum >= maStyleSheetList.size() ) nPageNum = 0; - else - bRet = true; mpStyleSheet = maStyleSheetList[ nPageNum ]; - return bRet; } bool PPTWriterBase::GetStyleSheets() diff --git a/sd/source/filter/html/pubdlg.cxx b/sd/source/filter/html/pubdlg.cxx index 084bfd4..21617ed 100644 --- a/sd/source/filter/html/pubdlg.cxx +++ b/sd/source/filter/html/pubdlg.cxx @@ -1512,7 +1512,7 @@ IMPL_LINK_NOARG_TYPED(SdPublishingDlg, LastPageHdl, Button*, void) } // Load Designs -bool SdPublishingDlg::Load() +void SdPublishingDlg::Load() { m_bDesignListDirty = false; @@ -1529,7 +1529,7 @@ bool SdPublishingDlg::Load() delete pIStm; if( !bOk ) - return false; + return; } SfxMedium aMedium( aURL.GetMainURL( INetURLObject::NO_DECODE ), StreamMode::READ | StreamMode::NOCREATE ); @@ -1537,13 +1537,13 @@ bool SdPublishingDlg::Load() SvStream* pStream = aMedium.GetInStream(); if( !pStream ) - return false; + return; sal_uInt16 aCheck; pStream->ReadUInt16( aCheck ); if(aCheck != nMagic) - return false; + return; SdIOCompat aIO(*pStream, StreamMode::READ); @@ -1559,8 +1559,6 @@ bool SdPublishingDlg::Load() m_aDesignList.push_back(aDesign); } - - return( pStream->GetError() == SVSTREAM_OK ); } // Save Designs diff --git a/sd/source/filter/ppt/pptinanimations.cxx b/sd/source/filter/ppt/pptinanimations.cxx index 1363a24..bb253c0 100644 --- a/sd/source/filter/ppt/pptinanimations.cxx +++ b/sd/source/filter/ppt/pptinanimations.cxx @@ -2265,7 +2265,7 @@ void AnimationImporter::importAnimateRotationContainer( const Atom* pAtom, const } } -bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ) +void AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ) { OUStringBuffer aNames; @@ -2298,7 +2298,6 @@ bool AnimationImporter::importAttributeNamesContainer( const Atom* pAtom, OUStri } rAttributeNames = aNames.makeStringAndClear(); - return true; } void AnimationImporter::importAnimationValues( const Atom* pAtom, const Reference< XAnimationNode >& xNode ) @@ -2735,7 +2734,7 @@ void AnimationImporter::importAnimationActions( const Atom* pAtom, const Referen } } -sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType ) +void AnimationImporter::importTargetElementContainer( const Atom* pAtom, Any& rTarget, sal_Int16& rSubType ) { rSubType = ShapeAnimationSubType::AS_WHOLE; sal_Int32 nRefMode = -1; @@ -2852,8 +2851,6 @@ sal_Int32 AnimationImporter::importTargetElementContainer( const Atom* pAtom, An } } - - return nRefMode; } void AnimationImporter::importPropertySetContainer( const Atom* pAtom, PropertySet& rSet ) diff --git a/sd/source/filter/ppt/pptinanimations.hxx b/sd/source/filter/ppt/pptinanimations.hxx index 3456743..843415f 100644 --- a/sd/source/filter/ppt/pptinanimations.hxx +++ b/sd/source/filter/ppt/pptinanimations.hxx @@ -72,8 +72,8 @@ private: void importAnimateKeyPoints( const Atom* pAtom, const css::uno::Reference< css::animations::XAnimationNode >& xNode ); void importPropertySetContainer( const Atom* pAtom,PropertySet& rSet ); bool importAttributeValue( const Atom* pAtom, css::uno::Any& rAny ); - bool importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ); - sal_Int32 importTargetElementContainer( const Atom* pAtom, css::uno::Any& rTarget, sal_Int16& nSubType ); + void importAttributeNamesContainer( const Atom* pAtom, OUString& rAttributeNames ); + void importTargetElementContainer( const Atom* pAtom, css::uno::Any& rTarget, sal_Int16& nSubType ); static void fillNode( css::uno::Reference< css::animations::XAnimationNode >& xTiming, const AnimationNode& rNode, const PropertySet& rSet ); static css::uno::Reference< css::animations::XAnimationNode > createNode( const Atom* pAtom, const AnimationNode& rNode ); diff --git a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx index dfd303e..0f918a9 100644 --- a/sd/source/ui/animations/CustomAnimationCreateDialog.cxx +++ b/sd/source/ui/animations/CustomAnimationCreateDialog.cxx @@ -71,7 +71,7 @@ public: virtual void MouseButtonUp( const MouseEvent& rMEvt ) override; - sal_Int32 InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); + void InsertCategory( const OUString& rStr, sal_Int32 nPos = LISTBOX_APPEND ); void SetDoubleClickLink( const Link<CategoryListBox&,void>& rDoubleClickHdl ) { maDoubleClickHdl = rDoubleClickHdl; } @@ -96,13 +96,11 @@ CategoryListBox::~CategoryListBox() { } -sal_Int32 CategoryListBox::InsertCategory( const OUString& rStr, sal_Int32 nPos /* = LISTBOX_APPEND */ ) +void CategoryListBox::InsertCategory( const OUString& rStr, sal_Int32 nPos /* = LISTBOX_APPEND */ ) { sal_Int32 n = ListBox::InsertEntry( rStr, nPos ); if( n != LISTBOX_ENTRY_NOTFOUND ) ListBox::SetEntryFlags( n, ListBox::GetEntryFlags(n) | ListBoxEntryFlags::DisableSelection ); - - return n; } void CategoryListBox::UserDraw( const UserDrawEvent& rUDEvt ) diff --git a/sd/source/ui/app/optsitem.cxx b/sd/source/ui/app/optsitem.cxx index 628453b..73b9ddd 100644 --- a/sd/source/ui/app/optsitem.cxx +++ b/sd/source/ui/app/optsitem.cxx @@ -919,17 +919,6 @@ SdOptionsZoom::SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ) : EnableModify( true ); } -bool SdOptionsZoom::operator==( const SdOptionsZoom& rOpt ) const -{ - sal_Int32 nX1, nX2, nY1, nY2; - - GetScale( nX1, nY1 ); - rOpt.GetScale( nX2, nY2 ); - - return( ( nX1 == nX2 ) && - ( nY1 == nY2 ) ); -} - void SdOptionsZoom::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { static const char* aPropNames[] = @@ -1004,20 +993,6 @@ void SdOptionsGrid::SetDefaults() SetEqualGrid( true ); } -bool SdOptionsGrid::operator==( const SdOptionsGrid& rOpt ) const -{ - return( GetFieldDrawX() == rOpt.GetFieldDrawX() && - GetFieldDivisionX() == rOpt.GetFieldDivisionX() && - GetFieldDrawY() == rOpt.GetFieldDrawY() && - GetFieldDivisionY() == rOpt.GetFieldDivisionY() && - GetFieldSnapX() == rOpt.GetFieldSnapX() && - GetFieldSnapY() == rOpt.GetFieldSnapY() && - IsUseGridSnap() == rOpt.IsUseGridSnap() && - IsSynchronize() == rOpt.IsSynchronize() && - IsGridVisible() == rOpt.IsGridVisible() && - IsEqualGrid() == rOpt.IsEqualGrid() ); -} - void SdOptionsGrid::GetPropNameArray( const char**& ppNames, sal_uLong& rCount ) const { if( isMetricSystem() ) diff --git a/sd/source/ui/dlg/assclass.cxx b/sd/source/ui/dlg/assclass.cxx index 2c8a7dc..9eb6075 100644 --- a/sd/source/ui/dlg/assclass.cxx +++ b/sd/source/ui/dlg/assclass.cxx @@ -49,7 +49,7 @@ bool Assistent::InsertControl(int nDestPage, vcl::Window* pUsedControl) return false; } -bool Assistent::NextPage() +void Assistent::NextPage() { if(mnCurrentPage<mnPages) { @@ -58,13 +58,11 @@ bool Assistent::NextPage() nPage++; if(nPage <= mnPages) - return GotoPage(nPage); + GotoPage(nPage); } - - return false; } -bool Assistent::PreviousPage() +void Assistent::PreviousPage() { if(mnCurrentPage>1) { @@ -73,9 +71,8 @@ bool Assistent::PreviousPage() nPage--; if(nPage >= 0) - return GotoPage(nPage); + GotoPage(nPage); } - return false; } bool Assistent::GotoPage(const int nPageToGo) diff --git a/sd/source/ui/func/futext.cxx b/sd/source/ui/func/futext.cxx index cb0e848..9aecfe3 100644 --- a/sd/source/ui/func/futext.cxx +++ b/sd/source/ui/func/futext.cxx @@ -1117,10 +1117,8 @@ void FuText::SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag) /** * Text entry is started, if necessary delete the default text. */ -bool FuText::DeleteDefaultText() +void FuText::DeleteDefaultText() { - bool bDeleted = false; - if ( mxTextObj.is() && mxTextObj->IsEmptyPresObj() ) { SdPage* pPage = static_cast<SdPage*>( mxTextObj->GetPage() ); @@ -1151,12 +1149,9 @@ bool FuText::DeleteDefaultText() pOutliner->SetStyleSheet(0, pSheet); mxTextObj->SetEmptyPresObj(true); - bDeleted = true; } } } - - return bDeleted; } bool FuText::Command(const CommandEvent& rCEvt) diff --git a/sd/source/ui/inc/DrawViewShell.hxx b/sd/source/ui/inc/DrawViewShell.hxx index d652d23..6fdf9d8 100644 --- a/sd/source/ui/inc/DrawViewShell.hxx +++ b/sd/source/ui/inc/DrawViewShell.hxx @@ -264,7 +264,7 @@ public: bool SwitchPage(sal_uInt16 nPage); bool IsSwitchPageAllowed() const; - bool GotoBookmark(const OUString& rBookmark); + void GotoBookmark(const OUString& rBookmark); //Realize multi-selection of objects, If object is marked, the //corresponding entry is set true, else the corresponding entry is set //false. diff --git a/sd/source/ui/inc/OutlineView.hxx b/sd/source/ui/inc/OutlineView.hxx index 48fd1f6..c45909f 100644 --- a/sd/source/ui/inc/OutlineView.hxx +++ b/sd/source/ui/inc/OutlineView.hxx @@ -111,7 +111,7 @@ public: bool PrepareClose(bool bUI = true); - virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const override; + virtual void GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const override; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false) override; void FillOutliner(); diff --git a/sd/source/ui/inc/OutlineViewShell.hxx b/sd/source/ui/inc/OutlineViewShell.hxx index 2a7b8a57..b57bc50 100644 --- a/sd/source/ui/inc/OutlineViewShell.hxx +++ b/sd/source/ui/inc/OutlineViewShell.hxx @@ -73,8 +73,8 @@ public: virtual bool PrepareClose( bool bUI = true ) override; - virtual long VirtHScrollHdl(ScrollBar* pHScroll) override; - virtual long VirtVScrollHdl(ScrollBar* pVHScroll) override; + virtual void VirtHScrollHdl(ScrollBar* pHScroll) override; + virtual void VirtVScrollHdl(ScrollBar* pVHScroll) override; virtual void Activate( bool IsMDIActivate ) override; virtual void Deactivate( bool IsMDIActivate ) override; @@ -145,8 +145,8 @@ public: */ void SetCurrentPage (SdPage* pPage); - bool UpdateTitleObject( SdPage* pPage, Paragraph* pPara ); - bool UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ); + void UpdateTitleObject( SdPage* pPage, Paragraph* pPara ); + void UpdateOutlineObject( SdPage* pPage, Paragraph* pPara ); private: void ShowSlideShow(SfxRequest& rReq); diff --git a/sd/source/ui/inc/View.hxx b/sd/source/ui/inc/View.hxx index 5d65dda..662679e 100644 --- a/sd/source/ui/inc/View.hxx +++ b/sd/source/ui/inc/View.hxx @@ -85,7 +85,7 @@ public: void CompleteRedraw( OutputDevice* pOutDev, const vcl::Region& rReg, sdr::contact::ViewObjectContactRedirector* pRedirector = nullptr) override; - virtual bool GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; + virtual void GetAttributes( SfxItemSet& rTargetSet, bool bOnlyHardAttr = false ) const; virtual bool SetAttributes(const SfxItemSet& rSet, bool bReplaceAll = false); virtual void MarkListHasChanged() override; virtual void ModelHasChanged() override; @@ -146,11 +146,11 @@ public: SdrGrafObj* InsertGraphic( const Graphic& rGraphic, sal_Int8& rAction, const Point& rPos, SdrObject* pSelectedObj, ImageMap* pImageMap ); - SdrMediaObj* InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, + void InsertMediaURL( const OUString& rMediaURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ); - SdrMediaObj* Insert3DModelURL( const OUString& rModelURL, sal_Int8& rAction, + void Insert3DModelURL( const OUString& rModelURL, sal_Int8& rAction, const Point& rPos, const Size& rSize, bool const bLink ); diff --git a/sd/source/ui/inc/ViewShell.hxx b/sd/source/ui/inc/ViewShell.hxx index 7f097bc..f71697e 100644 --- a/sd/source/ui/inc/ViewShell.hxx +++ b/sd/source/ui/inc/ViewShell.hxx @@ -531,8 +531,8 @@ protected: DECL_LINK_TYPED( VScrollHdl, ScrollBar *, void ); // virtual scroll handler, here, derivative classes can add themselves here - virtual long VirtHScrollHdl(ScrollBar* pHScroll); - virtual long VirtVScrollHdl(ScrollBar* pVScroll); + virtual void VirtHScrollHdl(ScrollBar* pHScroll); + virtual void VirtVScrollHdl(ScrollBar* pVScroll); // virtual functions ruler handling virtual SvxRuler* CreateHRuler(::sd::Window* pWin, bool bIsFirst); diff --git a/sd/source/ui/inc/assclass.hxx b/sd/source/ui/inc/assclass.hxx index c7b4cff..c19e5f9 100644 --- a/sd/source/ui/inc/assclass.hxx +++ b/sd/source/ui/inc/assclass.hxx @@ -53,9 +53,9 @@ public: /// adds a control to the specified page bool InsertControl(int nDestPage, vcl::Window* pUsedControl); - bool NextPage(); + void NextPage(); - bool PreviousPage(); + void PreviousPage(); bool GotoPage(const int nPageToGo); diff --git a/sd/source/ui/inc/futext.hxx b/sd/source/ui/inc/futext.hxx index 1cb4900..49cb439 100644 --- a/sd/source/ui/inc/futext.hxx +++ b/sd/source/ui/inc/futext.hxx @@ -55,7 +55,7 @@ public: virtual void Deactivate() override; ///< deactivates the function void SetInEditMode(const MouseEvent& rMEvt, bool bQuickDrag); - bool DeleteDefaultText(); + void DeleteDefaultText(); SdrTextObj* GetTextObj() { return static_cast< SdrTextObj* >( mxTextObj.get() ); } virtual SdrObject* CreateDefaultObject(const sal_uInt16 nID, const Rectangle& rRectangle) override; diff --git a/sd/source/ui/inc/optsitem.hxx b/sd/source/ui/inc/optsitem.hxx index 0d9ec21..a2183d9 100644 --- a/sd/source/ui/inc/optsitem.hxx +++ b/sd/source/ui/inc/optsitem.hxx @@ -419,8 +419,6 @@ public: SdOptionsZoom( sal_uInt16 nConfigId, bool bUseConfig ); virtual ~SdOptionsZoom() {} - bool operator==( const SdOptionsZoom& rOpt ) const; - void GetScale( sal_Int32& rX, sal_Int32& rY ) const { Init(); rX = nX; rY = nY; } void SetScale( sal_Int32 nInX, sal_Int32 nInY ) { if( nX != nInX || nY != nInY ) { OptionsChanged(); nX = nInX; nY = nInY; } } }; @@ -439,7 +437,6 @@ public: virtual ~SdOptionsGrid(); void SetDefaults(); - bool operator==( const SdOptionsGrid& rOpt ) const; sal_uInt32 GetFieldDrawX() const { Init(); return SvxOptionsGrid::GetFieldDrawX(); } sal_uInt32 GetFieldDivisionX() const { Init(); return SvxOptionsGrid::GetFieldDivisionX(); } diff --git a/sd/source/ui/inc/pubdlg.hxx b/sd/source/ui/inc/pubdlg.hxx index 12db763..894f33d 100644 --- a/sd/source/ui/inc/pubdlg.hxx +++ b/sd/source/ui/inc/pubdlg.hxx @@ -169,7 +169,7 @@ private: std::vector<SdPublishingDesign> m_aDesignList; bool m_bDesignListDirty; SdPublishingDesign* m_pDesign; - bool Load(); + void Load(); bool Save(); void GetDesign( SdPublishingDesign* pDesign ); diff --git a/sd/source/ui/inc/slideshow.hxx b/sd/source/ui/inc/slideshow.hxx index 8d7e1d3..118c719 100644 --- a/sd/source/ui/inc/slideshow.hxx +++ b/sd/source/ui/inc/slideshow.hxx @@ -155,7 +155,7 @@ public: /** sets or clears the pause state of the running slideshow. !!!! This should only be called by the SdShowWindow !!!!*/ - bool pause( bool bPause ); + void pause( bool bPause ); bool swipe(const CommandSwipeData &rSwipeData); bool longpress(const CommandLongPressData& rLongPressData); diff --git a/sd/source/ui/presenter/PresenterTextView.cxx b/sd/source/ui/presenter/PresenterTextView.cxx index 02f0b31..502f52c 100644 --- a/sd/source/ui/presenter/PresenterTextView.cxx +++ b/sd/source/ui/presenter/PresenterTextView.cxx @@ -92,7 +92,7 @@ private: sal_Int32 mnTop; sal_Int32 mnTotalHeight; - EditEngine * GetEditEngine(); + void GetEditEngine(); EditEngine* CreateEditEngine(); void CheckTop(); }; @@ -264,11 +264,10 @@ PresenterTextView::Implementation::~Implementation() mpOutputDevice.disposeAndClear(); } -EditEngine * PresenterTextView::Implementation::GetEditEngine() +void PresenterTextView::Implementation::GetEditEngine() { if (mpEditEngine == nullptr) mpEditEngine = CreateEditEngine (); - return mpEditEngine; } EditEngine* PresenterTextView::Implementation::CreateEditEngine() diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx index 3bd897d..8e4bce8 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.cxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.cxx @@ -168,16 +168,6 @@ int TemplatePageObjectProvider::GetCostIndex() return 20; } -bool TemplatePageObjectProvider::operator== (const PageObjectProvider& rProvider) -{ - const TemplatePageObjectProvider* pTemplatePageObjectProvider - = dynamic_cast<const TemplatePageObjectProvider*>(&rProvider); - if (pTemplatePageObjectProvider != nullptr) - return (msURL == pTemplatePageObjectProvider->msURL); - else - return false; -} - //===== DefaultPageObjectProvider ============================================== DefaultPageObjectProvider::DefaultPageObjectProvider() @@ -208,11 +198,6 @@ int DefaultPageObjectProvider::GetCostIndex() return 15; } -bool DefaultPageObjectProvider::operator== (const PageObjectProvider& rProvider) -{ - return (dynamic_cast<const DefaultPageObjectProvider*>(&rProvider) != nullptr); -} - //===== ExistingPageProvider ================================================== ExistingPageProvider::ExistingPageProvider (SdPage* pPage) @@ -232,16 +217,6 @@ int ExistingPageProvider::GetCostIndex() return 0; } -bool ExistingPageProvider::operator== (const PageObjectProvider& rProvider) -{ - const ExistingPageProvider* pExistingPageProvider - = dynamic_cast<const ExistingPageProvider*>(&rProvider); - if (pExistingPageProvider != nullptr) - return (mpPage == pExistingPageProvider->mpPage); - else - return false; -} - } } // end of namespace sd::sidebar /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx index 04001d1..da480cb 100644 --- a/sd/source/ui/sidebar/MasterPageContainerProviders.hxx +++ b/sd/source/ui/sidebar/MasterPageContainerProviders.hxx @@ -54,8 +54,6 @@ public: */ virtual int GetCostIndex() = 0; - virtual bool operator== (const PageObjectProvider& rProvider) = 0; - protected: ~PageObjectProvider() {} }; @@ -117,7 +115,6 @@ public: virtual ~TemplatePageObjectProvider() {}; virtual SdPage* operator () (SdDrawDocument* pDocument) override; virtual int GetCostIndex() override; - virtual bool operator== (const PageObjectProvider& rProvider) override; private: OUString msURL; SfxObjectShellLock mxDocumentShell; @@ -148,7 +145,6 @@ public: virtual ~DefaultPageObjectProvider() {} virtual SdPage* operator () (SdDrawDocument* pDocument) override; virtual int GetCostIndex() override; - virtual bool operator== (const PageObjectProvider& rProvider) override; }; /** This implementation of the PageObjectProvider simply returns an already @@ -161,7 +157,6 @@ public: virtual ~ExistingPageProvider() {} virtual SdPage* operator() (SdDrawDocument* pDocument) override; virtual int GetCostIndex() override; - virtual bool operator== (const PageObjectProvider& rProvider) override; private: SdPage* mpPage; }; diff --git a/sd/source/ui/slideshow/showwin.cxx b/sd/source/ui/slideshow/showwin.cxx index feeff3a..ecbebd0 100644 --- a/sd/source/ui/slideshow/showwin.cxx +++ b/sd/source/ui/slideshow/showwin.cxx @@ -305,7 +305,7 @@ void ShowWindow::Move() ::sd::Window::Move(); } -bool ShowWindow::SetEndMode() +void ShowWindow::SetEndMode() { if( ( SHOWWINDOWMODE_NORMAL == meShowWindowMode ) && mpViewShell && mpViewShell->GetView() ) { @@ -322,8 +322,6 @@ bool ShowWindow::SetEndMode() Invalidate(); } - - return( SHOWWINDOWMODE_END == meShowWindowMode ); } bool ShowWindow::SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeout, Graphic* pLogo ) diff --git a/sd/source/ui/slideshow/showwindow.hxx b/sd/source/ui/slideshow/showwindow.hxx index af9a9ea..dafd0a5 100644 --- a/sd/source/ui/slideshow/showwindow.hxx +++ b/sd/source/ui/slideshow/showwindow.hxx @@ -53,7 +53,7 @@ public: virtual ~ShowWindow(); virtual void dispose() override; - bool SetEndMode(); + void SetEndMode(); bool SetPauseMode( sal_Int32 nPageIndexToRestart, sal_Int32 nTimeoutSec = SLIDE_NO_TIMEOUT, Graphic* pLogo = nullptr ); bool SetBlankMode( sal_Int32 nPageIndexToRestart, const Color& rBlankColor ); diff --git a/sd/source/ui/slideshow/slideshow.cxx b/sd/source/ui/slideshow/slideshow.cxx index e2b737e..aa46aab 100644 --- a/sd/source/ui/slideshow/slideshow.cxx +++ b/sd/source/ui/slideshow/slideshow.cxx @@ -1021,7 +1021,7 @@ bool SlideShow::isAlwaysOnTop() return mxController.is() && mxController->maPresSettings.mbAlwaysOnTop; } -bool SlideShow::pause( bool bPause ) +void SlideShow::pause( bool bPause ) { if( mxController.is() ) { @@ -1030,7 +1030,6 @@ bool SlideShow::pause( bool bPause ) else mxController->resume(); } - return true; } void SlideShow::receiveRequest(SfxRequest& rReq) diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 07287a0..8976c21 100644 --- a/sd/source/ui/slideshow/slideshowimpl.cxx +++ b/sd/source/ui/slideshow/slideshowimpl.cxx @@ -1739,10 +1739,9 @@ sal_Bool SAL_CALL SlideshowImpl::isEndless() throw( RuntimeException, std::excep return maPresSettings.mbEndless; } -double SlideshowImpl::update() +void SlideshowImpl::update() { startUpdateTimer(); - return -1; } void SlideshowImpl::startUpdateTimer() @@ -1770,14 +1769,14 @@ IMPL_LINK_NOARG_TYPED(SlideshowImpl, updateHdl, Timer *, void) updateSlideShow(); } -sal_Int32 SlideshowImpl::updateSlideShow() +void SlideshowImpl::updateSlideShow() { // prevent me from deletion when recursing (App::EnableYieldMode does) const rtl::Reference<SlideshowImpl> this_(this); Reference< XSlideShow > xShow( mxShow ); if ( ! xShow.is()) - return 0; + return; try { @@ -1819,7 +1818,6 @@ sal_Int32 SlideshowImpl::updateSlideShow() comphelper::anyToString( cppu::getCaughtException() ), RTL_TEXTENCODING_UTF8 )).getStr() ); } - return 0; } bool SlideshowImpl::keyInput(const KeyEvent& rKEvt) diff --git a/sd/source/ui/slideshow/slideshowimpl.hxx b/sd/source/ui/slideshow/slideshowimpl.hxx index 09006a8..88666d4 100644 --- a/sd/source/ui/slideshow/slideshowimpl.hxx +++ b/sd/source/ui/slideshow/slideshowimpl.hxx @@ -252,7 +252,7 @@ private: /** forces an async call to update in the main thread */ void startUpdateTimer(); - double update(); + void update(); void createSlideList( bool bAll, const OUString& rPresSlide ); @@ -315,7 +315,7 @@ private: its return value, wait for a certain amount of time before another call to update() is scheduled. */ - sal_Int32 updateSlideShow(); + void updateSlideShow(); css::uno::Reference< css::presentation::XSlideShow > mxShow; rtl::Reference<sd::SlideShowView> mxView; diff --git a/sd/source/ui/slideshow/slideshowviewimpl.cxx b/sd/source/ui/slideshow/slideshowviewimpl.cxx index fd38e62..76d8dc9 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.cxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.cxx @@ -73,7 +73,7 @@ void SlideShowViewListeners::removeListener( const Reference< util::XModifyListe maListeners.erase( aIter ); } -bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception ) +void SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( css::uno::Exception ) { ::osl::MutexGuard aGuard( mrMutex ); @@ -91,7 +91,6 @@ bool SlideShowViewListeners::notify( const lang::EventObject& _rEvent ) throw( c aIter = maListeners.erase( aIter ); } } - return true; } void SlideShowViewListeners::disposing( const lang::EventObject& _rEventSource ) diff --git a/sd/source/ui/slideshow/slideshowviewimpl.hxx b/sd/source/ui/slideshow/slideshowviewimpl.hxx index 458ee82..369017a 100644 --- a/sd/source/ui/slideshow/slideshowviewimpl.hxx +++ b/sd/source/ui/slideshow/slideshowviewimpl.hxx @@ -105,7 +105,7 @@ public: void addListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); void removeListener( const css::uno::Reference< css::util::XModifyListener >& _rxListener ); - bool notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception ); + void notify( const css::lang::EventObject& _rEvent ) throw( css::uno::Exception ); void disposing( const css::lang::EventObject& _rEventSource ); protected: diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx index 05aa186..11ed93f 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.cxx @@ -140,10 +140,9 @@ void RequestQueue::PageInDestruction(const SdrPage& rPage) RemoveRequest(&rPage); } -bool RequestQueue::RemoveRequest ( +void RequestQueue::RemoveRequest ( CacheKey aKey) { - bool bRequestWasRemoved (false); ::osl::MutexGuard aGuard (maMutex); while(true) @@ -162,14 +161,11 @@ bool RequestQueue::RemoveRequest ( SdrPage *pPage = const_cast<SdrPage*>(aRequestIterator->maKey); pPage->RemovePageUser(*this); mpRequestQueue->erase(aRequestIterator); - - bRequestWasRemoved = true; } else break; } - return bRequestWasRemoved; } void RequestQueue::ChangeClass ( diff --git a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx index 3410ae8..b8fc2fb 100644 --- a/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx +++ b/sd/source/ui/slidesorter/cache/SlsRequestQueue.hxx @@ -63,12 +63,8 @@ public: @param aKey It is OK when the specified request is not a member of the queue. - @return - Returns <TRUE/> when the request has been successfully been - removed from the queue. Otherwise, e.g. because the request was - not a member of the queue, <FALSE/> is returned. */ - bool RemoveRequest (CacheKey aKey); + void RemoveRequest (CacheKey aKey); /** Change the priority class of the specified request. */ diff --git a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx index c4cb361..f41bff1 100644 --- a/sd/source/ui/slidesorter/controller/SlideSorterController.cxx +++ b/sd/source/ui/slidesorter/controller/SlideSorterController.cxx @@ -686,17 +686,13 @@ void SlideSorterController::UpdateAllPages() mrSlideSorter.GetContentWindow()->Invalidate(); } -Rectangle SlideSorterController::Resize (const Rectangle& rAvailableSpace) +void SlideSorterController::Resize (const Rectangle& rAvailableSpace) { - Rectangle aContentArea (rAvailableSpace); - if (maTotalWindowArea != rAvailableSpace) { maTotalWindowArea = rAvailableSpace; - aContentArea = Rearrange(true); + Rearrange(true); } - - return aContentArea; } Rectangle SlideSorterController::Rearrange (bool bForce) @@ -799,7 +795,7 @@ void SlideSorterController::PrepareEditModeChange() } } -bool SlideSorterController::ChangeEditMode (EditMode eEditMode) +void SlideSorterController::ChangeEditMode (EditMode eEditMode) { bool bResult (false); if (mrModel.GetEditMode() != eEditMode) @@ -811,7 +807,6 @@ bool SlideSorterController::ChangeEditMode (EditMode eEditMode) if (bResult) HandleModelChange(); } - return bResult; } void SlideSorterController::FinishEditModeChange() diff --git a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx index 5d69577..4e1618e 100644 --- a/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx +++ b/sd/source/ui/slidesorter/inc/controller/SlideSorterController.hxx @@ -82,10 +82,8 @@ public: /** Place and size the scroll bars and the browser window so that the given rectangle is filled. - @return - The space occupied by the browser window is returned. */ - Rectangle Resize (const Rectangle& rAvailableSpace); + void Resize (const Rectangle& rAvailableSpace); /** Determine which of the UI elements--the scroll bars, the scroll bar filler, the actual slide sorter view--are visible and place them in @@ -192,11 +190,8 @@ public: has been changed. For proper saving and restoring of the selection this method should be called between calls to PrepareEditModeChange() and FinishEditModeChange(). - @return - A return value of <TRUE/> indicates that the edit mode has - changed. */ - bool ChangeEditMode (EditMode eEditMode); + void ChangeEditMode (EditMode eEditMode); /** Finish the change of the edit mode. Here we may select a page or restore a previously saved selection. diff --git a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx index 0df22fa..131b1c9 100644 --- a/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx +++ b/sd/source/ui/slidesorter/inc/model/SlsVisualState.hxx @@ -49,7 +49,7 @@ public: void UpdateVisualState (const PageDescriptor& rDescriptor); Point GetLocationOffset() const { return maLocationOffset;} - bool SetLocationOffset (const Point& rPoint); + void SetLocationOffset (const Point& rPoint); sal_Int32 mnPageId; // For debugging diff --git a/sd/source/ui/slidesorter/model/SlsVisualState.cxx b/sd/source/ui/slidesorter/model/SlsVisualState.cxx index 9accd0e..180358f 100644 --- a/sd/source/ui/slidesorter/model/SlsVisualState.cxx +++ b/sd/source/ui/slidesorter/model/SlsVisualState.cxx @@ -63,15 +63,12 @@ void VisualState::UpdateVisualState (const PageDescriptor& rDescriptor) SetVisualState(VS_None); } -bool VisualState::SetLocationOffset (const Point& rOffset) +void VisualState::SetLocationOffset (const Point& rOffset) { if (maLocationOffset != rOffset) { maLocationOffset = rOffset; - return true; } - else - return false; } } } } // end of namespace ::sd::slidesorter::model diff --git a/sd/source/ui/view/drviewsh.cxx b/sd/source/ui/view/drviewsh.cxx index 8c043e3..a4a1e43 100644 --- a/sd/source/ui/view/drviewsh.cxx +++ b/sd/source/ui/view/drviewsh.cxx @@ -41,17 +41,15 @@ ... etc. - the rest is truncated _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits