From 31ed4c70b027848710a3dc911ff5a7ac18a97047 Mon Sep 17 00:00:00 2001
From: Noel Grandin <noel.grandin@collabora.co.uk>
Date: Fri, 19 Nov 2021 12:47:56 +0200
Subject: loplugin:stringliteraldefine in vcl

Change-Id: Id14cc8613fdfb67790efd6c33ee243f6bdb522f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/125546
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
---
 vcl/unx/generic/dtrans/X11_clipboard.hxx |  2 +-
 vcl/unx/generic/window/salframe.cxx      | 96 ++++++++++++++++----------------
 2 files changed, 49 insertions(+), 49 deletions(-)

(limited to 'vcl/unx/generic')

diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 348acfaf4b65..6a2ab732a631 100644
--- a/vcl/unx/generic/dtrans/X11_clipboard.hxx
+++ b/vcl/unx/generic/dtrans/X11_clipboard.hxx
@@ -24,7 +24,7 @@
 #include <com/sun/star/datatransfer/clipboard/XSystemClipboard.hpp>
 #include <cppuhelper/compbase.hxx>
 
-#define X11_CLIPBOARD_IMPLEMENTATION_NAME "com.sun.star.datatransfer.X11ClipboardSupport"
+inline constexpr OUStringLiteral X11_CLIPBOARD_IMPLEMENTATION_NAME  = u"com.sun.star.datatransfer.X11ClipboardSupport";
 
 namespace x11 {
 
diff --git a/vcl/unx/generic/window/salframe.cxx b/vcl/unx/generic/window/salframe.cxx
index 929432afa286..f38e10d252b7 100644
--- a/vcl/unx/generic/window/salframe.cxx
+++ b/vcl/unx/generic/window/salframe.cxx
@@ -188,58 +188,58 @@ typedef std::vector< unsigned long > NetWmIconData;
 
 namespace
 {
-    const std::u16string_view SV_ICON_SIZE48[] =
-    {
-        u"" MAINAPP_48_8,
-        u"" MAINAPP_48_8,
-        u"" ODT_48_8,
-        u"" OTT_48_8,
-        u"" ODS_48_8,
-        u"" OTS_48_8,
-        u"" ODG_48_8,
-        u"" MAINAPP_48_8,
-        u"" ODP_48_8,
-        u"" MAINAPP_48_8,
-        u"" ODM_48_8,
-        u"" MAINAPP_48_8,
-        u"" ODB_48_8,
-        u"" ODF_48_8
+    constexpr rtl::OUStringConstExpr SV_ICON_SIZE48[] =
+    {
+        MAINAPP_48_8,
+        MAINAPP_48_8,
+        ODT_48_8,
+        OTT_48_8,
+        ODS_48_8,
+        OTS_48_8,
+        ODG_48_8,
+        MAINAPP_48_8,
+        ODP_48_8,
+        MAINAPP_48_8,
+        ODM_48_8,
+        MAINAPP_48_8,
+        ODB_48_8,
+        ODF_48_8
     };
 
-    const std::u16string_view SV_ICON_SIZE32[] =
-    {
-        u"" MAINAPP_32_8,
-        u"" MAINAPP_32_8,
-        u"" ODT_32_8,
-        u"" OTT_32_8,
-        u"" ODS_32_8,
-        u"" OTS_32_8,
-        u"" ODG_32_8,
-        u"" MAINAPP_32_8,
-        u"" ODP_32_8,
-        u"" MAINAPP_32_8,
-        u"" ODM_32_8,
-        u"" MAINAPP_32_8,
-        u"" ODB_32_8,
-        u"" ODF_32_8
+    constexpr rtl::OUStringConstExpr SV_ICON_SIZE32[] =
+    {
+        MAINAPP_32_8,
+        MAINAPP_32_8,
+        ODT_32_8,
+        OTT_32_8,
+        ODS_32_8,
+        OTS_32_8,
+        ODG_32_8,
+        MAINAPP_32_8,
+        ODP_32_8,
+        MAINAPP_32_8,
+        ODM_32_8,
+        MAINAPP_32_8,
+        ODB_32_8,
+        ODF_32_8
     };
 
-    const std::u16string_view SV_ICON_SIZE16[] =
-    {
-        u"" MAINAPP_16_8,
-        u"" MAINAPP_16_8,
-        u"" ODT_16_8,
-        u"" OTT_16_8,
-        u"" ODS_16_8,
-        u"" OTS_16_8,
-        u"" ODG_16_8,
-        u"" MAINAPP_16_8,
-        u"" ODP_16_8,
-        u"" MAINAPP_16_8,
-        u"" ODM_16_8,
-        u"" MAINAPP_16_8,
-        u"" ODB_16_8,
-        u"" ODF_16_8
+    constexpr rtl::OUStringConstExpr SV_ICON_SIZE16[] =
+    {
+        MAINAPP_16_8,
+        MAINAPP_16_8,
+        ODT_16_8,
+        OTT_16_8,
+        ODS_16_8,
+        OTS_16_8,
+        ODG_16_8,
+        MAINAPP_16_8,
+        ODP_16_8,
+        MAINAPP_16_8,
+        ODM_16_8,
+        MAINAPP_16_8,
+        ODB_16_8,
+        ODF_16_8
     };
 }
 
-- 
cgit