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>

6 files changed, 39 insertions, 39 deletions

diff --git a/starmath/inc/document.hxx b/starmath/inc/document.hxx
index 45321614385a..ca36a6138a32 100644
--- a/starmath/inc/document.hxx
+++ b/starmath/inc/document.hxx
@@ -42,7 +42,7 @@ class SmCursor;
 namespace oox::formulaimport { class XmlStream; }
 
 #define STAROFFICE_XML  "StarOffice XML (Math)"
-inline constexpr OUStringLiteral MATHML_XML = u"MathML XML (Math)";
+inline constexpr OUString MATHML_XML = u"MathML XML (Math)"_ustr;
 
 /* Access to printer should happen through this class only
  * ==========================================================================
diff --git a/starmath/inc/format.hxx b/starmath/inc/format.hxx
index 5845d148e7fa..bcb052e6d4a9 100644
--- a/starmath/inc/format.hxx
+++ b/starmath/inc/format.hxx
@@ -26,9 +26,9 @@
 #include "types.hxx"
 
 
-inline constexpr OUStringLiteral FNTNAME_TIMES = u"Times New Roman";
-inline constexpr OUStringLiteral FNTNAME_HELV = u"Helvetica";
-inline constexpr OUStringLiteral FNTNAME_COUR = u"Courier";
+inline constexpr OUString FNTNAME_TIMES = u"Times New Roman"_ustr;
+inline constexpr OUString FNTNAME_HELV = u"Helvetica"_ustr;
+inline constexpr OUString FNTNAME_COUR = u"Courier"_ustr;
 #define FNTNAME_MATH    FONTNAME_MATH
 
 
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 19325ebd2a16..22e1e1dc1f98 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -21,35 +21,35 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral HID_SMA_MAIN_HELP = u"STARMATH_HID_SMA_MAIN_HELP";
-inline constexpr OUStringLiteral HID_SMA_WIN_DOCUMENT = u"STARMATH_HID_SMA_WIN_DOCUMENT";
-inline constexpr OUStringLiteral HID_SMA_COMMAND_WIN_EDIT = u"STARMATH_HID_SMA_COMMAND_WIN_EDIT";
+inline constexpr OUString HID_SMA_MAIN_HELP = u"STARMATH_HID_SMA_MAIN_HELP"_ustr;
+inline constexpr OUString HID_SMA_WIN_DOCUMENT = u"STARMATH_HID_SMA_WIN_DOCUMENT"_ustr;
+inline constexpr OUString HID_SMA_COMMAND_WIN_EDIT = u"STARMATH_HID_SMA_COMMAND_WIN_EDIT"_ustr;
 
-inline constexpr OUStringLiteral HID_SMA_COMMAND_WIN = u"STARMATH_HID_SMA_COMMAND_WIN";
+inline constexpr OUString HID_SMA_COMMAND_WIN = u"STARMATH_HID_SMA_COMMAND_WIN"_ustr;
 
-inline constexpr OUStringLiteral HID_SMA_DEFAULT_DIST = u"STARMATH_HID_SMA_DEFAULT_DIST";
-inline constexpr OUStringLiteral HID_SMA_LINE_DIST = u"STARMATH_HID_SMA_LINE_DIST";
-inline constexpr OUStringLiteral HID_SMA_ROOT_DIST = u"STARMATH_HID_SMA_ROOT_DIST";
-inline constexpr OUStringLiteral HID_SMA_SUP_DIST = u"STARMATH_HID_SMA_SUP_DIST";
-inline constexpr OUStringLiteral HID_SMA_SUB_DIST = u"STARMATH_HID_SMA_SUB_DIST";
-inline constexpr OUStringLiteral HID_SMA_NUMERATOR_DIST = u"STARMATH_HID_SMA_NUMERATOR_DIST";
-inline constexpr OUStringLiteral HID_SMA_DENOMINATOR_DIST = u"STARMATH_HID_SMA_DENOMINATOR_DIST";
-inline constexpr OUStringLiteral HID_SMA_FRACLINE_EXCWIDTH = u"STARMATH_HID_SMA_FRACLINE_EXCWIDTH";
-inline constexpr OUStringLiteral HID_SMA_FRACLINE_LINEWIDTH = u"STARMATH_HID_SMA_FRACLINE_LINEWIDTH";
-inline constexpr OUStringLiteral HID_SMA_UPPERLIMIT_DIST = u"STARMATH_HID_SMA_UPPERLIMIT_DIST";
-inline constexpr OUStringLiteral HID_SMA_LOWERLIMIT_DIST = u"STARMATH_HID_SMA_LOWERLIMIT_DIST";
-inline constexpr OUStringLiteral HID_SMA_BRACKET_EXCHEIGHT = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT";
-inline constexpr OUStringLiteral HID_SMA_BRACKET_DIST = u"STARMATH_HID_SMA_BRACKET_DIST";
-inline constexpr OUStringLiteral HID_SMA_MATRIXROW_DIST = u"STARMATH_HID_SMA_MATRIXROW_DIST";
-inline constexpr OUStringLiteral HID_SMA_MATRIXCOL_DIST = u"STARMATH_HID_SMA_MATRIXCOL_DIST";
-inline constexpr OUStringLiteral HID_SMA_ATTRIBUT_DIST = u"STARMATH_HID_SMA_ATTRIBUT_DIST";
-inline constexpr OUStringLiteral HID_SMA_INTERATTRIBUT_DIST = u"STARMATH_HID_SMA_INTERATTRIBUT_DIST";
-inline constexpr OUStringLiteral HID_SMA_OPERATOR_EXCHEIGHT = u"STARMATH_HID_SMA_OPERATOR_EXCHEIGHT";
-inline constexpr OUStringLiteral HID_SMA_OPERATOR_DIST = u"STARMATH_HID_SMA_OPERATOR_DIST";
-inline constexpr OUStringLiteral HID_SMA_LEFTBORDER_DIST = u"STARMATH_HID_SMA_LEFTBORDER_DIST";
-inline constexpr OUStringLiteral HID_SMA_RIGHTBORDER_DIST = u"STARMATH_HID_SMA_RIGHTBORDER_DIST";
-inline constexpr OUStringLiteral HID_SMA_UPPERBORDER_DIST = u"STARMATH_HID_SMA_UPPERBORDER_DIST";
-inline constexpr OUStringLiteral HID_SMA_LOWERBORDER_DIST = u"STARMATH_HID_SMA_LOWERBORDER_DIST";
-inline constexpr OUStringLiteral HID_SMA_BRACKET_EXCHEIGHT2 = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT2";
+inline constexpr OUString HID_SMA_DEFAULT_DIST = u"STARMATH_HID_SMA_DEFAULT_DIST"_ustr;
+inline constexpr OUString HID_SMA_LINE_DIST = u"STARMATH_HID_SMA_LINE_DIST"_ustr;
+inline constexpr OUString HID_SMA_ROOT_DIST = u"STARMATH_HID_SMA_ROOT_DIST"_ustr;
+inline constexpr OUString HID_SMA_SUP_DIST = u"STARMATH_HID_SMA_SUP_DIST"_ustr;
+inline constexpr OUString HID_SMA_SUB_DIST = u"STARMATH_HID_SMA_SUB_DIST"_ustr;
+inline constexpr OUString HID_SMA_NUMERATOR_DIST = u"STARMATH_HID_SMA_NUMERATOR_DIST"_ustr;
+inline constexpr OUString HID_SMA_DENOMINATOR_DIST = u"STARMATH_HID_SMA_DENOMINATOR_DIST"_ustr;
+inline constexpr OUString HID_SMA_FRACLINE_EXCWIDTH = u"STARMATH_HID_SMA_FRACLINE_EXCWIDTH"_ustr;
+inline constexpr OUString HID_SMA_FRACLINE_LINEWIDTH = u"STARMATH_HID_SMA_FRACLINE_LINEWIDTH"_ustr;
+inline constexpr OUString HID_SMA_UPPERLIMIT_DIST = u"STARMATH_HID_SMA_UPPERLIMIT_DIST"_ustr;
+inline constexpr OUString HID_SMA_LOWERLIMIT_DIST = u"STARMATH_HID_SMA_LOWERLIMIT_DIST"_ustr;
+inline constexpr OUString HID_SMA_BRACKET_EXCHEIGHT = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT"_ustr;
+inline constexpr OUString HID_SMA_BRACKET_DIST = u"STARMATH_HID_SMA_BRACKET_DIST"_ustr;
+inline constexpr OUString HID_SMA_MATRIXROW_DIST = u"STARMATH_HID_SMA_MATRIXROW_DIST"_ustr;
+inline constexpr OUString HID_SMA_MATRIXCOL_DIST = u"STARMATH_HID_SMA_MATRIXCOL_DIST"_ustr;
+inline constexpr OUString HID_SMA_ATTRIBUT_DIST = u"STARMATH_HID_SMA_ATTRIBUT_DIST"_ustr;
+inline constexpr OUString HID_SMA_INTERATTRIBUT_DIST = u"STARMATH_HID_SMA_INTERATTRIBUT_DIST"_ustr;
+inline constexpr OUString HID_SMA_OPERATOR_EXCHEIGHT = u"STARMATH_HID_SMA_OPERATOR_EXCHEIGHT"_ustr;
+inline constexpr OUString HID_SMA_OPERATOR_DIST = u"STARMATH_HID_SMA_OPERATOR_DIST"_ustr;
+inline constexpr OUString HID_SMA_LEFTBORDER_DIST = u"STARMATH_HID_SMA_LEFTBORDER_DIST"_ustr;
+inline constexpr OUString HID_SMA_RIGHTBORDER_DIST = u"STARMATH_HID_SMA_RIGHTBORDER_DIST"_ustr;
+inline constexpr OUString HID_SMA_UPPERBORDER_DIST = u"STARMATH_HID_SMA_UPPERBORDER_DIST"_ustr;
+inline constexpr OUString HID_SMA_LOWERBORDER_DIST = u"STARMATH_HID_SMA_LOWERBORDER_DIST"_ustr;
+inline constexpr OUString HID_SMA_BRACKET_EXCHEIGHT2 = u"STARMATH_HID_SMA_BRACKET_EXCHEIGHT2"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/starmath/inc/strings.hxx b/starmath/inc/strings.hxx
index cf8e7d5de2ce..469b54575cc3 100644
--- a/starmath/inc/strings.hxx
+++ b/starmath/inc/strings.hxx
@@ -17,7 +17,7 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral RID_UNDOFORMATNAME = u"Format";
+inline constexpr OUString RID_UNDOFORMATNAME = u"Format"_ustr;
 
 // clang-format off
 #define RID_PLUSX               u"+<?> "
diff --git a/starmath/inc/types.hxx b/starmath/inc/types.hxx
index e91d6da7f363..f9267e0d047c 100644
--- a/starmath/inc/types.hxx
+++ b/starmath/inc/types.hxx
@@ -22,7 +22,7 @@
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral FONTNAME_MATH = u"OpenSymbol";
+inline constexpr OUString FONTNAME_MATH = u"OpenSymbol"_ustr;
 
 enum SmPrintSize
 {
diff --git a/starmath/inc/unomodel.hxx b/starmath/inc/unomodel.hxx
index 6292b2825508..b16d69ee6640 100644
--- a/starmath/inc/unomodel.hxx
+++ b/starmath/inc/unomodel.hxx
@@ -29,11 +29,11 @@
 
 #include "format.hxx"
 
-inline constexpr OUStringLiteral PRTUIOPT_TITLE_ROW = u"TitleRow";
-inline constexpr OUStringLiteral PRTUIOPT_FORMULA_TEXT = u"FormulaText";
-inline constexpr OUStringLiteral PRTUIOPT_BORDER = u"Border";
-inline constexpr OUStringLiteral PRTUIOPT_PRINT_FORMAT = u"PrintFormat";
-inline constexpr OUStringLiteral PRTUIOPT_PRINT_SCALE = u"PrintScale";
+inline constexpr OUString PRTUIOPT_TITLE_ROW = u"TitleRow"_ustr;
+inline constexpr OUString PRTUIOPT_FORMULA_TEXT = u"FormulaText"_ustr;
+inline constexpr OUString PRTUIOPT_BORDER = u"Border"_ustr;
+inline constexpr OUString PRTUIOPT_PRINT_FORMAT = u"PrintFormat"_ustr;
+inline constexpr OUString PRTUIOPT_PRINT_SCALE = u"PrintScale"_ustr;
 
 class SmPrintUIOptions : public vcl::PrinterOptionsHelper
 {