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>

2 files changed, 166 insertions, 166 deletions

diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index 16daf18fef89..e720456b0688 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -10,91 +10,91 @@
 #ifndef INCLUDED_VCL_INC_BITMAPS_HRC
 #define INCLUDED_VCL_INC_BITMAPS_HRC
 
-#define SV_RESID_BITMAP_CHECK1                       "vcl/res/check1.png"
-#define SV_RESID_BITMAP_CHECK2                       "vcl/res/check2.png"
-#define SV_RESID_BITMAP_CHECK3                       "vcl/res/check3.png"
-#define SV_RESID_BITMAP_CHECK4                       "vcl/res/check4.png"
-#define SV_RESID_BITMAP_CHECK5                       "vcl/res/check5.png"
-#define SV_RESID_BITMAP_CHECK6                       "vcl/res/check6.png"
-#define SV_RESID_BITMAP_CHECK7                       "vcl/res/check7.png"
-#define SV_RESID_BITMAP_CHECK8                       "vcl/res/check8.png"
-#define SV_RESID_BITMAP_CHECK9                       "vcl/res/check9.png"
-#define SV_RESID_BITMAP_CHECKMONO1                   "vcl/res/checkmono1.png"
-#define SV_RESID_BITMAP_CHECKMONO2                   "vcl/res/checkmono2.png"
-#define SV_RESID_BITMAP_CHECKMONO3                   "vcl/res/checkmono3.png"
-#define SV_RESID_BITMAP_CHECKMONO4                   "vcl/res/checkmono4.png"
-#define SV_RESID_BITMAP_CHECKMONO5                   "vcl/res/checkmono5.png"
-#define SV_RESID_BITMAP_CHECKMONO6                   "vcl/res/checkmono6.png"
-#define SV_RESID_BITMAP_CHECKMONO7                   "vcl/res/checkmono7.png"
-#define SV_RESID_BITMAP_CHECKMONO8                   "vcl/res/checkmono8.png"
-#define SV_RESID_BITMAP_CHECKMONO9                   "vcl/res/checkmono9.png"
-#define SV_RESID_BITMAP_RADIO1                       "vcl/res/radio1.png"
-#define SV_RESID_BITMAP_RADIO2                       "vcl/res/radio2.png"
-#define SV_RESID_BITMAP_RADIO3                       "vcl/res/radio3.png"
-#define SV_RESID_BITMAP_RADIO4                       "vcl/res/radio4.png"
-#define SV_RESID_BITMAP_RADIO5                       "vcl/res/radio5.png"
-#define SV_RESID_BITMAP_RADIO6                       "vcl/res/radio6.png"
-#define SV_RESID_BITMAP_RADIOMONO1                   "vcl/res/radiomono1.png"
-#define SV_RESID_BITMAP_RADIOMONO2                   "vcl/res/radiomono2.png"
-#define SV_RESID_BITMAP_RADIOMONO3                   "vcl/res/radiomono3.png"
-#define SV_RESID_BITMAP_RADIOMONO4                   "vcl/res/radiomono4.png"
-#define SV_RESID_BITMAP_RADIOMONO5                   "vcl/res/radiomono5.png"
-#define SV_RESID_BITMAP_RADIOMONO6                   "vcl/res/radiomono6.png"
-
-#define SV_RESID_BITMAP_ERRORBOX                     "vcl/res/errorbox.png"
-#define SV_RESID_BITMAP_QUERYBOX                     "vcl/res/querybox.png"
-#define SV_RESID_BITMAP_WARNINGBOX                   "vcl/res/warningbox.png"
-#define SV_RESID_BITMAP_INFOBOX                      "vcl/res/infobox.png"
-
-#define SV_RESID_BITMAP_SCROLLMSK                    "vcl/res/scrmsk.png"
-#define SV_RESID_BITMAP_WHEELVH                      "vcl/res/wheelvh.png"
-#define SV_RESID_BITMAP_WHEELV                       "vcl/res/wheelv.png"
-#define SV_RESID_BITMAP_WHEELH                       "vcl/res/wheelh.png"
-#define SV_RESID_BITMAP_SCROLLVH                     "vcl/res/scrollvh.png"
-#define SV_RESID_BITMAP_SCROLLV                      "vcl/res/scrollv.png"
-#define SV_RESID_BITMAP_SCROLLH                      "vcl/res/scrollh.png"
-#define SV_RESID_BITMAP_CLOSEDOC                     "vcl/res/closedoc.png"
-#define SV_RESID_BITMAP_REFRESH                      "res/reload.png"
-#define SV_RESID_BITMAP_NOTEBOOKBAR                  "res/notebookbar.png"
-
-#define SV_DISCLOSURE_PLUS                           "res/plus.png"
-#define SV_DISCLOSURE_MINUS                          "res/minus.png"
-
-#define SV_PRINT_COLLATE_BMP                         "vcl/res/collate.png"
-#define SV_PRINT_NOCOLLATE_BMP                       "vcl/res/ncollate.png"
-
-#define MAINAPP_48_8                                 "res/mainapp_48_8.png"
-#define ODT_48_8                                     "res/odt_48_8.png"
-#define OTT_48_8                                     "res/ott_48_8.png"
-#define ODS_48_8                                     "res/ods_48_8.png"
-#define OTS_48_8                                     "res/ots_48_8.png"
-#define ODG_48_8                                     "res/odg_48_8.png"
-#define ODP_48_8                                     "res/odp_48_8.png"
-#define ODM_48_8                                     "res/odm_48_8.png"
-#define ODB_48_8                                     "res/odb_48_8.png"
-#define ODF_48_8                                     "res/odf_48_8.png"
-
-#define MAINAPP_32_8                                 "res/mainapp_32_8.png"
-#define ODT_32_8                                     "res/odt_32_8.png"
-#define OTT_32_8                                     "res/ott_32_8.png"
-#define ODS_32_8                                     "res/ods_32_8.png"
-#define OTS_32_8                                     "res/ots_32_8.png"
-#define ODG_32_8                                     "res/odg_32_8.png"
-#define ODP_32_8                                     "res/odp_32_8.png"
-#define ODM_32_8                                     "res/odm_32_8.png"
-#define ODB_32_8                                     "res/odb_32_8.png"
-#define ODF_32_8                                     "res/odf_32_8.png"
-
-#define MAINAPP_16_8                                 "res/mainapp_16_8.png"
-#define ODT_16_8                                     "res/odt_16_8.png"
-#define OTT_16_8                                     "res/ott_16_8.png"
-#define ODS_16_8                                     "res/ods_16_8.png"
-#define OTS_16_8                                     "res/ots_16_8.png"
-#define ODG_16_8                                     "res/odg_16_8.png"
-#define ODP_16_8                                     "res/odp_16_8.png"
-#define ODM_16_8                                     "res/odm_16_8.png"
-#define ODB_16_8                                     "res/odb_16_8.png"
-#define ODF_16_8                                     "res/odf_16_8.png"
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK1 = u"vcl/res/check1.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK2 = u"vcl/res/check2.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK3 = u"vcl/res/check3.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK4 = u"vcl/res/check4.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK5 = u"vcl/res/check5.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK6 = u"vcl/res/check6.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK7 = u"vcl/res/check7.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK8 = u"vcl/res/check8.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECK9 = u"vcl/res/check9.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO1 = u"vcl/res/checkmono1.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO2 = u"vcl/res/checkmono2.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO3 = u"vcl/res/checkmono3.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO4 = u"vcl/res/checkmono4.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO5 = u"vcl/res/checkmono5.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO6 = u"vcl/res/checkmono6.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO7 = u"vcl/res/checkmono7.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO8 = u"vcl/res/checkmono8.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CHECKMONO9 = u"vcl/res/checkmono9.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO1 = u"vcl/res/radio1.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO2 = u"vcl/res/radio2.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO3 = u"vcl/res/radio3.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO4 = u"vcl/res/radio4.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO5 = u"vcl/res/radio5.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIO6 = u"vcl/res/radio6.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO1 = u"vcl/res/radiomono1.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO2 = u"vcl/res/radiomono2.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO3 = u"vcl/res/radiomono3.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO4 = u"vcl/res/radiomono4.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO5 = u"vcl/res/radiomono5.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_RADIOMONO6 = u"vcl/res/radiomono6.png";
+
+inline constexpr OUStringLiteral SV_RESID_BITMAP_ERRORBOX = u"vcl/res/errorbox.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_QUERYBOX = u"vcl/res/querybox.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_WARNINGBOX = u"vcl/res/warningbox.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_INFOBOX = u"vcl/res/infobox.png";
+
+inline constexpr OUStringLiteral SV_RESID_BITMAP_SCROLLMSK = u"vcl/res/scrmsk.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_WHEELVH = u"vcl/res/wheelvh.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_WHEELV = u"vcl/res/wheelv.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_WHEELH = u"vcl/res/wheelh.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_SCROLLVH = u"vcl/res/scrollvh.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_SCROLLV = u"vcl/res/scrollv.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_SCROLLH = u"vcl/res/scrollh.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_CLOSEDOC = u"vcl/res/closedoc.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_REFRESH = u"res/reload.png";
+inline constexpr OUStringLiteral SV_RESID_BITMAP_NOTEBOOKBAR = u"res/notebookbar.png";
+
+inline constexpr OUStringLiteral SV_DISCLOSURE_PLUS = u"res/plus.png";
+inline constexpr OUStringLiteral SV_DISCLOSURE_MINUS = u"res/minus.png";
+
+inline constexpr OUStringLiteral SV_PRINT_COLLATE_BMP = u"vcl/res/collate.png";
+inline constexpr OUStringLiteral SV_PRINT_NOCOLLATE_BMP = u"vcl/res/ncollate.png";
+
+inline constexpr OUStringLiteral MAINAPP_48_8 = u"res/mainapp_48_8.png";
+inline constexpr OUStringLiteral ODT_48_8 = u"res/odt_48_8.png";
+inline constexpr OUStringLiteral OTT_48_8 = u"res/ott_48_8.png";
+inline constexpr OUStringLiteral ODS_48_8 = u"res/ods_48_8.png";
+inline constexpr OUStringLiteral OTS_48_8 = u"res/ots_48_8.png";
+inline constexpr OUStringLiteral ODG_48_8 = u"res/odg_48_8.png";
+inline constexpr OUStringLiteral ODP_48_8 = u"res/odp_48_8.png";
+inline constexpr OUStringLiteral ODM_48_8 = u"res/odm_48_8.png";
+inline constexpr OUStringLiteral ODB_48_8 = u"res/odb_48_8.png";
+inline constexpr OUStringLiteral ODF_48_8 = u"res/odf_48_8.png";
+
+inline constexpr OUStringLiteral MAINAPP_32_8 = u"res/mainapp_32_8.png";
+inline constexpr OUStringLiteral ODT_32_8 = u"res/odt_32_8.png";
+inline constexpr OUStringLiteral OTT_32_8 = u"res/ott_32_8.png";
+inline constexpr OUStringLiteral ODS_32_8 = u"res/ods_32_8.png";
+inline constexpr OUStringLiteral OTS_32_8 = u"res/ots_32_8.png";
+inline constexpr OUStringLiteral ODG_32_8 = u"res/odg_32_8.png";
+inline constexpr OUStringLiteral ODP_32_8 = u"res/odp_32_8.png";
+inline constexpr OUStringLiteral ODM_32_8 = u"res/odm_32_8.png";
+inline constexpr OUStringLiteral ODB_32_8 = u"res/odb_32_8.png";
+inline constexpr OUStringLiteral ODF_32_8 = u"res/odf_32_8.png";
+
+inline constexpr OUStringLiteral MAINAPP_16_8 = u"res/mainapp_16_8.png";
+inline constexpr OUStringLiteral ODT_16_8 = u"res/odt_16_8.png";
+inline constexpr OUStringLiteral OTT_16_8 = u"res/ott_16_8.png";
+inline constexpr OUStringLiteral ODS_16_8 = u"res/ods_16_8.png";
+inline constexpr OUStringLiteral OTS_16_8 = u"res/ots_16_8.png";
+inline constexpr OUStringLiteral ODG_16_8 = u"res/odg_16_8.png";
+inline constexpr OUStringLiteral ODP_16_8 = u"res/odp_16_8.png";
+inline constexpr OUStringLiteral ODM_16_8 = u"res/odm_16_8.png";
+inline constexpr OUStringLiteral ODB_16_8 = u"res/odb_16_8.png";
+inline constexpr OUStringLiteral ODF_16_8 = u"res/odf_16_8.png";
 
 //start, Throbber::getDefaultImageURLs
 #define SPINNER_16_01                                "vcl/res/spinner-16-01.png"
