From 24ada6566044881c95e33fada9d305904db46ad7 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Fri, 15 Jan 2016 10:08:02 +0200 Subject: loplugin:unusedmethods unused return value in include/unotools Change-Id: I3b2281dc713bff92eb3d80fddef04a8a39838aa8 Reviewed-on: https://gerrit.libreoffice.org/21484 Tested-by: Jenkins Reviewed-by: Noel Grandin --- unotools/source/config/securityoptions.cxx | 4 ++-- unotools/source/config/viewoptions.cxx | 28 +++++++++------------------- unotools/source/i18n/collatorwrapper.cxx | 7 ++----- 3 files changed, 13 insertions(+), 26 deletions(-) (limited to 'unotools') diff --git a/unotools/source/config/securityoptions.cxx b/unotools/source/config/securityoptions.cxx index 795d768cdaa5..8de1a0c2c69d 100644 --- a/unotools/source/config/securityoptions.cxx +++ b/unotools/source/config/securityoptions.cxx @@ -1079,10 +1079,10 @@ bool SvtSecurityOptions::IsOptionSet( EOption eOption ) const return m_pDataContainer->IsOptionSet( eOption ); } -bool SvtSecurityOptions::SetOption( EOption eOption, bool bValue ) +void SvtSecurityOptions::SetOption( EOption eOption, bool bValue ) { MutexGuard aGuard( GetInitMutex() ); - return m_pDataContainer->SetOption( eOption, bValue ); + m_pDataContainer->SetOption( eOption, bValue ); } bool SvtSecurityOptions::IsOptionEnabled( EOption eOption ) const diff --git a/unotools/source/config/viewoptions.cxx b/unotools/source/config/viewoptions.cxx index 1ad1ad01be21..6278706b4592 100644 --- a/unotools/source/config/viewoptions.cxx +++ b/unotools/source/config/viewoptions.cxx @@ -726,32 +726,22 @@ bool SvtViewOptions::Exists() const // public method -bool SvtViewOptions::Delete() +void SvtViewOptions::Delete() { // Ready for multithreading ::osl::MutexGuard aGuard( GetOwnStaticMutex() ); - bool bState = false; switch( m_eViewType ) { - case E_DIALOG : { - bState = m_pDataContainer_Dialogs->Delete( m_sViewName ); - } - break; - case E_TABDIALOG : { - bState = m_pDataContainer_TabDialogs->Delete( m_sViewName ); - } - break; - case E_TABPAGE : { - bState = m_pDataContainer_TabPages->Delete( m_sViewName ); - } - break; - case E_WINDOW : { - bState = m_pDataContainer_Windows->Delete( m_sViewName ); - } - break; + case E_DIALOG : m_pDataContainer_Dialogs->Delete( m_sViewName ); + break; + case E_TABDIALOG : m_pDataContainer_TabDialogs->Delete( m_sViewName ); + break; + case E_TABPAGE : m_pDataContainer_TabPages->Delete( m_sViewName ); + break; + case E_WINDOW : m_pDataContainer_Windows->Delete( m_sViewName ); + break; } - return bState; } // public method diff --git a/unotools/source/i18n/collatorwrapper.cxx b/unotools/source/i18n/collatorwrapper.cxx index ac3033e6511d..0b962264370c 100644 --- a/unotools/source/i18n/collatorwrapper.cxx +++ b/unotools/source/i18n/collatorwrapper.cxx @@ -82,23 +82,20 @@ CollatorWrapper::loadDefaultCollator (const lang::Locale& rLocale, sal_Int32 nOp return 0; } -sal_Int32 +void CollatorWrapper::loadCollatorAlgorithm (const OUString& rAlgorithm, const lang::Locale& rLocale, sal_Int32 nOptions) { try { if (mxInternationalCollator.is()) - return mxInternationalCollator->loadCollatorAlgorithm ( + mxInternationalCollator->loadCollatorAlgorithm ( rAlgorithm, rLocale, nOptions); } catch (const uno::RuntimeException&) { SAL_WARN( "unotools.i18n","CollatorWrapper: loadCollatorAlgorithm failed"); } - - return 0; - } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ -- cgit