summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2020-12-23 13:16:31 +0100
committerStephan Bergmann <sbergman@redhat.com>2020-12-26 14:51:15 +0100
commita3d0091d185f39eddabf4d372ebe0ac3061dbb89 (patch)
tree4d70cedc274972ccc21b6b8e7105f042090cf5d6 /svtools
parentaf791fb775e35c11ad01c42a7085dd121ab9c7a6 (diff)
New loplugin:stringliteralvar
See the comment at the top of compilerplugins/clang/stringliteralvar.cxx for details. (Turned some affected variables in included files into inline variables, to avoid GCC warnings about unused variables.) Change-Id: Ie77219e6adfdaaceaa8b4e590b08971f2f04c83a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108239 Tested-by: Jenkins Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'svtools')
-rw-r--r--svtools/source/config/fontsubstconfig.cxx12
-rw-r--r--svtools/source/misc/sampletext.cxx4
-rw-r--r--svtools/source/uno/toolboxcontroller.cxx2
-rw-r--r--svtools/source/uno/unoevent.cxx8
4 files changed, 13 insertions, 13 deletions
diff --git a/svtools/source/config/fontsubstconfig.cxx b/svtools/source/config/fontsubstconfig.cxx
index e0fb350d8cba..e3c156fbfb36 100644
--- a/svtools/source/config/fontsubstconfig.cxx
+++ b/svtools/source/config/fontsubstconfig.cxx
@@ -32,13 +32,13 @@ using namespace com::sun::star::uno;
using namespace com::sun::star::beans;
-const char cReplacement[] = "Replacement";
-const char cFontPairs[] = "FontPairs";
+const OUStringLiteral cReplacement = u"Replacement";
+const OUStringLiteral cFontPairs = u"FontPairs";
-const char cReplaceFont[] = "ReplaceFont";
-const char cSubstituteFont[]= "SubstituteFont";
-const char cOnScreenOnly[] = "OnScreenOnly";
-const char cAlways[] = "Always";
+const OUStringLiteral cReplaceFont = u"ReplaceFont";
+const OUStringLiteral cSubstituteFont= u"SubstituteFont";
+const OUStringLiteral cOnScreenOnly = u"OnScreenOnly";
+const OUStringLiteral cAlways = u"Always";
typedef std::vector<SubstitutionStruct> SubstitutionStructArr;
diff --git a/svtools/source/misc/sampletext.cxx b/svtools/source/misc/sampletext.cxx
index b8fd11b2e744..e96962254521 100644
--- a/svtools/source/misc/sampletext.cxx
+++ b/svtools/source/misc/sampletext.cxx
@@ -150,14 +150,14 @@ OUString makeShortRepresentativeSymbolTextForSelectedFont(OutputDevice const &rD
{
if (rDevice.GetFont().GetFamilyName() == "Symbol")
{
- static const sal_Unicode aImplAppleSymbolText[] =
+ static const OUStringLiteral aImplAppleSymbolText =
u"\u03BC\u2202\u2211\u220F\u03C0\u222B\u03A9\u221A";
bool bHasSampleTextGlyphs
= (-1 == rDevice.HasGlyphs(rDevice.GetFont(), aImplAppleSymbolText));
//It's the Apple version
if (bHasSampleTextGlyphs)
return aImplAppleSymbolText;
- static const sal_Unicode aImplAdobeSymbolText[] =
+ static const OUStringLiteral aImplAdobeSymbolText =
u"\uF06D\uF0B6\uF0E5\uF0D5\uF070\uF0F2\uF057\uF0D6";
return aImplAdobeSymbolText;
}
diff --git a/svtools/source/uno/toolboxcontroller.cxx b/svtools/source/uno/toolboxcontroller.cxx
index b8c9ba9b4a0d..e3da167c21bb 100644
--- a/svtools/source/uno/toolboxcontroller.cxx
+++ b/svtools/source/uno/toolboxcontroller.cxx
@@ -33,7 +33,7 @@
#include <comphelper/processfactory.hxx>
const int TOOLBARCONTROLLER_PROPHANDLE_SUPPORTSVISIBLE = 1;
-const char TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE[] = "SupportsVisible";
+const OUStringLiteral TOOLBARCONTROLLER_PROPNAME_SUPPORTSVISIBLE = u"SupportsVisible";
using namespace ::cppu;
diff --git a/svtools/source/uno/unoevent.cxx b/svtools/source/uno/unoevent.cxx
index 5b24cffd068b..3094d9a297ee 100644
--- a/svtools/source/uno/unoevent.cxx
+++ b/svtools/source/uno/unoevent.cxx
@@ -33,13 +33,13 @@ using css::lang::IllegalArgumentException;
using css::beans::PropertyValue;
-const char sAPI_ServiceName[] = "com.sun.star.container.XNameReplace";
+const OUStringLiteral sAPI_ServiceName = u"com.sun.star.container.XNameReplace";
const char sEventType[] = "EventType";
const char sMacroName[] = "MacroName";
const char sLibrary[] = "Library";
-const char sStarBasic[] = "StarBasic";
-const char sScript[] = "Script";
-const char sNone[] = "None";
+const OUStringLiteral sStarBasic = u"StarBasic";
+const OUStringLiteral sScript = u"Script";
+const OUStringLiteral sNone = u"None";
namespace {