Extended loplugin:ostr: Rewrite some O[U]StringLiteral -> O[U]String

...in include files.  This is a mix of automatic rewriting in include files and
manual fixups (mostly addressing loplugin:redundantfcast) in source files that
include those.

Change-Id: I1f3cc1e67b9cabd2e9d61a4d9e9a01e587ea35cc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/158337
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>

8 files changed, 200 insertions, 200 deletions

diff --git a/vcl/inc/IconThemeSelector.hxx b/vcl/inc/IconThemeSelector.hxx
index 0bfbf2034858..65bfdf006364 100644
--- a/vcl/inc/IconThemeSelector.hxx
+++ b/vcl/inc/IconThemeSelector.hxx
@@ -78,8 +78,8 @@ private:
     ReturnFallback(const std::vector<IconThemeInfo>& installedThemes);
 
     /** The name of the icon themes which are used as fallbacks */
-    static constexpr OUStringLiteral FALLBACK_LIGHT_ICON_THEME_ID = u"colibre";
-    static constexpr OUStringLiteral FALLBACK_DARK_ICON_THEME_ID = u"colibre_dark";
+    static constexpr OUString FALLBACK_LIGHT_ICON_THEME_ID = u"colibre"_ustr;
+    static constexpr OUString FALLBACK_DARK_ICON_THEME_ID = u"colibre_dark"_ustr;
 
     static OUString
     GetIconThemeForDesktopEnvironment(const OUString& desktopEnvironment, bool bPreferDarkIconTheme);
diff --git a/vcl/inc/bitmaps.hlst b/vcl/inc/bitmaps.hlst
index a9a0898716ee..f4ccaaa46a2e 100644
--- a/vcl/inc/bitmaps.hlst
+++ b/vcl/inc/bitmaps.hlst
@@ -10,91 +10,91 @@
 
 #include <rtl/ustring.hxx>
 
-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";
+inline constexpr OUString SV_RESID_BITMAP_CHECK1 = u"vcl/res/check1.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK2 = u"vcl/res/check2.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK3 = u"vcl/res/check3.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK4 = u"vcl/res/check4.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK5 = u"vcl/res/check5.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK6 = u"vcl/res/check6.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK7 = u"vcl/res/check7.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK8 = u"vcl/res/check8.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECK9 = u"vcl/res/check9.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO1 = u"vcl/res/checkmono1.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO2 = u"vcl/res/checkmono2.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO3 = u"vcl/res/checkmono3.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO4 = u"vcl/res/checkmono4.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO5 = u"vcl/res/checkmono5.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO6 = u"vcl/res/checkmono6.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO7 = u"vcl/res/checkmono7.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO8 = u"vcl/res/checkmono8.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CHECKMONO9 = u"vcl/res/checkmono9.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO1 = u"vcl/res/radio1.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO2 = u"vcl/res/radio2.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO3 = u"vcl/res/radio3.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO4 = u"vcl/res/radio4.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO5 = u"vcl/res/radio5.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIO6 = u"vcl/res/radio6.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO1 = u"vcl/res/radiomono1.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO2 = u"vcl/res/radiomono2.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO3 = u"vcl/res/radiomono3.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO4 = u"vcl/res/radiomono4.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO5 = u"vcl/res/radiomono5.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_RADIOMONO6 = u"vcl/res/radiomono6.png"_ustr;
+
+inline constexpr OUString SV_RESID_BITMAP_ERRORBOX = u"vcl/res/errorbox.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_QUERYBOX = u"vcl/res/querybox.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_WARNINGBOX = u"vcl/res/warningbox.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_INFOBOX = u"vcl/res/infobox.png"_ustr;
+
+inline constexpr OUString SV_RESID_BITMAP_SCROLLMSK = u"vcl/res/scrmsk.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_WHEELVH = u"vcl/res/wheelvh.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_WHEELV = u"vcl/res/wheelv.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_WHEELH = u"vcl/res/wheelh.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_SCROLLVH = u"vcl/res/scrollvh.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_SCROLLV = u"vcl/res/scrollv.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_SCROLLH = u"vcl/res/scrollh.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_CLOSEDOC = u"vcl/res/closedoc.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_REFRESH = u"res/reload.png"_ustr;
+inline constexpr OUString SV_RESID_BITMAP_NOTEBOOKBAR = u"res/notebookbar.png"_ustr;
+
+inline constexpr OUString SV_DISCLOSURE_PLUS = u"res/plus.png"_ustr;
+inline constexpr OUString SV_DISCLOSURE_MINUS = u"res/minus.png"_ustr;
+
+inline constexpr OUString SV_PRINT_COLLATE_BMP = u"vcl/res/collate.png"_ustr;
+inline constexpr OUString SV_PRINT_NOCOLLATE_BMP = u"vcl/res/ncollate.png"_ustr;
+
+inline constexpr OUString MAINAPP_48_8 = u"res/mainapp_48_8.png"_ustr;
+inline constexpr OUString ODT_48_8 = u"res/odt_48_8.png"_ustr;
+inline constexpr OUString OTT_48_8 = u"res/ott_48_8.png"_ustr;
+inline constexpr OUString ODS_48_8 = u"res/ods_48_8.png"_ustr;
+inline constexpr OUString OTS_48_8 = u"res/ots_48_8.png"_ustr;
+inline constexpr OUString ODG_48_8 = u"res/odg_48_8.png"_ustr;
+inline constexpr OUString ODP_48_8 = u"res/odp_48_8.png"_ustr;
+inline constexpr OUString ODM_48_8 = u"res/odm_48_8.png"_ustr;
+inline constexpr OUString ODB_48_8 = u"res/odb_48_8.png"_ustr;
+inline constexpr OUString ODF_48_8 = u"res/odf_48_8.png"_ustr;
+
+inline constexpr OUString MAINAPP_32_8 = u"res/mainapp_32_8.png"_ustr;
+inline constexpr OUString ODT_32_8 = u"res/odt_32_8.png"_ustr;
+inline constexpr OUString OTT_32_8 = u"res/ott_32_8.png"_ustr;
+inline constexpr OUString ODS_32_8 = u"res/ods_32_8.png"_ustr;
+inline constexpr OUString OTS_32_8 = u"res/ots_32_8.png"_ustr;
+inline constexpr OUString ODG_32_8 = u"res/odg_32_8.png"_ustr;
+inline constexpr OUString ODP_32_8 = u"res/odp_32_8.png"_ustr;
+inline constexpr OUString ODM_32_8 = u"res/odm_32_8.png"_ustr;
+inline constexpr OUString ODB_32_8 = u"res/odb_32_8.png"_ustr;
+inline constexpr OUString ODF_32_8 = u"res/odf_32_8.png"_ustr;
+
+inline constexpr OUString MAINAPP_16_8 = u"res/mainapp_16_8.png"_ustr;
+inline constexpr OUString ODT_16_8 = u"res/odt_16_8.png"_ustr;
+inline constexpr OUString OTT_16_8 = u"res/ott_16_8.png"_ustr;
+inline constexpr OUString ODS_16_8 = u"res/ods_16_8.png"_ustr;
+inline constexpr OUString OTS_16_8 = u"res/ots_16_8.png"_ustr;
+inline constexpr OUString ODG_16_8 = u"res/odg_16_8.png"_ustr;
+inline constexpr OUString ODP_16_8 = u"res/odp_16_8.png"_ustr;
+inline constexpr OUString ODM_16_8 = u"res/odm_16_8.png"_ustr;
+inline constexpr OUString ODB_16_8 = u"res/odb_16_8.png"_ustr;
+inline constexpr OUString ODF_16_8 = u"res/odf_16_8.png"_ustr;
 
 //start, Throbber::getDefaultImageURLs constructs these dynamically (not unused)
 #define SPINNER_16_01                                "vcl/res/spinner-16-01.png"
@@ -131,85 +131,85 @@ inline constexpr OUStringLiteral ODF_16_8 = u"res/odf_16_8.png";
 #define SPINNER_64_12                                "vcl/res/spinner-64-12.png"
 //end, Throbber::getDefaultImageURLs
 
-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 IMG_OPEN = u"cmd/sc_open.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";
+inline constexpr OUString IMG_WARN = u"dbaccess/res/exwarning.png"_ustr;
+inline constexpr OUString IMG_ERROR = u"dbaccess/res/exerror.png"_ustr;
+inline constexpr OUString IMG_INFO = u"dbaccess/res/exinfo.png"_ustr;
+inline constexpr OUString IMG_ADD = u"extensions/res/scanner/plus.png"_ustr;
+inline constexpr OUString IMG_REMOVE = u"extensions/res/scanner/minus.png"_ustr;
+inline constexpr OUString IMG_COPY = u"cmd/sc_copy.png"_ustr;
+inline constexpr OUString IMG_PASTE = u"cmd/sc_paste.png"_ustr;
+inline constexpr OUString IMG_MENU = u"sfx2/res/menu.png"_ustr;
+inline constexpr OUString IMG_CALENDAR = u"sc/res/date.png"_ustr;
+inline constexpr OUString IMG_OPEN = u"cmd/sc_open.png"_ustr;
+
+inline constexpr OUString RID_BMP_TREENODE_COLLAPSED = u"res/plus.png"_ustr;
+inline constexpr OUString RID_BMP_TREENODE_EXPANDED = u"res/minus.png"_ustr;
+
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_E = u"vcl/res/autoscroll_e.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_N = u"vcl/res/autoscroll_n.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_NE = u"vcl/res/autoscroll_ne.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_NS = u"vcl/res/autoscroll_ns.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_NSWE = u"vcl/res/autoscroll_nswe.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_NW = u"vcl/res/autoscroll_nw.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_S = u"vcl/res/autoscroll_s.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_SE = u"vcl/res/autoscroll_se.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_SW = u"vcl/res/autoscroll_sw.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_W = u"vcl/res/autoscroll_w.png"_ustr;
+inline constexpr OUString RID_CURSOR_AUTOSCROLL_WE = u"vcl/res/autoscroll_we.png"_ustr;
+inline constexpr OUString RID_CURSOR_CHAIN = u"vcl/res/chain.png"_ustr;
+inline constexpr OUString RID_CURSOR_CHAIN_NOT_ALLOWED = u"vcl/res/chain_not_allowed.png"_ustr;
+inline constexpr OUString RID_CURSOR_CHART = u"vcl/res/chart.png"_ustr;
+inline constexpr OUString RID_CURSOR_COPY_DATA = u"vcl/res/copy_data.png"_ustr;
+inline constexpr OUString RID_CURSOR_COPY_DATA_LINK = u"vcl/res/copy_data_link.png"_ustr;
+inline constexpr OUString RID_CURSOR_COPY_FILE = u"vcl/res/copy_file.png"_ustr;
+inline constexpr OUString RID_CURSOR_COPY_FILES = u"vcl/res/copy_files.png"_ustr;
+inline constexpr OUString RID_CURSOR_COPY_FILE_LINK = u"vcl/res/copy_file_link.png"_ustr;
+inline constexpr OUString RID_CURSOR_CROOK = u"vcl/res/crook.png"_ustr;
+inline constexpr OUString RID_CURSOR_CROP = u"vcl/res/crop.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_ARC = u"vcl/res/draw_arc.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_BEZIER = u"vcl/res/draw_bezier.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_CAPTION = u"vcl/res/draw_caption.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_CIRCLE_CUT = u"vcl/res/draw_circle_cut.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_CONNECT = u"vcl/res/draw_connect.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_ELLIPSE = u"vcl/res/draw_ellipse.png"_ustr;
+inline constexpr OUString RID_CURSOR_DETECTIVE = u"vcl/res/detective.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_FREEHAND = u"vcl/res/draw_freehand.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_LINE = u"vcl/res/draw_line.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_PIE = u"vcl/res/draw_pie.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_POLYGON = u"vcl/res/draw_polygon.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_RECT = u"vcl/res/draw_rect.png"_ustr;
+inline constexpr OUString RID_CURSOR_DRAW_TEXT = u"vcl/res/draw_text.png"_ustr;
+inline constexpr OUString RID_CURSOR_FILL = u"vcl/res/fill.png"_ustr;
 #define RID_CURSOR_HELP              "vcl/res/help.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";
