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>

3 files changed, 44 insertions, 44 deletions

diff --git a/chart2/source/inc/servicenames.hxx b/chart2/source/inc/servicenames.hxx
index 48fbbffd370d..0f5cbe2b40f9 100644
--- a/chart2/source/inc/servicenames.hxx
+++ b/chart2/source/inc/servicenames.hxx
@@ -20,34 +20,34 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral CHART_MODEL_SERVICE_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.ChartModel";
-inline constexpr OUStringLiteral CHART_MODEL_SERVICE_NAME = u"com.sun.star.chart2.ChartDocument";
+inline constexpr OUString CHART_MODEL_SERVICE_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.ChartModel"_ustr;
+inline constexpr OUString CHART_MODEL_SERVICE_NAME = u"com.sun.star.chart2.ChartDocument"_ustr;
 //@todo create your own service containing the service com.sun.star.document.OfficeDocument
 
-inline constexpr OUStringLiteral CHART_VIEW_SERVICE_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.ChartView";
-inline constexpr OUStringLiteral CHART_VIEW_SERVICE_NAME = u"com.sun.star.chart2.ChartView";
+inline constexpr OUString CHART_VIEW_SERVICE_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.ChartView"_ustr;
+inline constexpr OUString CHART_VIEW_SERVICE_NAME = u"com.sun.star.chart2.ChartView"_ustr;
 
-inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.ChartFrameLoader";
-inline constexpr OUStringLiteral CHART_FRAMELOADER_SERVICE_NAME
-    = u"com.sun.star.frame.SynchronousFrameLoader";
+inline constexpr OUString CHART_FRAMELOADER_SERVICE_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.ChartFrameLoader"_ustr;
+inline constexpr OUString CHART_FRAMELOADER_SERVICE_NAME
+    = u"com.sun.star.frame.SynchronousFrameLoader"_ustr;
 
-inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.WizardDialog";
-inline constexpr OUStringLiteral CHART_WIZARD_DIALOG_SERVICE_NAME
-    = u"com.sun.star.chart2.WizardDialog";
+inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.WizardDialog"_ustr;
+inline constexpr OUString CHART_WIZARD_DIALOG_SERVICE_NAME
+    = u"com.sun.star.chart2.WizardDialog"_ustr;
 
-inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.ChartTypeDialog";
-inline constexpr OUStringLiteral CHART_TYPE_DIALOG_SERVICE_NAME
-    = u"com.sun.star.chart2.ChartTypeDialog";
+inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.ChartTypeDialog"_ustr;
+inline constexpr OUString CHART_TYPE_DIALOG_SERVICE_NAME
+    = u"com.sun.star.chart2.ChartTypeDialog"_ustr;
 
 // wrapper for old UNO API (com.sun.star.chart)
-inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME
-    = u"com.sun.star.comp.chart2.ChartDocumentWrapper";
-inline constexpr OUStringLiteral CHART_CHARTAPIWRAPPER_SERVICE_NAME
-    = u"com.sun.star.chart2.ChartDocumentWrapper";
+inline constexpr OUString CHART_CHARTAPIWRAPPER_IMPLEMENTATION_NAME
+    = u"com.sun.star.comp.chart2.ChartDocumentWrapper"_ustr;
+inline constexpr OUString CHART_CHARTAPIWRAPPER_SERVICE_NAME
+    = u"com.sun.star.chart2.ChartDocumentWrapper"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames_charttypes.hxx b/chart2/source/inc/servicenames_charttypes.hxx
index 0c06c2d3ea57..5ab2dcbf4929 100644
--- a/chart2/source/inc/servicenames_charttypes.hxx
+++ b/chart2/source/inc/servicenames_charttypes.hxx
@@ -20,25 +20,25 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_AREA
-    = u"com.sun.star.chart2.AreaChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_BAR
-    = u"com.sun.star.chart2.BarChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_COLUMN
-    = u"com.sun.star.chart2.ColumnChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_LINE
-    = u"com.sun.star.chart2.LineChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_SCATTER
-    = u"com.sun.star.chart2.ScatterChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_PIE
-    = u"com.sun.star.chart2.PieChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_NET
-    = u"com.sun.star.chart2.NetChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET
-    = u"com.sun.star.chart2.FilledNetChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK
-    = u"com.sun.star.chart2.CandleStickChartType";
-inline constexpr OUStringLiteral CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE
-    = u"com.sun.star.chart2.BubbleChartType";
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_AREA
+    = u"com.sun.star.chart2.AreaChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_BAR
+    = u"com.sun.star.chart2.BarChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_COLUMN
+    = u"com.sun.star.chart2.ColumnChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_LINE
+    = u"com.sun.star.chart2.LineChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_SCATTER
+    = u"com.sun.star.chart2.ScatterChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_PIE
+    = u"com.sun.star.chart2.PieChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_NET
+    = u"com.sun.star.chart2.NetChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_FILLED_NET
+    = u"com.sun.star.chart2.FilledNetChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_CANDLESTICK
+    = u"com.sun.star.chart2.CandleStickChartType"_ustr;
+inline constexpr OUString CHART2_SERVICE_NAME_CHARTTYPE_BUBBLE
+    = u"com.sun.star.chart2.BubbleChartType"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/chart2/source/inc/servicenames_coosystems.hxx b/chart2/source/inc/servicenames_coosystems.hxx
index f8472a3dfeec..065155a8bb37 100644
--- a/chart2/source/inc/servicenames_coosystems.hxx
+++ b/chart2/source/inc/servicenames_coosystems.hxx
@@ -20,7 +20,7 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.CartesianView";
-inline constexpr OUStringLiteral CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.PolarView";
+inline constexpr OUString CHART2_COOSYSTEM_CARTESIAN_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.CartesianView"_ustr;
+inline constexpr OUString CHART2_COOSYSTEM_POLAR_VIEW_SERVICE_NAME = u"com.sun.star.chart2.CoordinateSystems.PolarView"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */