From 2c2d0c07b2120c5fe4333e7fed12bd59996c2972 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Mon, 18 Dec 2017 10:06:16 +0200 Subject: loplugin:unusedmethods Change-Id: I3ffd9142fed98e4df75c2c28f8a025be3e8eb803 Reviewed-on: https://gerrit.libreoffice.org/46687 Tested-by: Jenkins Reviewed-by: Noel Grandin --- avmedia/source/vlc/inc/wrapper/Player.hxx | 2 -- avmedia/source/vlc/vlcplayer.cxx | 16 ---------- avmedia/source/vlc/vlcplayer.hxx | 3 -- avmedia/source/vlc/wrapper/Player.cxx | 5 --- dbaccess/source/core/dataaccess/ModelImpl.cxx | 29 ----------------- dbaccess/source/core/inc/ModelImpl.hxx | 22 ------------- sw/inc/docufld.hxx | 4 --- sw/source/core/inc/frame.hxx | 3 -- sw/source/core/layout/ssfrm.cxx | 45 --------------------------- 9 files changed, 129 deletions(-) diff --git a/avmedia/source/vlc/inc/wrapper/Player.hxx b/avmedia/source/vlc/inc/wrapper/Player.hxx index 4931f08ac312..740390080d63 100644 --- a/avmedia/source/vlc/inc/wrapper/Player.hxx +++ b/avmedia/source/vlc/inc/wrapper/Player.hxx @@ -43,8 +43,6 @@ namespace wrapper int getTime() const; bool isPlaying() const; - float getRate() const; - void setVolume( int volume ); int getVolume() const; diff --git a/avmedia/source/vlc/vlcplayer.cxx b/avmedia/source/vlc/vlcplayer.cxx index a1e07da62b33..ec109eaa23dd 100644 --- a/avmedia/source/vlc/vlcplayer.cxx +++ b/avmedia/source/vlc/vlcplayer.cxx @@ -55,16 +55,6 @@ VLCPlayer::VLCPlayer( const rtl::OUString& url, mPlayer.setMouseHandling( false ); } -unsigned VLCPlayer::getWidth() const -{ - return mPlayer.getWidth(); -} - -unsigned VLCPlayer::getHeight() const -{ - return mPlayer.getHeight(); -} - void SAL_CALL VLCPlayer::start() { ::osl::MutexGuard aGuard(m_aMutex); @@ -92,12 +82,6 @@ double SAL_CALL VLCPlayer::getDuration() return static_cast( mMedia.getDuration() ) / MS_IN_SEC; } -void VLCPlayer::setScale( float factor ) -{ - ::osl::MutexGuard aGuard(m_aMutex); - mPlayer.setScale( factor ); -} - void SAL_CALL VLCPlayer::setMediaTime( double fTime ) { ::osl::MutexGuard aGuard(m_aMutex); diff --git a/avmedia/source/vlc/vlcplayer.hxx b/avmedia/source/vlc/vlcplayer.hxx index 78fa06f4a251..a3d555842862 100644 --- a/avmedia/source/vlc/vlcplayer.hxx +++ b/avmedia/source/vlc/vlcplayer.hxx @@ -55,10 +55,7 @@ public: wrapper::EventHandler& eh ); void setVideoSize( unsigned width, unsigned height ); - unsigned getWidth() const; - unsigned getHeight() const; - void setScale( float factor ); void setWindowID( const intptr_t windowID ); void SAL_CALL start() override; diff --git a/avmedia/source/vlc/wrapper/Player.cxx b/avmedia/source/vlc/wrapper/Player.cxx index f54507db7d59..3102dcac92b0 100644 --- a/avmedia/source/vlc/wrapper/Player.cxx +++ b/avmedia/source/vlc/wrapper/Player.cxx @@ -204,11 +204,6 @@ namespace wrapper return libvlc_media_player_is_playing( mPlayer ) == 1; } - float Player::getRate() const - { - return libvlc_media_player_get_rate( mPlayer ); - } - void Player::setVolume( int volume ) { libvlc_audio_set_volume( mPlayer, volume ); diff --git a/dbaccess/source/core/dataaccess/ModelImpl.cxx b/dbaccess/source/core/dataaccess/ModelImpl.cxx index 882ed84f3af8..ce9a76b6f5e9 100644 --- a/dbaccess/source/core/dataaccess/ModelImpl.cxx +++ b/dbaccess/source/core/dataaccess/ModelImpl.cxx @@ -86,35 +86,6 @@ using namespace ::comphelper; namespace dbaccess { -// VosMutexFacade -VosMutexFacade::VosMutexFacade( ::osl::Mutex& _rMutex ) - :m_rMutex( _rMutex ) -{ -} - -void VosMutexFacade::doAcquire( sal_uInt32 nLockCount ) -{ - assert( 1 == nLockCount ); (void) nLockCount; - m_rMutex.acquire(); -} - -sal_uInt32 VosMutexFacade::doRelease( bool bUnlockAll ) -{ - assert( !bUnlockAll ); (void) bUnlockAll; - m_rMutex.release(); - return 1; -} - -bool VosMutexFacade::tryToAcquire() -{ - return m_rMutex.tryToAcquire(); -} - -bool VosMutexFacade::IsCurrentThread() const -{ - return true; -} - // DocumentStorageAccess class DocumentStorageAccess : public ::cppu::WeakImplHelper< XDocumentSubStorageSupplier , XTransactionListener > diff --git a/dbaccess/source/core/inc/ModelImpl.hxx b/dbaccess/source/core/inc/ModelImpl.hxx index a89a9693852a..880c11f81bb7 100644 --- a/dbaccess/source/core/inc/ModelImpl.hxx +++ b/dbaccess/source/core/inc/ModelImpl.hxx @@ -117,28 +117,6 @@ struct AsciiPropertyValue class ODatabaseContext; class OSharedConnectionManager; -// VosMutexFacade -/** a class which provides an SolarMutex interface to an OSL-based mutex -*/ -class VosMutexFacade : public comphelper::SolarMutex -{ -public: - /** beware of life time: the mutex you pass here must live as least as long - as the VosMutexFacade instance lives. - */ - explicit VosMutexFacade( ::osl::Mutex& _rMutex ); - - virtual bool tryToAcquire() override; - virtual bool IsCurrentThread() const override; - -protected: - virtual void doAcquire( sal_uInt32 nLockCount ) override; - virtual sal_uInt32 doRelease( bool bUnlockAll ) override; - -private: - ::osl::Mutex& m_rMutex; -}; - // ODatabaseModelImpl typedef ::utl::SharedUNOComponent< css::embed::XStorage > SharedStorage; diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx index 8e0bf46e9ba6..1ab24e66a326 100644 --- a/sw/inc/docufld.hxx +++ b/sw/inc/docufld.hxx @@ -317,10 +317,6 @@ public: const OUString& rFalse, sal_uInt16 nSubType = TYP_HIDDENTXTFLD); - // nSubType = TYP_CONDTXTFLD - SwHiddenTextField(SwHiddenTextFieldType*, - const OUString& rCondTrueFalse); // value sample: " IF A == B \"TrueText\" \"FalseText\"" - virtual OUString GetFieldName() const override; void Evaluate(SwDoc*); diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx index 684a9e13a3d0..9d3ca61708de 100644 --- a/sw/source/core/inc/frame.hxx +++ b/sw/source/core/inc/frame.hxx @@ -849,7 +849,6 @@ public: long GetLeftMargin() const; long GetRightMargin() const; void SetTopBottomMargins( long, long ); - void SetBottomTopMargins( long, long ); void SetLeftRightMargins( long, long ); void SetRightLeftMargins( long, long ); long GetPrtLeft() const; @@ -859,9 +858,7 @@ public: bool SetMinLeft( long ); bool SetMaxBottom( long ); bool SetMaxRight( long ); - bool SetMinTop( long ); void MakeBelowPos( const SwFrame*, const SwFrame*, bool ); - void MakeUpperPos( const SwFrame*, const SwFrame*, bool ); void MakeLeftPos( const SwFrame*, const SwFrame*, bool ); void MakeRightPos( const SwFrame*, const SwFrame*, bool ); bool IsNeighbourFrame() const diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx index 0e4695dd2c56..9934d1c4b4dd 100644 --- a/sw/source/core/layout/ssfrm.cxx +++ b/sw/source/core/layout/ssfrm.cxx @@ -82,22 +82,6 @@ bool SwFrame::SetMaxBottom( long nDeadline ) return false; } -bool SwFrame::SetMinTop( long nDeadline ) -{ - SwTwips nDiff = nDeadline - getFrameArea().Top(); - if( nDiff > 0 ) - { - SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); - aFrm.Top( nDeadline ); - - SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this); - aPrt.Height( aPrt.Height() - nDiff ); - - return true; - } - return false; -} - bool SwFrame::SetMaxRight( long nDeadline ) { SwTwips nDiff = getFrameArea().Left() + getFrameArea().Width() - nDeadline; @@ -135,28 +119,6 @@ void SwFrame::MakeBelowPos( const SwFrame* pUp, const SwFrame* pPrv, bool bNotif } } -void SwFrame::MakeUpperPos( const SwFrame* pUp, const SwFrame* pPrv, bool bNotify ) -{ - SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); - - if( pPrv ) - { - aFrm.Pos( pPrv->getFrameArea().Pos() ); - aFrm.Pos().Y() -= aFrm.Height(); - } - else - { - aFrm.Pos( pUp->getFrameArea().Pos() ); - aFrm.Pos() += pUp->getFramePrintArea().Pos(); - aFrm.Pos().Y() += pUp->getFramePrintArea().Height() - aFrm.Height(); - } - - if( bNotify ) - { - aFrm.Pos().Y() -= 1; - } -} - void SwFrame::MakeLeftPos( const SwFrame* pUp, const SwFrame* pPrv, bool bNotify ) { SwFrameAreaDefinition::FrameAreaWriteAccess aFrm(*this); @@ -207,13 +169,6 @@ void SwFrame::SetTopBottomMargins( long nTop, long nBot ) aPrt.Height( getFrameArea().Height() - nTop - nBot ); } -void SwFrame::SetBottomTopMargins( long nBot, long nTop ) -{ - SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this); - aPrt.Top( nTop ); - aPrt.Height( getFrameArea().Height() - nTop - nBot ); -} - void SwFrame::SetLeftRightMargins( long nLeft, long nRight) { SwFrameAreaDefinition::FramePrintAreaWriteAccess aPrt(*this); -- cgit v1.2.3