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>

2 files changed, 115 insertions, 115 deletions

diff --git a/svtools/inc/bitmaps.hlst b/svtools/inc/bitmaps.hlst
index 5aa57db637ed..0513302d0544 100644
--- a/svtools/inc/bitmaps.hlst
+++ b/svtools/inc/bitmaps.hlst
@@ -9,120 +9,120 @@
 
 #pragma once
 
-inline constexpr OUStringLiteral BMP_IMPRESS_SC = u"res/sx03123.png";
-inline constexpr OUStringLiteral BMP_BITMAP_SC = u"res/sx03125.png";
-inline constexpr OUStringLiteral BMP_CALC_SC = u"res/sx03126.png";
-inline constexpr OUStringLiteral BMP_CALCTEMPLATE_SC = u"res/sx03127.png";
-inline constexpr OUStringLiteral BMP_DATABASE_SC = u"res/sx03129.png";
-inline constexpr OUStringLiteral BMP_IMPRESSTEMPLATE_SC = u"res/sx03130.png";
-inline constexpr OUStringLiteral BMP_GIF_SC = u"res/sx03137.png";
-inline constexpr OUStringLiteral BMP_HTML_SC = u"res/sx03139.png";
-inline constexpr OUStringLiteral BMP_JPG_SC = u"res/sx03140.png";
-inline constexpr OUStringLiteral BMP_MATH_SC = u"res/sx03144.png";
-inline constexpr OUStringLiteral BMP_MATHTEMPLATE_SC = u"res/sx03145.png";
-inline constexpr OUStringLiteral BMP_FILE_SC = u"res/sx03150.png";
-inline constexpr OUStringLiteral BMP_PCD_SC = u"res/sx03152.png";
-inline constexpr OUStringLiteral BMP_PCT_SC = u"res/sx03153.png";
-inline constexpr OUStringLiteral BMP_PCX_SC = u"res/sx03154.png";
-inline constexpr OUStringLiteral BMP_SIM_SC = u"res/sx03155.png";
-inline constexpr OUStringLiteral BMP_TEXTFILE_SC = u"res/sx03156.png";
-inline constexpr OUStringLiteral BMP_TIFF_SC = u"res/sx03158.png";
-inline constexpr OUStringLiteral BMP_WMF_SC = u"res/sx03160.png";
-inline constexpr OUStringLiteral BMP_WRITER_SC = u"res/sx03162.png";
-inline constexpr OUStringLiteral BMP_WRITERTEMPLATE_SC = u"res/sx03163.png";
-inline constexpr OUStringLiteral BMP_FIXEDDEV_SC = u"res/sx03164.png";
-inline constexpr OUStringLiteral BMP_REMOVABLEDEV_SC = u"res/sx03165.png";
-inline constexpr OUStringLiteral BMP_CDROMDEV_SC = u"res/sx03166.png";
-inline constexpr OUStringLiteral BMP_NETWORKDEV_SC = u"res/sx03167.png";
-inline constexpr OUStringLiteral BMP_TABLE_SC = u"res/sx03188.png";
-inline constexpr OUStringLiteral BMP_DXF_SC = u"res/sx03217.png";
-inline constexpr OUStringLiteral BMP_MET_SC = u"res/sx03218.png";
-inline constexpr OUStringLiteral BMP_PNG_SC = u"res/sx03219.png";
-inline constexpr OUStringLiteral BMP_SVM_SC = u"res/sx03222.png";
-inline constexpr OUStringLiteral BMP_WEBP_SC = u"res/sx03223.png";
-inline constexpr OUStringLiteral BMP_GLOBAL_DOC_SC = u"res/sx03226.png";
-inline constexpr OUStringLiteral BMP_DRAW_SC = u"res/sx03227.png";
-inline constexpr OUStringLiteral BMP_DRAWTEMPLATE_SC = u"res/sx03228.png";
-inline constexpr OUStringLiteral BMP_OO_DATABASE_DOC_SC = u"res/sx03245.png";
-inline constexpr OUStringLiteral BMP_OO_DRAW_DOC_SC = u"res/sx03246.png";
-inline constexpr OUStringLiteral BMP_OO_MATH_DOC_SC = u"res/sx03247.png";
-inline constexpr OUStringLiteral BMP_OO_GLOBAL_DOC_SC = u"res/sx03248.png";
-inline constexpr OUStringLiteral BMP_OO_IMPRESS_DOC_SC = u"res/sx03249.png";
-inline constexpr OUStringLiteral BMP_OO_CALC_DOC_SC = u"res/sx03250.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_DOC_SC = u"res/sx03251.png";
-inline constexpr OUStringLiteral BMP_OO_DRAW_TEMPLATE_SC = u"res/sx03252.png";
-inline constexpr OUStringLiteral BMP_OO_IMPRESS_TEMPLATE_SC = u"res/sx03253.png";
-inline constexpr OUStringLiteral BMP_OO_CALC_TEMPLATE_SC = u"res/sx03254.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_TEMPLATE_SC = u"res/sx03255.png";
-inline constexpr OUStringLiteral BMP_EXTENSION_SC = u"res/sx03256.png";
-inline constexpr OUStringLiteral BMP_IMPRESS_LC = u"res/lx03123.png";
-inline constexpr OUStringLiteral BMP_BITMAP_LC = u"res/lx03125.png";
-inline constexpr OUStringLiteral BMP_CALC_LC = u"res/lx03126.png";
-inline constexpr OUStringLiteral BMP_CALCTEMPLATE_LC = u"res/lx03127.png";
-inline constexpr OUStringLiteral BMP_DATABASE_LC = u"res/lx03129.png";
-inline constexpr OUStringLiteral BMP_IMPRESSTEMPLATE_LC = u"res/lx03130.png";
-inline constexpr OUStringLiteral BMP_GIF_LC = u"res/lx03137.png";
-inline constexpr OUStringLiteral BMP_HTML_LC = u"res/lx03139.png";
-inline constexpr OUStringLiteral BMP_JPG_LC = u"res/lx03140.png";
-inline constexpr OUStringLiteral BMP_MATH_LC = u"res/lx03144.png";
-inline constexpr OUStringLiteral BMP_MATHTEMPLATE_LC = u"res/lx03145.png";
-inline constexpr OUStringLiteral BMP_FILE_LC = u"res/lx03150.png";
-inline constexpr OUStringLiteral BMP_PCD_LC = u"res/lx03152.png";
-inline constexpr OUStringLiteral BMP_PCT_LC = u"res/lx03153.png";
-inline constexpr OUStringLiteral BMP_PCX_LC = u"res/lx03154.png";
-inline constexpr OUStringLiteral BMP_SIM_LC = u"res/lx03155.png";
-inline constexpr OUStringLiteral BMP_TEXTFILE_LC = u"res/lx03156.png";
-inline constexpr OUStringLiteral BMP_TIFF_LC = u"res/lx03158.png";
-inline constexpr OUStringLiteral BMP_WMF_LC = u"res/lx03160.png";
-inline constexpr OUStringLiteral BMP_WRITER_LC = u"res/lx03162.png";
-inline constexpr OUStringLiteral BMP_WRITERTEMPLATE_LC = u"res/lx03163.png";
-inline constexpr OUStringLiteral BMP_FIXEDDEV_LC = u"res/lx03164.png";
-inline constexpr OUStringLiteral BMP_REMOVABLEDEV_LC = u"res/lx03165.png";
-inline constexpr OUStringLiteral BMP_CDROMDEV_LC = u"res/lx03166.png";
-inline constexpr OUStringLiteral BMP_NETWORKDEV_LC = u"res/lx03167.png";
-inline constexpr OUStringLiteral BMP_TABLE_LC = u"res/lx03188.png";
-inline constexpr OUStringLiteral BMP_FOLDER_LC = u"res/lx03189.png";
-inline constexpr OUStringLiteral BMP_DXF_LC = u"res/lx03217.png";
-inline constexpr OUStringLiteral BMP_MET_LC = u"res/lx03218.png";
-inline constexpr OUStringLiteral BMP_PNG_LC = u"res/lx03219.png";
-inline constexpr OUStringLiteral BMP_SVM_LC = u"res/lx03222.png";
-inline constexpr OUStringLiteral BMP_WEBP_LC = u"res/lx03223.png";
-inline constexpr OUStringLiteral BMP_GLOBAL_DOC_LC = u"res/lx03226.png";
-inline constexpr OUStringLiteral BMP_DRAW_LC = u"res/lx03227.png";
-inline constexpr OUStringLiteral BMP_DRAWTEMPLATE_LC = u"res/lx03228.png";
-inline constexpr OUStringLiteral BMP_OO_DATABASE_DOC_LC = u"res/lx03245.png";
-inline constexpr OUStringLiteral BMP_OO_DRAW_DOC_LC = u"res/lx03246.png";
-inline constexpr OUStringLiteral BMP_OO_MATH_DOC_LC = u"res/lx03247.png";
-inline constexpr OUStringLiteral BMP_OO_GLOBAL_DOC_LC = u"res/lx03248.png";
-inline constexpr OUStringLiteral BMP_OO_IMPRESS_DOC_LC = u"res/lx03249.png";
-inline constexpr OUStringLiteral BMP_OO_CALC_DOC_LC = u"res/lx03250.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_DOC_LC = u"res/lx03251.png";
-inline constexpr OUStringLiteral BMP_OO_DRAW_TEMPLATE_LC = u"res/lx03252.png";
-inline constexpr OUStringLiteral BMP_OO_IMPRESS_TEMPLATE_LC = u"res/lx03253.png";
-inline constexpr OUStringLiteral BMP_OO_CALC_TEMPLATE_LC = u"res/lx03254.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_TEMPLATE_LC = u"res/lx03255.png";
-inline constexpr OUStringLiteral BMP_EXTENSION_LC = u"res/lx03256.png";
-inline constexpr OUStringLiteral BMP_HTML_32 = u"res/lx03139_32.png";
-inline constexpr OUStringLiteral BMP_OO_DATABASE_DOC_32 = u"res/lx03245_32.png";
-inline constexpr OUStringLiteral BMP_OO_DRAW_DOC_32 = u"res/lx03246_32.png";
-inline constexpr OUStringLiteral BMP_OO_MATH_DOC_32 = u"res/lx03247_32.png";
-inline constexpr OUStringLiteral BMP_OO_GLOBAL_DOC_32 = u"res/lx03248_32.png";
-inline constexpr OUStringLiteral BMP_OO_IMPRESS_DOC_32 = u"res/lx03249_32.png";
-inline constexpr OUStringLiteral BMP_OO_CALC_DOC_32 = u"res/lx03250_32.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_DOC_32 = u"res/lx03251_32.png";
-inline constexpr OUStringLiteral BMP_OO_WRITER_TEMPLATE_32 = u"res/lx03255_32.png";
-inline constexpr OUStringLiteral BMP_PLUGIN = u"res/plugin.png";
-inline constexpr OUStringLiteral RID_BMP_FOLDER = u"svtools/res/folder.png";
-inline constexpr OUStringLiteral BMP_CURRENT = u"svtools/res/ed01.png";
-inline constexpr OUStringLiteral BMP_MODIFIED = u"svtools/res/ed02.png";
-inline constexpr OUStringLiteral BMP_NEW = u"svtools/res/ed03.png";
-inline constexpr OUStringLiteral BMP_DELETED = u"svtools/res/ed04.png";
-inline constexpr OUStringLiteral BMP_CURRENTNEW = u"svtools/res/ed05.png";
-inline constexpr OUStringLiteral BMP_PRIMARYKEY = u"svtools/res/ed06.png";
-inline constexpr OUStringLiteral BMP_CURRENT_PRIMARYKEY = u"svtools/res/ed07.png";
-inline constexpr OUStringLiteral BMP_FILTER = u"svtools/res/ed08.png";
-inline constexpr OUStringLiteral BMP_HEADERFOOTER = u"svtools/res/ed09.png";
+inline constexpr OUString BMP_IMPRESS_SC = u"res/sx03123.png"_ustr;
+inline constexpr OUString BMP_BITMAP_SC = u"res/sx03125.png"_ustr;
+inline constexpr OUString BMP_CALC_SC = u"res/sx03126.png"_ustr;
+inline constexpr OUString BMP_CALCTEMPLATE_SC = u"res/sx03127.png"_ustr;
+inline constexpr OUString BMP_DATABASE_SC = u"res/sx03129.png"_ustr;
+inline constexpr OUString BMP_IMPRESSTEMPLATE_SC = u"res/sx03130.png"_ustr;
+inline constexpr OUString BMP_GIF_SC = u"res/sx03137.png"_ustr;
+inline constexpr OUString BMP_HTML_SC = u"res/sx03139.png"_ustr;
+inline constexpr OUString BMP_JPG_SC = u"res/sx03140.png"_ustr;
+inline constexpr OUString BMP_MATH_SC = u"res/sx03144.png"_ustr;
+inline constexpr OUString BMP_MATHTEMPLATE_SC = u"res/sx03145.png"_ustr;
+inline constexpr OUString BMP_FILE_SC = u"res/sx03150.png"_ustr;
+inline constexpr OUString BMP_PCD_SC = u"res/sx03152.png"_ustr;
+inline constexpr OUString BMP_PCT_SC = u"res/sx03153.png"_ustr;
+inline constexpr OUString BMP_PCX_SC = u"res/sx03154.png"_ustr;
+inline constexpr OUString BMP_SIM_SC = u"res/sx03155.png"_ustr;
+inline constexpr OUString BMP_TEXTFILE_SC = u"res/sx03156.png"_ustr;
+inline constexpr OUString BMP_TIFF_SC = u"res/sx03158.png"_ustr;
+inline constexpr OUString BMP_WMF_SC = u"res/sx03160.png"_ustr;
+inline constexpr OUString BMP_WRITER_SC = u"res/sx03162.png"_ustr;
+inline constexpr OUString BMP_WRITERTEMPLATE_SC = u"res/sx03163.png"_ustr;
+inline constexpr OUString BMP_FIXEDDEV_SC = u"res/sx03164.png"_ustr;
+inline constexpr OUString BMP_REMOVABLEDEV_SC = u"res/sx03165.png"_ustr;
+inline constexpr OUString BMP_CDROMDEV_SC = u"res/sx03166.png"_ustr;
+inline constexpr OUString BMP_NETWORKDEV_SC = u"res/sx03167.png"_ustr;
+inline constexpr OUString BMP_TABLE_SC = u"res/sx03188.png"_ustr;
+inline constexpr OUString BMP_DXF_SC = u"res/sx03217.png"_ustr;
+inline constexpr OUString BMP_MET_SC = u"res/sx03218.png"_ustr;
+inline constexpr OUString BMP_PNG_SC = u"res/sx03219.png"_ustr;
+inline constexpr OUString BMP_SVM_SC = u"res/sx03222.png"_ustr;
+inline constexpr OUString BMP_WEBP_SC = u"res/sx03223.png"_ustr;
+inline constexpr OUString BMP_GLOBAL_DOC_SC = u"res/sx03226.png"_ustr;
+inline constexpr OUString BMP_DRAW_SC = u"res/sx03227.png"_ustr;
+inline constexpr OUString BMP_DRAWTEMPLATE_SC = u"res/sx03228.png"_ustr;
+inline constexpr OUString BMP_OO_DATABASE_DOC_SC = u"res/sx03245.png"_ustr;
+inline constexpr OUString BMP_OO_DRAW_DOC_SC = u"res/sx03246.png"_ustr;
+inline constexpr OUString BMP_OO_MATH_DOC_SC = u"res/sx03247.png"_ustr;
+inline constexpr OUString BMP_OO_GLOBAL_DOC_SC = u"res/sx03248.png"_ustr;
+inline constexpr OUString BMP_OO_IMPRESS_DOC_SC = u"res/sx03249.png"_ustr;
+inline constexpr OUString BMP_OO_CALC_DOC_SC = u"res/sx03250.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_DOC_SC = u"res/sx03251.png"_ustr;
+inline constexpr OUString BMP_OO_DRAW_TEMPLATE_SC = u"res/sx03252.png"_ustr;
+inline constexpr OUString BMP_OO_IMPRESS_TEMPLATE_SC = u"res/sx03253.png"_ustr;
+inline constexpr OUString BMP_OO_CALC_TEMPLATE_SC = u"res/sx03254.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_TEMPLATE_SC = u"res/sx03255.png"_ustr;
+inline constexpr OUString BMP_EXTENSION_SC = u"res/sx03256.png"_ustr;
+inline constexpr OUString BMP_IMPRESS_LC = u"res/lx03123.png"_ustr;
+inline constexpr OUString BMP_BITMAP_LC = u"res/lx03125.png"_ustr;
+inline constexpr OUString BMP_CALC_LC = u"res/lx03126.png"_ustr;
+inline constexpr OUString BMP_CALCTEMPLATE_LC = u"res/lx03127.png"_ustr;
+inline constexpr OUString BMP_DATABASE_LC = u"res/lx03129.png"_ustr;
+inline constexpr OUString BMP_IMPRESSTEMPLATE_LC = u"res/lx03130.png"_ustr;
+inline constexpr OUString BMP_GIF_LC = u"res/lx03137.png"_ustr;
+inline constexpr OUString BMP_HTML_LC = u"res/lx03139.png"_ustr;
+inline constexpr OUString BMP_JPG_LC = u"res/lx03140.png"_ustr;
+inline constexpr OUString BMP_MATH_LC = u"res/lx03144.png"_ustr;
+inline constexpr OUString BMP_MATHTEMPLATE_LC = u"res/lx03145.png"_ustr;
+inline constexpr OUString BMP_FILE_LC = u"res/lx03150.png"_ustr;
+inline constexpr OUString BMP_PCD_LC = u"res/lx03152.png"_ustr;
+inline constexpr OUString BMP_PCT_LC = u"res/lx03153.png"_ustr;
+inline constexpr OUString BMP_PCX_LC = u"res/lx03154.png"_ustr;
+inline constexpr OUString BMP_SIM_LC = u"res/lx03155.png"_ustr;
+inline constexpr OUString BMP_TEXTFILE_LC = u"res/lx03156.png"_ustr;
+inline constexpr OUString BMP_TIFF_LC = u"res/lx03158.png"_ustr;
+inline constexpr OUString BMP_WMF_LC = u"res/lx03160.png"_ustr;
+inline constexpr OUString BMP_WRITER_LC = u"res/lx03162.png"_ustr;
+inline constexpr OUString BMP_WRITERTEMPLATE_LC = u"res/lx03163.png"_ustr;
+inline constexpr OUString BMP_FIXEDDEV_LC = u"res/lx03164.png"_ustr;
+inline constexpr OUString BMP_REMOVABLEDEV_LC = u"res/lx03165.png"_ustr;
+inline constexpr OUString BMP_CDROMDEV_LC = u"res/lx03166.png"_ustr;
+inline constexpr OUString BMP_NETWORKDEV_LC = u"res/lx03167.png"_ustr;
+inline constexpr OUString BMP_TABLE_LC = u"res/lx03188.png"_ustr;
+inline constexpr OUString BMP_FOLDER_LC = u"res/lx03189.png"_ustr;
+inline constexpr OUString BMP_DXF_LC = u"res/lx03217.png"_ustr;
+inline constexpr OUString BMP_MET_LC = u"res/lx03218.png"_ustr;
+inline constexpr OUString BMP_PNG_LC = u"res/lx03219.png"_ustr;
+inline constexpr OUString BMP_SVM_LC = u"res/lx03222.png"_ustr;
+inline constexpr OUString BMP_WEBP_LC = u"res/lx03223.png"_ustr;
+inline constexpr OUString BMP_GLOBAL_DOC_LC = u"res/lx03226.png"_ustr;
+inline constexpr OUString BMP_DRAW_LC = u"res/lx03227.png"_ustr;
+inline constexpr OUString BMP_DRAWTEMPLATE_LC = u"res/lx03228.png"_ustr;
+inline constexpr OUString BMP_OO_DATABASE_DOC_LC = u"res/lx03245.png"_ustr;
+inline constexpr OUString BMP_OO_DRAW_DOC_LC = u"res/lx03246.png"_ustr;
+inline constexpr OUString BMP_OO_MATH_DOC_LC = u"res/lx03247.png"_ustr;
+inline constexpr OUString BMP_OO_GLOBAL_DOC_LC = u"res/lx03248.png"_ustr;
+inline constexpr OUString BMP_OO_IMPRESS_DOC_LC = u"res/lx03249.png"_ustr;
+inline constexpr OUString BMP_OO_CALC_DOC_LC = u"res/lx03250.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_DOC_LC = u"res/lx03251.png"_ustr;
+inline constexpr OUString BMP_OO_DRAW_TEMPLATE_LC = u"res/lx03252.png"_ustr;
+inline constexpr OUString BMP_OO_IMPRESS_TEMPLATE_LC = u"res/lx03253.png"_ustr;
+inline constexpr OUString BMP_OO_CALC_TEMPLATE_LC = u"res/lx03254.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_TEMPLATE_LC = u"res/lx03255.png"_ustr;
+inline constexpr OUString BMP_EXTENSION_LC = u"res/lx03256.png"_ustr;
+inline constexpr OUString BMP_HTML_32 = u"res/lx03139_32.png"_ustr;
+inline constexpr OUString BMP_OO_DATABASE_DOC_32 = u"res/lx03245_32.png"_ustr;
+inline constexpr OUString BMP_OO_DRAW_DOC_32 = u"res/lx03246_32.png"_ustr;
+inline constexpr OUString BMP_OO_MATH_DOC_32 = u"res/lx03247_32.png"_ustr;
+inline constexpr OUString BMP_OO_GLOBAL_DOC_32 = u"res/lx03248_32.png"_ustr;
+inline constexpr OUString BMP_OO_IMPRESS_DOC_32 = u"res/lx03249_32.png"_ustr;
+inline constexpr OUString BMP_OO_CALC_DOC_32 = u"res/lx03250_32.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_DOC_32 = u"res/lx03251_32.png"_ustr;
+inline constexpr OUString BMP_OO_WRITER_TEMPLATE_32 = u"res/lx03255_32.png"_ustr;
+inline constexpr OUString BMP_PLUGIN = u"res/plugin.png"_ustr;
+inline constexpr OUString RID_BMP_FOLDER = u"svtools/res/folder.png"_ustr;
+inline constexpr OUString BMP_CURRENT = u"svtools/res/ed01.png"_ustr;
+inline constexpr OUString BMP_MODIFIED = u"svtools/res/ed02.png"_ustr;
+inline constexpr OUString BMP_NEW = u"svtools/res/ed03.png"_ustr;
+inline constexpr OUString BMP_DELETED = u"svtools/res/ed04.png"_ustr;
+inline constexpr OUString BMP_CURRENTNEW = u"svtools/res/ed05.png"_ustr;
+inline constexpr OUString BMP_PRIMARYKEY = u"svtools/res/ed06.png"_ustr;
+inline constexpr OUString BMP_CURRENT_PRIMARYKEY = u"svtools/res/ed07.png"_ustr;
+inline constexpr OUString BMP_FILTER = u"svtools/res/ed08.png"_ustr;
+inline constexpr OUString BMP_HEADERFOOTER = u"svtools/res/ed09.png"_ustr;
 
