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/css1atr.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/css1atr.cxx')
-rw-r--r-- | sw/source/filter/html/css1atr.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/filter/html/css1atr.cxx b/sw/source/filter/html/css1atr.cxx index 892569bcd0db..0e0192063e31 100644 --- a/sw/source/filter/html/css1atr.cxx +++ b/sw/source/filter/html/css1atr.cxx @@ -328,7 +328,7 @@ void SwHTMLWriter::OutCSS1_Property( const sal_Char *pProp, sOut.append("; "); } - sOut.append(OString(pProp) + ": "); + sOut.append(pProp + OStringLiteral(": ")); if( m_nCSS1OutMode & CSS1_OUTMODE_ENCODE ) { // for STYLE-Option encode string @@ -2472,7 +2472,7 @@ static Writer& OutCSS1_SvxFontHeight( Writer& rWrt, const SfxPoolItem& rHt ) return rWrt; sal_uInt32 nHeight = static_cast<const SvxFontHeightItem&>(rHt).GetHeight(); - OString sHeight(OString::number(nHeight/20) + OString(sCSS1_UNIT_pt)); + OString sHeight(OString::number(nHeight/20) + sCSS1_UNIT_pt); rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_font_size, sHeight); return rWrt; @@ -2533,7 +2533,7 @@ static Writer& OutCSS1_SvxKerning( Writer& rWrt, const SfxPoolItem& rHt ) // Width as n.n pt nValue = (nValue + 1) / 2; // 1/10pt sOut.append(OString::number(nValue / 10) + "." + OString::number(nValue % 10) + - OString(sCSS1_UNIT_pt)); + sCSS1_UNIT_pt); rHTMLWrt.OutCSS1_PropertyAscii(sCSS1_P_letter_spacing, sOut.makeStringAndClear()); @@ -3332,7 +3332,7 @@ static void OutCSS1_SvxBorderLine( SwHTMLWriter& rHTMLWrt, // width in n.nn pt sOut.append(OString::number(nWidth / 100) + "." + OString::number((nWidth/10) % 10) + - OString::number(nWidth % 10) + OString(sCSS1_UNIT_pt)); + OString::number(nWidth % 10) + sCSS1_UNIT_pt); } // Line-Style: solid or double |