diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-15 20:24:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-16 07:57:45 +0200 |
| commit | 3ee177a14d8b816ef5b62500aeb54524c289e045 (patch) | |
| tree | 982b524a298c2b2f959f5c858c81be9b3420566a /framework | |
| parent | 820f340f285932bbb8d6739177e9bb81c23c1a5d (diff) | |
loplugin:stringadd look through a couple more known-good methods
Change-Id: Ifbdb3e41eae665f7dcaf5301aaba2b6e4662cf48
Reviewed-on: https://gerrit.libreoffice.org/80855
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'framework')
4 files changed, 14 insertions, 26 deletions
diff --git a/framework/source/fwe/xml/statusbardocumenthandler.cxx b/framework/source/fwe/xml/statusbardocumenthandler.cxx index d4fb733c7d2c..b0289933114e 100644 --- a/framework/source/fwe/xml/statusbardocumenthandler.cxx +++ b/framework/source/fwe/xml/statusbardocumenthandler.cxx @@ -156,14 +156,14 @@ OReadStatusBarDocumentHandler::OReadStatusBarDocumentHandler( { if ( StatusBarEntries[i].nNamespace == SB_NS_STATUSBAR ) { - OUString temp = XMLNS_STATUSBAR XMLNS_FILTER_SEPARATOR; - temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName ); + OUString temp = XMLNS_STATUSBAR XMLNS_FILTER_SEPARATOR + + OUString::createFromAscii( StatusBarEntries[i].aEntryName ); m_aStatusBarMap.emplace( temp, static_cast<StatusBar_XML_Entry>(i) ); } else { - OUString temp = XMLNS_XLINK XMLNS_FILTER_SEPARATOR; - temp += OUString::createFromAscii( StatusBarEntries[i].aEntryName ); + OUString temp = XMLNS_XLINK XMLNS_FILTER_SEPARATOR + + OUString::createFromAscii( StatusBarEntries[i].aEntryName ); m_aStatusBarMap.emplace( temp, static_cast<StatusBar_XML_Entry>(i) ); } } diff --git a/framework/source/fwe/xml/toolboxdocumenthandler.cxx b/framework/source/fwe/xml/toolboxdocumenthandler.cxx index 50d7246a7a4c..509a7235cd50 100644 --- a/framework/source/fwe/xml/toolboxdocumenthandler.cxx +++ b/framework/source/fwe/xml/toolboxdocumenthandler.cxx @@ -134,14 +134,14 @@ OReadToolBoxDocumentHandler::OReadToolBoxDocumentHandler( const Reference< XInde { if ( ToolBoxEntries[i].nNamespace == TB_NS_TOOLBAR ) { - OUString temp = XMLNS_TOOLBAR XMLNS_FILTER_SEPARATOR; - temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); + OUString temp = XMLNS_TOOLBAR XMLNS_FILTER_SEPARATOR + + OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); m_aToolBoxMap.emplace( temp, static_cast<ToolBox_XML_Entry>(i) ); } else { - OUString temp = XMLNS_XLINK XMLNS_FILTER_SEPARATOR; - temp += OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); + OUString temp = XMLNS_XLINK XMLNS_FILTER_SEPARATOR + + OUString::createFromAscii( ToolBoxEntries[i].aEntryName ); m_aToolBoxMap.emplace( temp, static_cast<ToolBox_XML_Entry>(i) ); } } diff --git a/framework/source/uielement/generictoolbarcontroller.cxx b/framework/source/uielement/generictoolbarcontroller.cxx index 0049006c9099..31b02118b2c9 100644 --- a/framework/source/uielement/generictoolbarcontroller.cxx +++ b/framework/source/uielement/generictoolbarcontroller.cxx @@ -209,21 +209,15 @@ void GenericToolbarController::statusChanged( const FeatureStateEvent& Event ) // Replacement for place holders if ( aStrValue.startsWith("($1)") ) { - OUString aTmp(FwkResId(STR_UPDATEDOC)); - aTmp += " " + aStrValue.copy( 4 ); - aStrValue = aTmp; + aStrValue = FwkResId(STR_UPDATEDOC) + " " + aStrValue.copy( 4 ); } else if ( aStrValue.startsWith("($2)") ) { - OUString aTmp(FwkResId(STR_CLOSEDOC_ANDRETURN)); - aTmp += aStrValue.copy( 4 ); - aStrValue = aTmp; + aStrValue = FwkResId(STR_CLOSEDOC_ANDRETURN) + aStrValue.copy( 4 ); } else if ( aStrValue.startsWith("($3)") ) { - OUString aTmp(FwkResId(STR_SAVECOPYDOC)); - aTmp += aStrValue.copy( 4 ); - aStrValue = aTmp; + aStrValue = FwkResId(STR_SAVECOPYDOC) + aStrValue.copy( 4 ); } m_pToolbar->SetItemText( m_nID, aStrValue ); m_pToolbar->SetQuickHelpText( m_nID, aStrValue ); diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index ae83e530c00b..41f358d819f9 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -366,21 +366,15 @@ void SAL_CALL MenuBarManager::statusChanged( const FeatureStateEvent& Event ) // Replacement for place holders if ( aItemText.startsWith("($1)") ) { - OUString aTmp(FwkResId(STR_UPDATEDOC)); - aTmp += " " + aItemText.copy( 4 ); - aItemText = aTmp; + aItemText = FwkResId(STR_UPDATEDOC) + " " + aItemText.copy( 4 ); } else if ( aItemText.startsWith("($2)") ) { - OUString aTmp(FwkResId(STR_CLOSEDOC_ANDRETURN)); - aTmp += aItemText.copy( 4 ); - aItemText = aTmp; + aItemText = FwkResId(STR_CLOSEDOC_ANDRETURN) + aItemText.copy( 4 ); } else if ( aItemText.startsWith("($3)") ) { - OUString aTmp(FwkResId(STR_SAVECOPYDOC)); - aTmp += aItemText.copy( 4 ); - aItemText = aTmp; + aItemText = FwkResId(STR_SAVECOPYDOC) + aItemText.copy( 4 ); } m_pVCLMenu->ShowItem( menuItemHandler->nItemId ); |