-inline constexpr OUStringLiteral BMP_TAB_LOCK = u"cmd/sc_lock.png";
+inline constexpr OUString BMP_TAB_LOCK = u"cmd/sc_lock.png"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab cinoptions=b1,g0,N-s cinkeys+=0=break: */
diff --git a/svtools/inc/strings.hxx b/svtools/inc/strings.hxx
index d6210eec95cf..1c57eb1ca711 100644
--- a/svtools/inc/strings.hxx
+++ b/svtools/inc/strings.hxx
@@ -14,7 +14,7 @@
 // no need to translate this
 // the items in this string have to be in the same order as the STR_FIELD_* strings are added to the
 // field label list of the dialog
-inline constexpr OUStringLiteral STR_LOGICAL_FIELD_NAMES = u"FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4";
+inline constexpr OUString STR_LOGICAL_FIELD_NAMES = u"FirstName;LastName;Company;Department;Street;Zip;City;State;Country;PhonePriv;PhoneComp;PhoneOffice;PhoneCell;PhoneOther;Pager;Fax;EMail;URL;Title;Position;Code;AddrForm;AddrFormMail;Id;CalendarURL;InviteParticipant;Note;Altfield1;Altfield2;Altfield3;Altfield4"_ustr;
 
 #define STR_DESCRIPTION_SMATH_DOC       "StarMath 2.0 - 5.0"
 #define STR_DESCRIPTION_SCHART_DOC      "StarChart 3.0 - 5.0"