diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-13 08:47:47 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2019-10-14 08:26:14 +0200 |
commit | 9b5dad13b56bdde7c40970351af3da3a2c3c9350 (patch) | |
tree | abfd4b02743a0e6a93c51c026f4c53f0e21100bc /sw/source/filter/html/htmlforw.cxx | |
parent | fa71320329999c968feb16ff65be328b5b8ff5e4 (diff) |
loplugin:stringadd look for unnecessary temporaries
which defeat the *StringConcat optimisation.
Also make StringConcat conversions treat a nullptr as an empty string,
to match the O*String(char*) constructors.
Change-Id: If45f5b4b6a535c97bfeeacd9ec472a7603a52e5b
Reviewed-on: https://gerrit.libreoffice.org/80724
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sw/source/filter/html/htmlforw.cxx')
-rw-r--r-- | sw/source/filter/html/htmlforw.cxx | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx index 3b01bcf938a6..a8468320b5e9 100644 --- a/sw/source/filter/html/htmlforw.cxx +++ b/sw/source/filter/html/htmlforw.cxx @@ -176,7 +176,7 @@ static void lcl_html_outEvents( SvStream& rStrm, sOut += OString(pOpt); else { - sOut += OString(OOO_STRING_SVTOOLS_HTML_O_sdevent) + + sOut += OOO_STRING_SVTOOLS_HTML_O_sdevent + OUStringToOString(sListener, RTL_TEXTENCODING_ASCII_US) + "-" + OUStringToOString(sMethod, RTL_TEXTENCODING_ASCII_US); } @@ -510,8 +510,8 @@ void SwHTMLWriter::OutForm( bool bOn, if( pStr ) { - sOut += " " OOO_STRING_SVTOOLS_HTML_O_enctype "=\"" + - OString(pStr) + "\""; + sOut += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_enctype "=\"") + + pStr + "\""; } } @@ -853,8 +853,8 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, auto b = o3tl::tryAccess<bool>(aTmp2); pWrapStr = (b && *b) ? OOO_STRING_SVTOOLS_HTML_WW_hard : OOO_STRING_SVTOOLS_HTML_WW_soft; - sOptions += " " OOO_STRING_SVTOOLS_HTML_O_wrap "=\"" + - OString(pWrapStr) + "\""; + sOptions += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_wrap "=\"") + + pWrapStr + "\""; } } else @@ -931,11 +931,11 @@ Writer& OutHTML_DrawFrameFormatAsControl( Writer& rWrt, if( eTag == TAG_NONE ) return rWrt; - OString sOut = "<" + OString(TagNames[eTag]); + OString sOut = OStringLiteral("<") + TagNames[eTag]; if( eType != TYPE_NONE ) { - sOut += " " OOO_STRING_SVTOOLS_HTML_O_type "=\"" + - OString(TypeNames[eType]) + "\""; + sOut += OStringLiteral(" " OOO_STRING_SVTOOLS_HTML_O_type "=\"") + + TypeNames[eType] + "\""; } aTmp = xPropSet->getPropertyValue("Name"); |