diff options
| author | Noel Grandin <noelgrandin@gmail.com> | 2020-11-10 14:41:56 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2020-11-11 06:33:40 +0100 |
| commit | cc1e6ee2dd4609c27cb7a09aa47a779592a3e22c (patch) | |
| tree | e0155415dcdbb86078d47100d088689542b98a66 /scripting | |
| parent | dfb2e07e32694c220e791574b7a6c05f5648c0c2 (diff) | |
disable O(U)String::concat for internal code
in favour of the more widely used, and better optimised, operator+
Change-Id: I6a1b37e0f3d253af1f7a0892443f59b620efea63
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105523
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/source/dlgprov/dlgevtatt.cxx | 2 | ||||
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 5 | ||||
| -rw-r--r-- | scripting/source/provider/URIHelper.cxx | 4 | ||||
| -rw-r--r-- | scripting/source/vbaevents/eventhelper.cxx | 3 |
4 files changed, 6 insertions, 8 deletions
diff --git a/scripting/source/dlgprov/dlgevtatt.cxx b/scripting/source/dlgprov/dlgevtatt.cxx index 4f5970a49bee..b91ffc3c3a31 100644 --- a/scripting/source/dlgprov/dlgevtatt.cxx +++ b/scripting/source/dlgprov/dlgevtatt.cxx @@ -139,7 +139,7 @@ namespace dlgprov return; ScriptEvent aScriptEventCopy( aScriptEvent ); - aScriptEventCopy.ScriptCode = msDialogLibName.concat( "." ).concat( msDialogCodeName ); + aScriptEventCopy.ScriptCode = msDialogLibName + "." + msDialogCodeName; try { mxListener->firing( aScriptEventCopy ); diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 78d754300cfa..b163a2000cce 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -242,9 +242,8 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( { aException = ::cppu::getCaughtException(); - OUString reason = "ScriptProtocolHandler::dispatch: caught "; - - invokeResult <<= reason.concat( aException.getValueTypeName() ).concat( ": " ).concat( e.Message ); + invokeResult <<= "ScriptProtocolHandler::dispatch: caught " + + aException.getValueTypeName() + ": " + e.Message; bCaughtException = true; } diff --git a/scripting/source/provider/URIHelper.cxx b/scripting/source/provider/URIHelper.cxx index f6d2f65a672b..09fedf5762fd 100644 --- a/scripting/source/provider/URIHelper.cxx +++ b/scripting/source/provider/URIHelper.cxx @@ -127,7 +127,7 @@ ScriptingFrameworkURIHelper::initBaseURI() } else if (m_sLocation.startsWith("vnd.sun.star.tdoc")) { - m_sBaseURI = m_sLocation.concat( SCRIPTS_PART ); + m_sBaseURI = m_sLocation + SCRIPTS_PART; m_sLocation = "document"; return true; } @@ -153,7 +153,7 @@ ScriptingFrameworkURIHelper::initBaseURI() { if ( bAppendScriptsPart ) { - m_sBaseURI = pChild->concat( SCRIPTS_PART ); + m_sBaseURI = *pChild + SCRIPTS_PART; } else { diff --git a/scripting/source/vbaevents/eventhelper.cxx b/scripting/source/vbaevents/eventhelper.cxx index 31e7a1bf80d2..c4404839ee4a 100644 --- a/scripting/source/vbaevents/eventhelper.cxx +++ b/scripting/source/vbaevents/eventhelper.cxx @@ -877,10 +877,9 @@ EventListener::firing_Impl(const ScriptEvent& evt, Any* pRet ) break; } - OUString sTemp = sName.concat( rTxInfo.sVBAName ); // see if we have a match for the handlerextension // where ScriptCode is methodname_handlerextension - OUString sToResolve = sMacroLoc.concat( sTemp ); + OUString sToResolve = sMacroLoc + sName + rTxInfo.sVBAName; ooo::vba::MacroResolvedInfo aMacroResolvedInfo = ooo::vba::resolveVBAMacro( mpShell, sToResolve ); if ( aMacroResolvedInfo.mbFound ) |