-inline constexpr OUStringLiteral RID_CURSOR_NOT_ALLOWED = u"vcl/res/not_allowed.png";
-inline constexpr OUStringLiteral RID_CURSOR_NULL = u"vcl/res/null.png";
+inline constexpr OUString RID_CURSOR_H_SHEAR = u"vcl/res/h_shear.png"_ustr;
+inline constexpr OUString RID_CURSOR_LINK_DATA = u"vcl/res/link_data.png"_ustr;
+inline constexpr OUString RID_CURSOR_LINK_FILE = u"vcl/res/link_file.png"_ustr;
+inline constexpr OUString RID_CURSOR_MAGNIFY = u"vcl/res/magnify.png"_ustr;
+inline constexpr OUString RID_CURSOR_MIRROR = u"vcl/res/mirror.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_BEZIER_WEIGHT = u"vcl/res/move_bezier_weight.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_DATA = u"vcl/res/move_data.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_DATA_LINK = u"vcl/res/move_data_link.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_FILE = u"vcl/res/move_file.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_FILES = u"vcl/res/move_files.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_FILE_LINK = u"vcl/res/move_file_link.png"_ustr;
+inline constexpr OUString RID_CURSOR_MOVE_POINT = u"vcl/res/move_point.png"_ustr;
+inline constexpr OUString RID_CURSOR_NOT_ALLOWED = u"vcl/res/not_allowed.png"_ustr;
+inline constexpr OUString RID_CURSOR_NULL = u"vcl/res/null.png"_ustr;
 #define RID_CURSOR_PEN               "vcl/res/pen.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";
+inline constexpr OUString RID_CURSOR_PIVOT_COLUMN = u"vcl/res/pivot_column.png"_ustr;
+inline constexpr OUString RID_CURSOR_PIVOT_DELETE = u"vcl/res/pivot_delete.png"_ustr;
+inline constexpr OUString RID_CURSOR_PIVOT_FIELD = u"vcl/res/pivot_field.png"_ustr;
+inline constexpr OUString RID_CURSOR_PIVOT_ROW = u"vcl/res/pivot_row.png"_ustr;
+inline constexpr OUString RID_CURSOR_ROTATE = u"vcl/res/rotate.png"_ustr;
+inline constexpr OUString RID_CURSOR_TAB_SELECT_E = u"vcl/res/tab_select_e.png"_ustr;
+inline constexpr OUString RID_CURSOR_TAB_SELECT_S = u"vcl/res/tab_select_s.png"_ustr;
+inline constexpr OUString RID_CURSOR_TAB_SELECT_SE = u"vcl/res/tab_select_se.png"_ustr;
+inline constexpr OUString RID_CURSOR_TAB_SELECT_SW = u"vcl/res/tab_select_sw.png"_ustr;
+inline constexpr OUString RID_CURSOR_TAB_SELECT_W = u"vcl/res/tab_select_w.png"_ustr;
+inline constexpr OUString RID_CURSOR_V_SHEAR = u"vcl/res/v_shear.png"_ustr;
+inline constexpr OUString RID_CURSOR_TEXT_VERTICAL = u"vcl/res/text_vertical.png"_ustr;
+inline constexpr OUString RID_CURSOR_HIDE_WHITESPACE = u"vcl/res/hide_whitespace.png"_ustr;
+inline constexpr OUString RID_CURSOR_SHOW_WHITESPACE = u"vcl/res/show_whitespace.png"_ustr;
 #define RID_CURSOR_WAIT              "vcl/res/wait.png"
 #define RID_CURSOR_NWSIZE            "vcl/res/nwsize.png"
 #define RID_CURSOR_NESIZE            "vcl/res/nesize.png"
