loplugin:stringliteraldefine in svx

Change-Id: I2375ebfe9791c43063ffbc8ddbe1bd365499a576
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125868
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

2 files changed, 50 insertions, 48 deletions

diff --git a/svx/source/tbxctrls/extrusioncontrols.cxx b/svx/source/tbxctrls/extrusioncontrols.cxx
index ec639f77737b..c54004b24cec 100644
--- a/svx/source/tbxctrls/extrusioncontrols.cxx
+++ b/svx/source/tbxctrls/extrusioncontrols.cxx
@@ -47,57 +47,58 @@ namespace svx
 const sal_Int32 gSkewList[] = { 135, 90, 45, 180, 0, -360, -135, -90, -45 };
 constexpr OUStringLiteral g_sExtrusionDirection = u".uno:ExtrusionDirection";
 constexpr OUStringLiteral g_sExtrusionProjection = u".uno:ExtrusionProjection";
-
-const std::u16string_view aLightOffBmps[] =
-{
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_LEFT,
-    u"",
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_RIGHT,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM,
-    u"" RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
+constexpr OUStringLiteral EMPTY = u"";
+
+constexpr rtl::OUStringConstExpr aLightOffBmps[] =
+{
+    RID_SVXBMP_LIGHT_OFF_FROM_TOP_LEFT,
+    RID_SVXBMP_LIGHT_OFF_FROM_TOP,
+    RID_SVXBMP_LIGHT_OFF_FROM_TOP_RIGHT,
+    RID_SVXBMP_LIGHT_OFF_FROM_LEFT,
+    EMPTY,
+    RID_SVXBMP_LIGHT_OFF_FROM_RIGHT,
+    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_LEFT,
+    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM,
+    RID_SVXBMP_LIGHT_OFF_FROM_BOTTOM_RIGHT
 };
 
-const std::u16string_view aLightOnBmps[] =
-{
-    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_LEFT,
-    u"",
-    u"" RID_SVXBMP_LIGHT_ON_FROM_RIGHT,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM,
-    u"" RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
+constexpr rtl::OUStringConstExpr aLightOnBmps[] =
+{
+    RID_SVXBMP_LIGHT_ON_FROM_TOP_LEFT,
+    RID_SVXBMP_LIGHT_ON_FROM_TOP,
+    RID_SVXBMP_LIGHT_ON_FROM_TOP_RIGHT,
+    RID_SVXBMP_LIGHT_ON_FROM_LEFT,
+    EMPTY,
+    RID_SVXBMP_LIGHT_ON_FROM_RIGHT,
+    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_LEFT,
+    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM,
+    RID_SVXBMP_LIGHT_ON_FROM_BOTTOM_RIGHT
 };
 
-const std::u16string_view aLightPreviewBmps[] =
-{
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM,
-    u"" RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
+constexpr rtl::OUStringConstExpr aLightPreviewBmps[] =
+{
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_LEFT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_TOP_RIGHT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_LEFT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_RIGHT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_FRONT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_LEFT,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM,
+    RID_SVXBMP_LIGHT_PREVIEW_FROM_BOTTOM_RIGHT
 };
 
-const std::u16string_view aDirectionBmps[] =
-{
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_NW,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_N,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_NE,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_W,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_NONE,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_E,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_SW,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_S,
-    u"" RID_SVXBMP_DIRECTION_DIRECTION_SE
+constexpr rtl::OUStringConstExpr aDirectionBmps[] =
+{
+    RID_SVXBMP_DIRECTION_DIRECTION_NW,
+    RID_SVXBMP_DIRECTION_DIRECTION_N,
+    RID_SVXBMP_DIRECTION_DIRECTION_NE,
+    RID_SVXBMP_DIRECTION_DIRECTION_W,
+    RID_SVXBMP_DIRECTION_DIRECTION_NONE,
+    RID_SVXBMP_DIRECTION_DIRECTION_E,
+    RID_SVXBMP_DIRECTION_DIRECTION_SW,
+    RID_SVXBMP_DIRECTION_DIRECTION_S,
+    RID_SVXBMP_DIRECTION_DIRECTION_SE
 };
 
 static TranslateId aDirectionStrs[] =
diff --git a/svx/source/tbxctrls/grafctrl.cxx b/svx/source/tbxctrls/grafctrl.cxx
index 02fb3d540ba8..7f644be79052 100644
--- a/svx/source/tbxctrls/grafctrl.cxx
+++ b/svx/source/tbxctrls/grafctrl.cxx
@@ -156,13 +156,14 @@ namespace {
 struct CommandToRID
 {
     const char* pCommand;
-    const char* sResId;
+    rtl::OUStringConstExpr sResId;
 };
 
 }
 
 static OUString ImplGetRID( const OUString& aCommand )
 {
+    static constexpr OUStringLiteral EMPTY = u"";
     static const CommandToRID aImplCommandToResMap[] =
     {
         { ".uno:GrafRed",           RID_SVXBMP_GRAF_RED             },
@@ -172,7 +173,7 @@ static OUString ImplGetRID( const OUString& aCommand )
         { ".uno:GrafContrast",      RID_SVXBMP_GRAF_CONTRAST        },
         { ".uno:GrafGamma",         RID_SVXBMP_GRAF_GAMMA           },
         { ".uno:GrafTransparence",  RID_SVXBMP_GRAF_TRANSPARENCE    },
-        { nullptr, "" }
+        { nullptr, EMPTY }
     };
 
     OUString sRID;
@@ -182,7 +183,7 @@ static OUString ImplGetRID( const OUString& aCommand )
     {
         if ( aCommand.equalsAscii( aImplCommandToResMap[ i ].pCommand ))
         {
-            sRID = OUString::createFromAscii(aImplCommandToResMap[i].sResId);
+            sRID = aImplCommandToResMap[i].sResId;
             break;
         }
         ++i;