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 /vcl/unx/generic/print/glyphset.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 'vcl/unx/generic/print/glyphset.cxx')
| -rw-r--r-- | vcl/unx/generic/print/glyphset.cxx | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/vcl/unx/generic/print/glyphset.cxx b/vcl/unx/generic/print/glyphset.cxx index 9f8105fda2ca..a3508233e13f 100644 --- a/vcl/unx/generic/print/glyphset.cxx +++ b/vcl/unx/generic/print/glyphset.cxx @@ -151,14 +151,13 @@ GlyphSet::GetReencodedFontName (rtl_TextEncoding nEnc, const OString &rFontName) if ( nEnc == RTL_TEXTENCODING_MS_1252 || nEnc == RTL_TEXTENCODING_ISO_8859_1) { - return rFontName - + OString("-iso1252"); + return rFontName + "-iso1252"; } else if (nEnc >= RTL_TEXTENCODING_USER_START && nEnc <= RTL_TEXTENCODING_USER_END) { return rFontName - + OString("-enc") + + "-enc" + OString::number ((nEnc - RTL_TEXTENCODING_USER_START)); } else |