diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-14 14:22:34 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2018-03-14 14:30:35 +0100 |
| commit | a1b58e93f631c6bfd92fc8269da89c74e3784d58 (patch) | |
| tree | f4c41dfaf52962712557a101294959555b673ef4 /framework | |
| parent | 03782946065d8a31808f1dab9bc848d349d623f1 (diff) | |
loplugin:constantparam
Change-Id: I3ce653c0d9e517229dbbe32cc8d3ec3c206e364d
Reviewed-on: https://gerrit.libreoffice.org/51273
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/inc/uielement/statusbarmerger.hxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmanager.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/statusbarmerger.cxx | 12 |
3 files changed, 5 insertions, 11 deletions
diff --git a/framework/inc/uielement/statusbarmerger.hxx b/framework/inc/uielement/statusbarmerger.hxx index 7e593734cbcd..5d752d1d4f8b 100644 --- a/framework/inc/uielement/statusbarmerger.hxx +++ b/framework/inc/uielement/statusbarmerger.hxx @@ -56,14 +56,12 @@ namespace StatusbarMerger bool ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, const ::rtl::OUString& rMergeCommandParameter, const AddonStatusbarItemContainer& rItems ); bool ProcessMergeFallback( StatusBar* pStatusbar, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, const ::rtl::OUString& rMergeFallback, const AddonStatusbarItemContainer& rItems ); diff --git a/framework/source/uielement/statusbarmanager.cxx b/framework/source/uielement/statusbarmanager.cxx index 9f12efb3d8fa..2cc90fd8293e 100644 --- a/framework/source/uielement/statusbarmanager.cxx +++ b/framework/source/uielement/statusbarmanager.cxx @@ -486,7 +486,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc StatusbarMerger::ProcessMergeOperation( m_pStatusBar, nRefPos, nItemId, - "", rInstruction.aMergeCommand, rInstruction.aMergeCommandParameter, aItems ); @@ -495,7 +494,6 @@ void StatusBarManager::FillStatusBar( const uno::Reference< container::XIndexAcc { StatusbarMerger::ProcessMergeFallback( m_pStatusBar, nItemId, - "", rInstruction.aMergeCommand, rInstruction.aMergeCommandParameter, aItems ); diff --git a/framework/source/uielement/statusbarmerger.cxx b/framework/source/uielement/statusbarmerger.cxx index d48c843961ea..2680a63076bd 100644 --- a/framework/source/uielement/statusbarmerger.cxx +++ b/framework/source/uielement/statusbarmerger.cxx @@ -190,17 +190,16 @@ bool StatusbarMerger::ProcessMergeOperation( StatusBar* pStatusbar, sal_uInt16 nPos, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, const ::rtl::OUString& rMergeCommandParameter, const AddonStatusbarItemContainer& rItems ) { if ( rMergeCommand == MERGECOMMAND_ADDAFTER ) - return lcl_MergeItems( pStatusbar, nPos, 1, rItemId, rModuleIdentifier, rItems ); + return lcl_MergeItems( pStatusbar, nPos, 1, rItemId, "", rItems ); else if ( rMergeCommand == MERGECOMMAND_ADDBEFORE ) - return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, rModuleIdentifier, rItems ); + return lcl_MergeItems( pStatusbar, nPos, 0, rItemId, "", rItems ); else if ( rMergeCommand == MERGECOMMAND_REPLACE ) - return lcl_ReplaceItem( pStatusbar, nPos, rItemId, rModuleIdentifier, rItems ); + return lcl_ReplaceItem( pStatusbar, nPos, rItemId, "", rItems ); else if ( rMergeCommand == MERGECOMMAND_REMOVE ) return lcl_RemoveItems( pStatusbar, nPos, rMergeCommandParameter ); @@ -210,7 +209,6 @@ bool StatusbarMerger::ProcessMergeOperation( bool StatusbarMerger::ProcessMergeFallback( StatusBar* pStatusbar, sal_uInt16& rItemId, - const ::rtl::OUString& rModuleIdentifier, const ::rtl::OUString& rMergeCommand, const ::rtl::OUString& rMergeFallback, const AddonStatusbarItemContainer& rItems ) @@ -226,9 +224,9 @@ bool StatusbarMerger::ProcessMergeFallback( ( rMergeCommand == MERGECOMMAND_ADDAFTER ) ) { if ( rMergeFallback == "AddFirst" ) - return lcl_MergeItems( pStatusbar, 0, 0, rItemId, rModuleIdentifier, rItems ); + return lcl_MergeItems( pStatusbar, 0, 0, rItemId, "", rItems ); else if ( rMergeFallback == "AddLast" ) - return lcl_MergeItems( pStatusbar, STATUSBAR_APPEND, 0, rItemId, rModuleIdentifier, rItems ); + return lcl_MergeItems( pStatusbar, STATUSBAR_APPEND, 0, rItemId, "", rItems ); } return false; |