@@ -219,11 +219,11 @@ inline constexpr OUStringLiteral RID_CURSOR_SHOW_WHITESPACE = u"vcl/res/show_whi
 #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"
-inline constexpr OUStringLiteral RID_CURSOR_FATCROSS = u"vcl/res/fatcross.png";
+inline constexpr OUString RID_CURSOR_FATCROSS = u"vcl/res/fatcross.png"_ustr;
 
-inline constexpr OUStringLiteral CHEVRON = u"sfx2/res/chevron.png";
+inline constexpr OUString CHEVRON = u"sfx2/res/chevron.png"_ustr;
 
-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";
+inline constexpr OUString RID_UPDATE_AVAILABLE_16 = u"extensions/res/update/ui/onlineupdate_16.png"_ustr;
+inline constexpr OUString RID_UPDATE_AVAILABLE_26 = u"extensions/res/update/ui/onlineupdate_26.png"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/vcl/inc/graphic/UnoGraphicDescriptor.hxx b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
index 22ca048fc672..2adc19dac059 100644
--- a/vcl/inc/graphic/UnoGraphicDescriptor.hxx
+++ b/vcl/inc/graphic/UnoGraphicDescriptor.hxx
@@ -26,32 +26,32 @@
 #include <comphelper/propertysetinfo.hxx>
 #include <vcl/graph.hxx>
 