@@ -131,86 +131,86 @@
 #define SPINNER_64_12                                "vcl/res/spinner-64-12.png"
 //end, Throbber::getDefaultImageURLs
 
-#define IMG_WARN     "dbaccess/res/exwarning.png"
-#define IMG_ERROR    "dbaccess/res/exerror.png"
-#define IMG_INFO     "dbaccess/res/exinfo.png"
-#define IMG_ADD      "extensions/res/scanner/plus.png"
-#define IMG_REMOVE   "extensions/res/scanner/minus.png"
-#define IMG_COPY     "cmd/sc_copy.png"
-#define IMG_PASTE    "cmd/sc_paste.png"
-#define IMG_MENU     "sfx2/res/menu.png"
-#define IMG_CALENDAR "sc/res/date.png"
-
-#define RID_BMP_TREENODE_COLLAPSED  "res/plus.png"
-#define RID_BMP_TREENODE_EXPANDED   "res/minus.png"
-
-#define RID_CURSOR_AUTOSCROLL_E      "vcl/res/autoscroll_e.png"
-#define RID_CURSOR_AUTOSCROLL_N      "vcl/res/autoscroll_n.png"
-#define RID_CURSOR_AUTOSCROLL_NE     "vcl/res/autoscroll_ne.png"
-#define RID_CURSOR_AUTOSCROLL_NS     "vcl/res/autoscroll_ns.png"
-#define RID_CURSOR_AUTOSCROLL_NSWE   "vcl/res/autoscroll_nswe.png"
-#define RID_CURSOR_AUTOSCROLL_NW     "vcl/res/autoscroll_nw.png"
-#define RID_CURSOR_AUTOSCROLL_S      "vcl/res/autoscroll_s.png"
-#define RID_CURSOR_AUTOSCROLL_SE     "vcl/res/autoscroll_se.png"
-#define RID_CURSOR_AUTOSCROLL_SW     "vcl/res/autoscroll_sw.png"
-#define RID_CURSOR_AUTOSCROLL_W      "vcl/res/autoscroll_w.png"
-#define RID_CURSOR_AUTOSCROLL_WE     "vcl/res/autoscroll_we.png"
-#define RID_CURSOR_CHAIN             "vcl/res/chain.png"
-#define RID_CURSOR_CHAIN_NOT_ALLOWED "vcl/res/chain_not_allowed.png"
-#define RID_CURSOR_CHART             "vcl/res/chart.png"
-#define RID_CURSOR_COPY_DATA         "vcl/res/copy_data.png"
-#define RID_CURSOR_COPY_DATA_LINK    "vcl/res/copy_data_link.png"
-#define RID_CURSOR_COPY_FILE         "vcl/res/copy_file.png"
-#define RID_CURSOR_COPY_FILES        "vcl/res/copy_files.png"
-#define RID_CURSOR_COPY_FILE_LINK    "vcl/res/copy_file_link.png"
-#define RID_CURSOR_CROOK             "vcl/res/crook.png"
-#define RID_CURSOR_CROP              "vcl/res/crop.png"
-#define RID_CURSOR_DRAW_ARC          "vcl/res/draw_arc.png"
-#define RID_CURSOR_DRAW_BEZIER       "vcl/res/draw_bezier.png"
-#define RID_CURSOR_DRAW_CAPTION      "vcl/res/draw_caption.png"
-#define RID_CURSOR_DRAW_CIRCLE_CUT   "vcl/res/draw_circle_cut.png"
-#define RID_CURSOR_DRAW_CONNECT      "vcl/res/draw_connect.png"
-#define RID_CURSOR_DRAW_ELLIPSE      "vcl/res/draw_ellipse.png"
-#define RID_CURSOR_DETECTIVE         "vcl/res/detective.png"
-#define RID_CURSOR_DRAW_FREEHAND     "vcl/res/draw_freehand.png"
-#define RID_CURSOR_DRAW_LINE         "vcl/res/draw_line.png"
-#define RID_CURSOR_DRAW_PIE          "vcl/res/draw_pie.png"
-#define RID_CURSOR_DRAW_POLYGON      "vcl/res/draw_polygon.png"
-#define RID_CURSOR_DRAW_RECT         "vcl/res/draw_rect.png"
-#define RID_CURSOR_DRAW_TEXT         "vcl/res/draw_text.png"
-#define RID_CURSOR_FILL              "vcl/res/fill.png"
+inline constexpr OUStringLiteral IMG_WARN = u"dbaccess/res/exwarning.png";
+inline constexpr OUStringLiteral IMG_ERROR = u"dbaccess/res/exerror.png";
+inline constexpr OUStringLiteral IMG_INFO = u"dbaccess/res/exinfo.png";
+inline constexpr OUStringLiteral IMG_ADD = u"extensions/res/scanner/plus.png";
+inline constexpr OUStringLiteral IMG_REMOVE = u"extensions/res/scanner/minus.png";
+inline constexpr OUStringLiteral IMG_COPY = u"cmd/sc_copy.png";
+inline constexpr OUStringLiteral IMG_PASTE = u"cmd/sc_paste.png";
+inline constexpr OUStringLiteral IMG_MENU = u"sfx2/res/menu.png";
+inline constexpr OUStringLiteral IMG_CALENDAR = u"sc/res/date.png";
+
+inline constexpr OUStringLiteral RID_BMP_TREENODE_COLLAPSED = u"res/plus.png";
+inline constexpr OUStringLiteral RID_BMP_TREENODE_EXPANDED = u"res/minus.png";
+
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_E = u"vcl/res/autoscroll_e.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_N = u"vcl/res/autoscroll_n.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_NE = u"vcl/res/autoscroll_ne.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_NS = u"vcl/res/autoscroll_ns.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_NSWE = u"vcl/res/autoscroll_nswe.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_NW = u"vcl/res/autoscroll_nw.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_S = u"vcl/res/autoscroll_s.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_SE = u"vcl/res/autoscroll_se.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_SW = u"vcl/res/autoscroll_sw.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_W = u"vcl/res/autoscroll_w.png";
+inline constexpr OUStringLiteral RID_CURSOR_AUTOSCROLL_WE = u"vcl/res/autoscroll_we.png";
+inline constexpr OUStringLiteral RID_CURSOR_CHAIN = u"vcl/res/chain.png";
+inline constexpr OUStringLiteral RID_CURSOR_CHAIN_NOT_ALLOWED = u"vcl/res/chain_not_allowed.png";
+inline constexpr OUStringLiteral RID_CURSOR_CHART = u"vcl/res/chart.png";
+inline constexpr OUStringLiteral RID_CURSOR_COPY_DATA = u"vcl/res/copy_data.png";
+inline constexpr OUStringLiteral RID_CURSOR_COPY_DATA_LINK = u"vcl/res/copy_data_link.png";
+inline constexpr OUStringLiteral RID_CURSOR_COPY_FILE = u"vcl/res/copy_file.png";
+inline constexpr OUStringLiteral RID_CURSOR_COPY_FILES = u"vcl/res/copy_files.png";
+inline constexpr OUStringLiteral RID_CURSOR_COPY_FILE_LINK = u"vcl/res/copy_file_link.png";
+inline constexpr OUStringLiteral RID_CURSOR_CROOK = u"vcl/res/crook.png";
+inline constexpr OUStringLiteral RID_CURSOR_CROP = u"vcl/res/crop.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_ARC = u"vcl/res/draw_arc.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_BEZIER = u"vcl/res/draw_bezier.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_CAPTION = u"vcl/res/draw_caption.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_CIRCLE_CUT = u"vcl/res/draw_circle_cut.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_CONNECT = u"vcl/res/draw_connect.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_ELLIPSE = u"vcl/res/draw_ellipse.png";
+inline constexpr OUStringLiteral RID_CURSOR_DETECTIVE = u"vcl/res/detective.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_FREEHAND = u"vcl/res/draw_freehand.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_LINE = u"vcl/res/draw_line.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_PIE = u"vcl/res/draw_pie.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_POLYGON = u"vcl/res/draw_polygon.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_RECT = u"vcl/res/draw_rect.png";
+inline constexpr OUStringLiteral RID_CURSOR_DRAW_TEXT = u"vcl/res/draw_text.png";
+inline constexpr OUStringLiteral RID_CURSOR_FILL = u"vcl/res/fill.png";
 #define RID_CURSOR_HELP              "vcl/res/help.png"
