diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-02 10:43:19 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-05-02 14:25:25 +0200 |
commit | 666403a4b66fa94d2014b4688b2e6a7b085bd2cc (patch) | |
tree | dd69b18efaf5cca26e99f9d724037177fa383cda /framework | |
parent | 89bdfccc835ad2b09b68b7081c16b14e22d1b407 (diff) |
loplugin:checkunusedparams in framework
Change-Id: I963159550da9d735bb70636917ecc290744298b4
Reviewed-on: https://gerrit.libreoffice.org/37142
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
-rw-r--r-- | framework/inc/services/layoutmanager.hxx | 2 | ||||
-rw-r--r-- | framework/inc/uielement/statusbarmerger.hxx | 1 | ||||
-rw-r--r-- | framework/inc/uielement/toolbarmerger.hxx | 1 | ||||
-rw-r--r-- | framework/inc/xml/statusbardocumenthandler.hxx | 1 | ||||
-rw-r--r-- | framework/source/fwe/xml/statusbardocumenthandler.cxx | 3 | ||||
-rw-r--r-- | framework/source/layoutmanager/layoutmanager.cxx | 4 | ||||
-rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.cxx | 3 | ||||
-rw-r--r-- | framework/source/layoutmanager/toolbarlayoutmanager.hxx | 2 | ||||
-rw-r--r-- | framework/source/services/autorecovery.cxx | 20 | ||||
-rw-r--r-- | framework/source/services/frame.cxx | 18 | ||||
-rw-r--r-- | framework/source/services/pathsettings.cxx | 20 | ||||
-rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/statusbarmerger.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmanager.cxx | 1 | ||||
-rw-r--r-- | framework/source/uielement/toolbarmerger.cxx | 1 |
15 files changed, 32 insertions, 47 deletions
diff --git a/framework/inc/services/layoutmanager.hxx b/framework/inc/services/layoutmanager.hxx index c24455695c13..6b151785eefa 100644 --- a/framework/inc/services/layoutmanager.hxx +++ b/framework/inc/services/layoutmanager.hxx @@ -209,7 +209,7 @@ namespace framework bool implts_resizeContainerWindow( const css::awt::Size& rContainerSize, const css::awt::Point& rComponentPos ); ::Size implts_getContainerWindowOutputSize(); - void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace ); + void implts_setDockingAreaWindowSizes(); css::awt::Rectangle implts_calcDockingAreaSizes(); bool implts_doLayout( bool bForceRequestBorderSpace, bool bOuterResize ); void implts_doLayout_notify( bool bOuterResize ); diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index fc296d512be8..ab5f532193f8 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -63,7 +63,6 @@ namespace StatusbarMerger const AddonStatusbarItemContainer& rItems ); bool ProcessMergeFallback( StatusBar* pStatusbar, - sal_uInt16 nPos, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, diff --git a/framework/inc/uielement/toolbarmerger.hxx b/framework/inc/uielement/toolbarmerger.hxx index 665f37b3e086..2c2890fb4e1d 100644 --- a/framework/inc/uielement/toolbarmerger.hxx +++ b/framework/inc/uielement/toolbarmerger.hxx @@ -97,7 +97,6 @@ class ToolBarMerger const AddonToolbarItemContainer& rItems ); static bool ProcessMergeFallback( ToolBox* pToolbar, - ToolBox::ImplToolItems::size_type nPos, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, const OUString& rModuleIdentifier, diff --git a/framework/inc/xml/statusbardocumenthandler.hxx b/framework/inc/xml/statusbardocumenthandler.hxx index 321d3d352d85..896c71ff6fef 100644 --- a/framework/inc/xml/statusbardocumenthandler.hxx +++ b/framework/inc/xml/statusbardocumenthandler.hxx @@ -117,7 +117,6 @@ class FWE_DLLPUBLIC OWriteStatusBarDocumentHandler final /// @throws css::uno::RuntimeException void WriteStatusBarItem( const OUString& rCommandURL, - const OUString& rHelpURL, sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ); diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index 2122c3949400..9bc38a5d82ec 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -541,7 +541,7 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() nWidth ); if ( !aCommandURL.isEmpty() ) - WriteStatusBarItem( aCommandURL, aHelpURL, nOffset, nStyle, nWidth ); + WriteStatusBarItem( aCommandURL, nOffset, nStyle, nWidth ); } } @@ -555,7 +555,6 @@ void OWriteStatusBarDocumentHandler::WriteStatusBarDocument() void OWriteStatusBarDocumentHandler::WriteStatusBarItem( const OUString& rCommandURL, - const OUString& /*rHelpURL*/, sal_Int16 nOffset, sal_Int16 nStyle, sal_Int16 nWidth ) diff --git a/framework/source/layoutmanager/layoutmanager.cxx b/framework/source/layoutmanager/layoutmanager.cxx index 140558761777..4bb7d3dfbaa4 100644 --- a/framework/source/layoutmanager/layoutmanager.cxx +++ b/framework/source/layoutmanager/layoutmanager.cxx @@ -2482,7 +2482,7 @@ awt::Rectangle LayoutManager::implts_calcDockingAreaSizes() return aBorderSpace; } -void LayoutManager::implts_setDockingAreaWindowSizes( const awt::Rectangle& /*rBorderSpace*/ ) +void LayoutManager::implts_setDockingAreaWindowSizes() { SolarMutexClearableGuard aReadLock; Reference< awt::XWindow > xContainerWindow( m_xContainerWindow ); @@ -2714,7 +2714,7 @@ IMPL_LINK_NOARG(LayoutManager, AsyncLayoutHdl, Timer *, void) aDockingArea.Height -= aStatusBarSize.Height(); aReadLock.clear(); - implts_setDockingAreaWindowSizes( aDockingArea ); + implts_setDockingAreaWindowSizes(); implts_doLayout( true, false ); } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.cxx b/framework/source/layoutmanager/toolbarlayoutmanager.cxx index 7ff134b79526..e8df5f8282ba 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.cxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.cxx @@ -3103,7 +3103,6 @@ void ToolbarLayoutManager::implts_setTrackingRect( ui::DockingArea eDockingArea, void ToolbarLayoutManager::implts_renumberRowColumnData( ui::DockingArea eDockingArea, - DockingOperation /*eDockingOperation*/, const UIElement& rUIElement ) { SolarMutexClearableGuard aReadLock; @@ -3515,7 +3514,7 @@ void SAL_CALL ToolbarLayoutManager::endDocking( const awt::EndDockingEvent& e ) if ( m_eDockOperation != DOCKOP_ON_COLROW ) { // we have to renumber our row/column data to insert a new row/column - implts_renumberRowColumnData((ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea, m_eDockOperation, aUIDockingElement ); + implts_renumberRowColumnData((ui::DockingArea)aUIDockingElement.m_aDockedData.m_nDockedArea, aUIDockingElement ); } } diff --git a/framework/source/layoutmanager/toolbarlayoutmanager.hxx b/framework/source/layoutmanager/toolbarlayoutmanager.hxx index c82baa37b291..abbe95341344 100644 --- a/framework/source/layoutmanager/toolbarlayoutmanager.hxx +++ b/framework/source/layoutmanager/toolbarlayoutmanager.hxx @@ -205,7 +205,7 @@ class ToolbarLayoutManager : public ::cppu::WeakImplHelper< css::awt::XDockableW void implts_setDockingAreaWindowSizes( const css::awt::Rectangle& rBorderSpace ); css::awt::Point implts_findNextCascadeFloatingPos(); - void implts_renumberRowColumnData( css::ui::DockingArea eDockingArea, DockingOperation eDockingOperation, const UIElement& rUIElement ); + void implts_renumberRowColumnData( css::ui::DockingArea eDockingArea, const UIElement& rUIElement ); void implts_calcWindowPosSizeOnSingleRowColumn( sal_Int32 nDockingArea, sal_Int32 nOffset, SingleRowColumnWindowData& rRowColumnWindowData, diff --git a/framework/source/services/autorecovery.cxx b/framework/source/services/autorecovery.cxx index b3849d54cc20..827e045629ff 100644 --- a/framework/source/services/autorecovery.cxx +++ b/framework/source/services/autorecovery.cxx @@ -837,7 +837,7 @@ private: }; // TODO document me - void implts_resetHandleStates(bool bLoadCache); + void implts_resetHandleStates(); // TODO document me void implts_specifyDefaultFilterAndExtension(AutoRecovery::TDocumentInfo& rInfo); @@ -868,7 +868,7 @@ private: void implts_doSessionSave(const DispatchParams& aParams); // TODO document me - void implts_doSessionQuietQuit(const DispatchParams& aParams); + void implts_doSessionQuietQuit(); // TODO document me void implts_doSessionRestore(const DispatchParams& aParams); @@ -1445,7 +1445,7 @@ void AutoRecovery::implts_dispatch(const DispatchParams& aParams) { SAL_INFO("fwk.autorecovery", "... do session quiet quit ..."); bAllowAutoSaveReactivation = false; - implts_doSessionQuietQuit(aParams); + implts_doSessionQuietQuit(); } else if ( @@ -2358,7 +2358,7 @@ IMPL_LINK_NOARG(AutoRecovery, implts_timerExpired, Timer *, void) (eSuggestedTimer == AutoRecovery::E_NORMAL_AUTOSAVE_INTERVALL) ) { - implts_resetHandleStates(false); + implts_resetHandleStates(); } implts_informListener(AutoRecovery::E_AUTO_SAVE, @@ -3642,7 +3642,7 @@ css::frame::FeatureStateEvent AutoRecovery::implst_createFeatureStateEvent( return aEvent; } -void AutoRecovery::implts_resetHandleStates(bool /*bLoadCache*/) +void AutoRecovery::implts_resetHandleStates() { CacheLockGuard aCacheLock(this, cppu::WeakComponentImplHelperBase::rBHelper.rMutex, m_nDocCacheLock, LOCK_FOR_CACHE_USE); @@ -3713,7 +3713,7 @@ void AutoRecovery::implts_doEmergencySave(const DispatchParams& aParams) // was already saved during the THIS(!) EmergencySave session. // Of course following recovery session must be started without // any "handle" state ... - implts_resetHandleStates(false); + implts_resetHandleStates(); // flush config cached back to disc. impl_flushALLConfigChanges(); @@ -3738,7 +3738,7 @@ void AutoRecovery::implts_doRecovery(const DispatchParams& aParams) // was already saved during the THIS(!) Recovery session. // Of course a may be following EmergencySave session must be started without // any "handle" state ... - implts_resetHandleStates(true); + implts_resetHandleStates(); // Reset the configuration hint "we was crashed"! ::comphelper::ConfigurationHelper::writeDirectKey( @@ -3782,13 +3782,13 @@ void AutoRecovery::implts_doSessionSave(const DispatchParams& aParams) // was already saved during the THIS(!) save session. // Of course following restore session must be started without // any "handle" state ... - implts_resetHandleStates(false); + implts_resetHandleStates(); // flush config cached back to disc. impl_flushALLConfigChanges(); } -void AutoRecovery::implts_doSessionQuietQuit(const DispatchParams& /*aParams*/) +void AutoRecovery::implts_doSessionQuietQuit() { SAL_INFO("fwk.autorecovery", "AutoRecovery::implts_doSessionQuietQuit()"); @@ -3834,7 +3834,7 @@ void AutoRecovery::implts_doSessionRestore(const DispatchParams& aParams) // was already saved during the THIS(!) Restore session. // Of course a may be following save session must be started without // any "handle" state ... - implts_resetHandleStates(true); + implts_resetHandleStates(); // make all opened documents visible implts_changeAllDocVisibility(true); diff --git a/framework/source/services/frame.cxx b/framework/source/services/frame.cxx index 132334ebdcd7..954eb9c38c29 100644 --- a/framework/source/services/frame.cxx +++ b/framework/source/services/frame.cxx @@ -306,12 +306,10 @@ public: private: - void SAL_CALL impl_setPropertyValue(const OUString& sProperty, - sal_Int32 nHandle, + void SAL_CALL impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue); - css::uno::Any SAL_CALL impl_getPropertyValue(const OUString& sProperty, - sal_Int32 nHandle); + css::uno::Any SAL_CALL impl_getPropertyValue(sal_Int32 nHandle); /** set a new owner for this helper. * @@ -1860,7 +1858,7 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty, css::beans::Property aPropInfo = pIt->second; - css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle); + css::uno::Any aCurrentValue = impl_getPropertyValue(aPropInfo.Handle); bool bWillBeChanged = (aCurrentValue != aValue); if (! bWillBeChanged) @@ -1877,7 +1875,7 @@ void SAL_CALL Frame::setPropertyValue(const OUString& sProperty, if (impl_existsVeto(aEvent)) throw css::beans::PropertyVetoException(); - impl_setPropertyValue(aPropInfo.Name, aPropInfo.Handle, aValue); + impl_setPropertyValue(aPropInfo.Handle, aValue); impl_notifyChangeListener(aEvent); } @@ -1895,7 +1893,7 @@ css::uno::Any SAL_CALL Frame::getPropertyValue(const OUString& sProperty) css::beans::Property aPropInfo = pIt->second; - return impl_getPropertyValue(aPropInfo.Name, aPropInfo.Handle); + return impl_getPropertyValue(aPropInfo.Handle); } void SAL_CALL Frame::addPropertyChangeListener( @@ -2707,8 +2705,7 @@ sal_Int16 SAL_CALL Frame::resetActionLocks() return nCurrentLocks; } -void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, - sal_Int32 nHandle, +void SAL_CALL Frame::impl_setPropertyValue(sal_Int32 nHandle, const css::uno::Any& aValue) { @@ -2765,8 +2762,7 @@ void SAL_CALL Frame::impl_setPropertyValue(const OUString& /*sProperty*/, } } -css::uno::Any SAL_CALL Frame::impl_getPropertyValue(const OUString& /*sProperty*/, - sal_Int32 nHandle) +css::uno::Any SAL_CALL Frame::impl_getPropertyValue(sal_Int32 nHandle) { /* There is no need to lock any mutex here. Because we share the solar mutex with our base class. And we said to our base class: "don't release it on calling us" .-) diff --git a/framework/source/services/pathsettings.cxx b/framework/source/services/pathsettings.cxx index 0c632ef8194f..a002758d46a4 100644 --- a/framework/source/services/pathsettings.cxx +++ b/framework/source/services/pathsettings.cxx @@ -417,10 +417,9 @@ private: css::uno::Sequence< sal_Int32 > impl_mapPathName2IDList(const OUString& sPath); - void impl_notifyPropListener( PathSettings::EChangeOp eOp , - const OUString& sPath , - const PathSettings::PathInfo* pPathOld, - const PathSettings::PathInfo* pPathNew); + void impl_notifyPropListener( const OUString& sPath , + const PathSettings::PathInfo* pPathOld, + const PathSettings::PathInfo* pPathNew); // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue( css::uno::Any& aConvertedValue, @@ -782,7 +781,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath { pPathOld = nullptr; pPathNew = &aPath; - impl_notifyPropListener(eOp, sPath, pPathOld, pPathNew); + impl_notifyPropListener(sPath, pPathOld, pPathNew); } m_lPaths[sPath] = aPath; } @@ -794,7 +793,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath { pPathOld = &(pPath->second); pPathNew = &aPath; - impl_notifyPropListener(eOp, sPath, pPathOld, pPathNew); + impl_notifyPropListener(sPath, pPathOld, pPathNew); } m_lPaths[sPath] = aPath; } @@ -808,7 +807,7 @@ PathSettings::EChangeOp PathSettings::impl_updatePath(const OUString& sPath { pPathOld = &(pPath->second); pPathNew = nullptr; - impl_notifyPropListener(eOp, sPath, pPathOld, pPathNew); + impl_notifyPropListener(sPath, pPathOld, pPathNew); } m_lPaths.erase(pPath); } @@ -864,10 +863,9 @@ css::uno::Sequence< sal_Int32 > PathSettings::impl_mapPathName2IDList(const OUSt return lIDs; } -void PathSettings::impl_notifyPropListener( PathSettings::EChangeOp /*eOp*/ , - const OUString& sPath , - const PathSettings::PathInfo* pPathOld, - const PathSettings::PathInfo* pPathNew) +void PathSettings::impl_notifyPropListener( const OUString& sPath, + const PathSettings::PathInfo* pPathOld, + const PathSettings::PathInfo* pPathNew) { css::uno::Sequence< sal_Int32 > lHandles(1); css::uno::Sequence< css::uno::Any > lOldVals(1); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index efbe34c91f9d..6b7ef00b33c3 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -497,7 +497,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc else { StatusbarMerger::ProcessMergeFallback( m_pStatusBar, - nRefPos, nItemId, m_aModuleIdentifier, rInstruction.aMergeCommand, diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index 6ec97abef7a9..e4b6a9faca3d 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -210,7 +210,6 @@ bool StatusbarMerger::ProcessMergeOperation( bool StatusbarMerger::ProcessMergeFallback( StatusBar* pStatusbar, - sal_uInt16 /*nPos*/, sal_uInt16& rItemId, const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, diff --git a/framework/source/uielement/toolbarmanager.cxx b/framework/source/uielement/toolbarmanager.cxx index 0f792ccb0519..2ab500e34b04 100644 --- a/framework/source/uielement/toolbarmanager.cxx +++ b/framework/source/uielement/toolbarmanager.cxx @@ -1126,7 +1126,6 @@ void ToolBarManager::FillToolbar( const Reference< XIndexAccess >& rItemContaine else { ToolBarMerger::ProcessMergeFallback( m_pToolBar, - aRefPoint.nPos, nItemId, m_aCommandMap, m_aModuleIdentifier, diff --git a/framework/source/uielement/toolbarmerger.cxx b/framework/source/uielement/toolbarmerger.cxx index 2973b2cca3f4..c6734d91e565 100644 --- a/framework/source/uielement/toolbarmerger.cxx +++ b/framework/source/uielement/toolbarmerger.cxx @@ -371,7 +371,6 @@ bool ToolBarMerger::ProcessMergeOperation( */ bool ToolBarMerger::ProcessMergeFallback( ToolBox* pToolbar, - ToolBox::ImplToolItems::size_type /*nPos*/, sal_uInt16& rItemId, CommandToInfoMap& rCommandMap, const OUString& rModuleIdentifier, |