-inline constexpr OUStringLiteral MIMETYPE_BMP = u"image/x-MS-bmp";
-inline constexpr OUStringLiteral MIMETYPE_GIF = u"image/gif";
-inline constexpr OUStringLiteral MIMETYPE_JPG = u"image/jpeg";
-inline constexpr OUStringLiteral MIMETYPE_PCD = u"image/x-photo-cd";
-inline constexpr OUStringLiteral MIMETYPE_PCX = u"image/x-pcx";
-inline constexpr OUStringLiteral MIMETYPE_PNG = u"image/png";
-inline constexpr OUStringLiteral MIMETYPE_TIF = u"image/tiff";
-inline constexpr OUStringLiteral MIMETYPE_XBM = u"image/x-xbitmap";
-inline constexpr OUStringLiteral MIMETYPE_XPM = u"image/x-xpixmap";
-inline constexpr OUStringLiteral MIMETYPE_PBM = u"image/x-portable-bitmap";
-inline constexpr OUStringLiteral MIMETYPE_PGM = u"image/x-portable-graymap";
-inline constexpr OUStringLiteral MIMETYPE_PPM = u"image/x-portable-pixmap";
-inline constexpr OUStringLiteral MIMETYPE_RAS = u"image/x-cmu-raster";
-inline constexpr OUStringLiteral MIMETYPE_TGA = u"image/x-targa";
-inline constexpr OUStringLiteral MIMETYPE_PSD = u"image/vnd.adobe.photoshop";
-inline constexpr OUStringLiteral MIMETYPE_EPS = u"image/x-eps";
-inline constexpr OUStringLiteral MIMETYPE_DXF = u"image/vnd.dxf";
-inline constexpr OUStringLiteral MIMETYPE_MET = u"image/x-met";
-inline constexpr OUStringLiteral MIMETYPE_PCT = u"image/x-pict";
-inline constexpr OUStringLiteral MIMETYPE_SVM = u"image/x-svm";
-inline constexpr OUStringLiteral MIMETYPE_WMF = u"image/x-wmf";
-inline constexpr OUStringLiteral MIMETYPE_EMF = u"image/x-emf";
-inline constexpr OUStringLiteral MIMETYPE_SVG = u"image/svg+xml";
-inline constexpr OUStringLiteral MIMETYPE_PDF = u"application/pdf";
-inline constexpr OUStringLiteral MIMETYPE_WEBP = u"image/webp";
-inline constexpr OUStringLiteral MIMETYPE_VCLGRAPHIC = u"image/x-vclgraphic";
+inline constexpr OUString MIMETYPE_BMP = u"image/x-MS-bmp"_ustr;
+inline constexpr OUString MIMETYPE_GIF = u"image/gif"_ustr;
+inline constexpr OUString MIMETYPE_JPG = u"image/jpeg"_ustr;
+inline constexpr OUString MIMETYPE_PCD = u"image/x-photo-cd"_ustr;
+inline constexpr OUString MIMETYPE_PCX = u"image/x-pcx"_ustr;
+inline constexpr OUString MIMETYPE_PNG = u"image/png"_ustr;
+inline constexpr OUString MIMETYPE_TIF = u"image/tiff"_ustr;
+inline constexpr OUString MIMETYPE_XBM = u"image/x-xbitmap"_ustr;
+inline constexpr OUString MIMETYPE_XPM = u"image/x-xpixmap"_ustr;
+inline constexpr OUString MIMETYPE_PBM = u"image/x-portable-bitmap"_ustr;
+inline constexpr OUString MIMETYPE_PGM = u"image/x-portable-graymap"_ustr;
+inline constexpr OUString MIMETYPE_PPM = u"image/x-portable-pixmap"_ustr;
+inline constexpr OUString MIMETYPE_RAS = u"image/x-cmu-raster"_ustr;
+inline constexpr OUString MIMETYPE_TGA = u"image/x-targa"_ustr;
+inline constexpr OUString MIMETYPE_PSD = u"image/vnd.adobe.photoshop"_ustr;
+inline constexpr OUString MIMETYPE_EPS = u"image/x-eps"_ustr;
+inline constexpr OUString MIMETYPE_DXF = u"image/vnd.dxf"_ustr;
+inline constexpr OUString MIMETYPE_MET = u"image/x-met"_ustr;
+inline constexpr OUString MIMETYPE_PCT = u"image/x-pict"_ustr;
+inline constexpr OUString MIMETYPE_SVM = u"image/x-svm"_ustr;
+inline constexpr OUString MIMETYPE_WMF = u"image/x-wmf"_ustr;
+inline constexpr OUString MIMETYPE_EMF = u"image/x-emf"_ustr;
+inline constexpr OUString MIMETYPE_SVG = u"image/svg+xml"_ustr;
+inline constexpr OUString MIMETYPE_PDF = u"application/pdf"_ustr;
+inline constexpr OUString MIMETYPE_WEBP = u"image/webp"_ustr;
+inline constexpr OUString MIMETYPE_VCLGRAPHIC = u"image/x-vclgraphic"_ustr;
 
 namespace comphelper { class PropertySetInfo; }
 namespace com::sun::star::io { class XInputStream; }
diff --git a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
index 72ee344b1437..7e053ffd1e4d 100644
--- a/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
+++ b/vcl/qa/cppunit/app/test_IconThemeSelector.cxx
@@ -148,7 +148,7 @@ IconThemeSelectorTest::FallbackThemeIsReturnedForEmptyInput()
     vcl::IconThemeSelector s;
     OUString selected = s.SelectIconTheme(std::vector<vcl::IconThemeInfo>(), "colibre");
     CPPUNIT_ASSERT_EQUAL_MESSAGE("fallback is returned for empty input",
-            OUString(vcl::IconThemeSelector::FALLBACK_LIGHT_ICON_THEME_ID), selected);
+            vcl::IconThemeSelector::FALLBACK_LIGHT_ICON_THEME_ID, selected);
 }
 
 void