-#define RID_CURSOR_H_SHEAR           "vcl/res/h_shear.png"
-#define RID_CURSOR_LINK_DATA         "vcl/res/link_data.png"
-#define RID_CURSOR_LINK_FILE         "vcl/res/link_file.png"
-#define RID_CURSOR_MAGNIFY           "vcl/res/magnify.png"
-#define RID_CURSOR_MIRROR            "vcl/res/mirror.png"
-#define RID_CURSOR_MOVE_BEZIER_WEIGHT   "vcl/res/move_bezier_weight.png"
-#define RID_CURSOR_MOVE_DATA         "vcl/res/move_data.png"
-#define RID_CURSOR_MOVE_DATA_LINK    "vcl/res/move_data_link.png"
-#define RID_CURSOR_MOVE_FILE         "vcl/res/move_file.png"
-#define RID_CURSOR_MOVE_FILES        "vcl/res/move_files.png"
-#define RID_CURSOR_MOVE_FILE_LINK    "vcl/res/move_file_link.png"
-#define RID_CURSOR_MOVE_POINT        "vcl/res/move_point.png"
+inline constexpr OUStringLiteral RID_CURSOR_H_SHEAR = u"vcl/res/h_shear.png";
+inline constexpr OUStringLiteral RID_CURSOR_LINK_DATA = u"vcl/res/link_data.png";
+inline constexpr OUStringLiteral RID_CURSOR_LINK_FILE = u"vcl/res/link_file.png";
+inline constexpr OUStringLiteral RID_CURSOR_MAGNIFY = u"vcl/res/magnify.png";
+inline constexpr OUStringLiteral RID_CURSOR_MIRROR = u"vcl/res/mirror.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_BEZIER_WEIGHT = u"vcl/res/move_bezier_weight.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_DATA = u"vcl/res/move_data.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_DATA_LINK = u"vcl/res/move_data_link.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_FILE = u"vcl/res/move_file.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_FILES = u"vcl/res/move_files.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_FILE_LINK = u"vcl/res/move_file_link.png";
+inline constexpr OUStringLiteral RID_CURSOR_MOVE_POINT = u"vcl/res/move_point.png";
 #define RID_CURSOR_NESWSIZE          "vcl/res/neswsize.png"