diff --git a/vcl/source/app/IconThemeSelector.cxx b/vcl/source/app/IconThemeSelector.cxx
index 15eb4b7768fc..eb79752beb47 100644
--- a/vcl/source/app/IconThemeSelector.cxx
+++ b/vcl/source/app/IconThemeSelector.cxx
@@ -127,8 +127,8 @@ IconThemeSelector::SelectIconTheme(
 {
     if (mUseHighContrastTheme) {
         const Color aCol(Application::GetSettings().GetStyleSettings().GetWindowColor());
-        const OUString name(aCol.IsDark() ? OUString(IconThemeInfo::HIGH_CONTRAST_ID_DARK)
-                                          : OUString(IconThemeInfo::HIGH_CONTRAST_ID_BRIGHT));
+        const OUString name(aCol.IsDark() ? IconThemeInfo::HIGH_CONTRAST_ID_DARK
+                                          : IconThemeInfo::HIGH_CONTRAST_ID_BRIGHT);
         if (icon_theme_is_in_installed_themes(name, installedThemes)) {
             return name;
         }
diff --git a/vcl/source/graphic/UnoGraphicDescriptor.cxx b/vcl/source/graphic/UnoGraphicDescriptor.cxx
index 57b8e5db6210..e83ac98959f8 100644
--- a/vcl/source/graphic/UnoGraphicDescriptor.cxx
+++ b/vcl/source/graphic/UnoGraphicDescriptor.cxx
@@ -292,7 +292,7 @@ void GraphicDescriptor::_getPropertyValues( const comphelper::PropertyMapEntry**
                             case GfxLinkType::NativeJpg: aMimeType = MIMETYPE_JPG; break;
                             case GfxLinkType::NativePng: aMimeType = MIMETYPE_PNG; break;
                             case GfxLinkType::NativeTif: aMimeType = MIMETYPE_TIF; break;
-                            case GfxLinkType::NativeWmf: aMimeType = aLink.IsEMF() ? OUString(MIMETYPE_EMF) : OUString(MIMETYPE_WMF); break;
+                            case GfxLinkType::NativeWmf: aMimeType = aLink.IsEMF() ? MIMETYPE_EMF : MIMETYPE_WMF; break;
                             case GfxLinkType::NativeMet: aMimeType = MIMETYPE_MET; break;
                             case GfxLinkType::NativePct: aMimeType = MIMETYPE_PCT; break;
                             case GfxLinkType::NativeWebp: aMimeType = MIMETYPE_WEBP; break;
diff --git a/vcl/source/window/printdlg.cxx b/vcl/source/window/printdlg.cxx
index 9fcb055633d8..da0c481655dd 100644
--- a/vcl/source/window/printdlg.cxx
+++ b/vcl/source/window/printdlg.cxx
@@ -1046,7 +1046,7 @@ void PrintDialog::checkControlDependencies()
         mxSingleJobsBox->set_sensitive( false );
     }
 
-    OUString aImg(mxCollateBox->get_active() ? OUString(SV_PRINT_COLLATE_BMP) : OUString(SV_PRINT_NOCOLLATE_BMP));
+    OUString aImg(mxCollateBox->get_active() ? SV_PRINT_COLLATE_BMP : SV_PRINT_NOCOLLATE_BMP);
 
     mxCollateImage->set_from_icon_name(aImg);
 
diff --git a/vcl/unx/generic/dtrans/X11_clipboard.hxx b/vcl/unx/generic/dtrans/X11_clipboard.hxx
index 6a2ab732a631..4fd492154c74 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>
 
-inline constexpr OUStringLiteral X11_CLIPBOARD_IMPLEMENTATION_NAME  = u"com.sun.star.datatransfer.X11ClipboardSupport";
+inline constexpr OUString X11_CLIPBOARD_IMPLEMENTATION_NAME  = u"com.sun.star.datatransfer.X11ClipboardSupport"_ustr;
 
 namespace x11 {