-#define RID_CURSOR_NOT_ALLOWED       "vcl/res/not_allowed.png"
-#define RID_CURSOR_NULL              "vcl/res/null.png"
+inline constexpr OUStringLiteral RID_CURSOR_NOT_ALLOWED = u"vcl/res/not_allowed.png";
+inline constexpr OUStringLiteral RID_CURSOR_NULL = u"vcl/res/null.png";
 #define RID_CURSOR_NWSESIZE          "vcl/res/nwsesize.png"
 #define RID_CURSOR_PEN               "vcl/res/pen.png"
-#define RID_CURSOR_PIVOT_COLUMN      "vcl/res/pivot_column.png"
-#define RID_CURSOR_PIVOT_DELETE      "vcl/res/pivot_delete.png"
-#define RID_CURSOR_PIVOT_FIELD       "vcl/res/pivot_field.png"
-#define RID_CURSOR_PIVOT_ROW         "vcl/res/pivot_row.png"
-#define RID_CURSOR_ROTATE            "vcl/res/rotate.png"
-#define RID_CURSOR_TAB_SELECT_E      "vcl/res/tab_select_e.png"
-#define RID_CURSOR_TAB_SELECT_S      "vcl/res/tab_select_s.png"
-#define RID_CURSOR_TAB_SELECT_SE     "vcl/res/tab_select_se.png"
-#define RID_CURSOR_TAB_SELECT_SW     "vcl/res/tab_select_sw.png"
-#define RID_CURSOR_TAB_SELECT_W      "vcl/res/tab_select_w.png"
-#define RID_CURSOR_V_SHEAR           "vcl/res/v_shear.png"
-#define RID_CURSOR_TEXT_VERTICAL     "vcl/res/text_vertical.png"
-#define RID_CURSOR_HIDE_WHITESPACE   "vcl/res/hide_whitespace.png"
-#define RID_CURSOR_SHOW_WHITESPACE   "vcl/res/show_whitespace.png"
+inline constexpr OUStringLiteral RID_CURSOR_PIVOT_COLUMN = u"vcl/res/pivot_column.png";
+inline constexpr OUStringLiteral RID_CURSOR_PIVOT_DELETE = u"vcl/res/pivot_delete.png";
+inline constexpr OUStringLiteral RID_CURSOR_PIVOT_FIELD = u"vcl/res/pivot_field.png";
+inline constexpr OUStringLiteral RID_CURSOR_PIVOT_ROW = u"vcl/res/pivot_row.png";
+inline constexpr OUStringLiteral RID_CURSOR_ROTATE = u"vcl/res/rotate.png";
+inline constexpr OUStringLiteral RID_CURSOR_TAB_SELECT_E = u"vcl/res/tab_select_e.png";
+inline constexpr OUStringLiteral RID_CURSOR_TAB_SELECT_S = u"vcl/res/tab_select_s.png";
+inline constexpr OUStringLiteral RID_CURSOR_TAB_SELECT_SE = u"vcl/res/tab_select_se.png";
+inline constexpr OUStringLiteral RID_CURSOR_TAB_SELECT_SW = u"vcl/res/tab_select_sw.png";
+inline constexpr OUStringLiteral RID_CURSOR_TAB_SELECT_W = u"vcl/res/tab_select_w.png";
+inline constexpr OUStringLiteral RID_CURSOR_V_SHEAR = u"vcl/res/v_shear.png";
+inline constexpr OUStringLiteral RID_CURSOR_TEXT_VERTICAL = u"vcl/res/text_vertical.png";
+inline constexpr OUStringLiteral RID_CURSOR_HIDE_WHITESPACE = u"vcl/res/hide_whitespace.png";
+inline constexpr OUStringLiteral RID_CURSOR_SHOW_WHITESPACE = u"vcl/res/show_whitespace.png";
 #define RID_CURSOR_WAIT              "vcl/res/wait.png"
 #define RID_CURSOR_NWSIZE            "vcl/res/nwsize.png"
 #define RID_CURSOR_NESIZE            "vcl/res/nesize.png"
@@ -220,12 +220,12 @@
 #define RID_CURSOR_WINDOW_NESIZE     "vcl/res/window_nesize.png"
 #define RID_CURSOR_WINDOW_SWSIZE     "vcl/res/window_swsize.png"
 #define RID_CURSOR_WINDOW_SESIZE     "vcl/res/window_sesize.png"
-#define RID_CURSOR_FATCROSS          "vcl/res/fatcross.png"
+inline constexpr OUStringLiteral RID_CURSOR_FATCROSS = u"vcl/res/fatcross.png";
 
-#define CHEVRON                      "sfx2/res/chevron.png"
+inline constexpr OUStringLiteral CHEVRON = u"sfx2/res/chevron.png";
 
-#define RID_UPDATE_AVAILABLE_16      "extensions/res/update/ui/onlineupdate_16.png"
-#define RID_UPDATE_AVAILABLE_26      "extensions/res/update/ui/onlineupdate_26.png"
+inline constexpr OUStringLiteral RID_UPDATE_AVAILABLE_16 = u"extensions/res/update/ui/onlineupdate_16.png";
+inline constexpr OUStringLiteral RID_UPDATE_AVAILABLE_26 = u"extensions/res/update/ui/onlineupdate_26.png";
 
 #endif
 
diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
index 3387545f5103..6a233e09ae16 100644
--- a/vcl/inc/graphic/UnoGraphicDescriptor.hxx
+++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
@@ -51,7 +51,7 @@
 #define MIMETYPE_EMF        "image/x-emf"
 #define MIMETYPE_SVG        "image/svg+xml"
 #define MIMETYPE_PDF        "application/pdf"
-#define MIMETYPE_VCLGRAPHIC "image/x-vclgraphic"
+inline constexpr OUStringLiteral MIMETYPE_VCLGRAPHIC = u"image/x-vclgraphic";
 
 namespace comphelper { class PropertySetInfo; }
 namespace com::sun::star::io { class XInputStream; }