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, 100 insertions, 104 deletions

diff --git a/sd/source/ui/inc/ToolBarManager.hxx b/sd/source/ui/inc/ToolBarManager.hxx
index e641149b430b..da5325cf693c 100644
--- a/sd/source/ui/inc/ToolBarManager.hxx
+++ b/sd/source/ui/inc/ToolBarManager.hxx
@@ -97,32 +97,32 @@ public:
 
     /** The set of tool bars that are handled by this manager class.
     */
-    constexpr static OUStringLiteral msToolBar = u"toolbar"; // Draw_Toolbox_Sd, 23011
-    constexpr static OUStringLiteral msOptionsToolBar = u"optionsbar";
+    constexpr static OUString msToolBar = u"toolbar"_ustr; // Draw_Toolbox_Sd, 23011
+    constexpr static OUString msOptionsToolBar = u"optionsbar"_ustr;
         // Draw_Options_Toolbox, 23020
-    constexpr static OUStringLiteral msCommonTaskToolBar = u"commontaskbar";
+    constexpr static OUString msCommonTaskToolBar = u"commontaskbar"_ustr;
         // Draw_CommonTask_Toolbox, 23021
-    constexpr static OUStringLiteral msViewerToolBar = u"viewerbar"; // Draw_Viewer_Toolbox, 23023
-    constexpr static OUStringLiteral msSlideSorterToolBar = u"slideviewtoolbar";
+    constexpr static OUString msViewerToolBar = u"viewerbar"_ustr; // Draw_Viewer_Toolbox, 23023
+    constexpr static OUString msSlideSorterToolBar = u"slideviewtoolbar"_ustr;
         // Slide_Toolbox, 23012
-    constexpr static OUStringLiteral msSlideSorterObjectBar = u"slideviewobjectbar";
+    constexpr static OUString msSlideSorterObjectBar = u"slideviewobjectbar"_ustr;
         // Slide_Obj_Toolbox, 23014
-    constexpr static OUStringLiteral msOutlineToolBar = u"outlinetoolbar"; // Outline_Toolbox, 23017
-    constexpr static OUStringLiteral msMasterViewToolBar = u"masterviewtoolbar";
+    constexpr static OUString msOutlineToolBar = u"outlinetoolbar"_ustr; // Outline_Toolbox, 23017
+    constexpr static OUString msMasterViewToolBar = u"masterviewtoolbar"_ustr;
         // SID_MASTERPAGE, 27053
-    constexpr static OUStringLiteral msDrawingObjectToolBar = u"drawingobjectbar";
+    constexpr static OUString msDrawingObjectToolBar = u"drawingobjectbar"_ustr;
         // Draw_Obj_Toolbox, 23013
-    constexpr static OUStringLiteral msGluePointsToolBar = u"gluepointsobjectbar";
+    constexpr static OUString msGluePointsToolBar = u"gluepointsobjectbar"_ustr;
         // Gluepoints_Toolbox, 23019
-    constexpr static OUStringLiteral msTextObjectBar = u"textobjectbar";
+    constexpr static OUString msTextObjectBar = u"textobjectbar"_ustr;
         // Draw_Text_Toolbox_Sd, 23016
-    constexpr static OUStringLiteral msBezierObjectBar = u"bezierobjectbar";
+    constexpr static OUString msBezierObjectBar = u"bezierobjectbar"_ustr;
         // Bezier_Toolbox_Sd, 23015
-    constexpr static OUStringLiteral msGraphicObjectBar = u"graphicobjectbar";
+    constexpr static OUString msGraphicObjectBar = u"graphicobjectbar"_ustr;
         // Draw_Graf_Toolbox, 23030
-    constexpr static OUStringLiteral msMediaObjectBar = u"mediaobjectbar";
+    constexpr static OUString msMediaObjectBar = u"mediaobjectbar"_ustr;
         // Draw_Media_Toolbox, 23031
-    constexpr static OUStringLiteral msTableObjectBar = u"tableobjectbar";
+    constexpr static OUString msTableObjectBar = u"tableobjectbar"_ustr;
         // Draw_Table_Toolbox, 23018
 
     /** The set of tool bar groups.
diff --git a/sd/source/ui/inc/framework/FrameworkHelper.hxx b/sd/source/ui/inc/framework/FrameworkHelper.hxx
index 927b206b9edf..e5fe6f78cdc0 100644
--- a/sd/source/ui/inc/framework/FrameworkHelper.hxx
+++ b/sd/source/ui/inc/framework/FrameworkHelper.hxx
@@ -56,14 +56,14 @@ class FrameworkHelper final
 {
 public:
     // URLs of frequently used panes.
-    static constexpr OUStringLiteral msPaneURLPrefix = u"private:resource/pane/";
+    static constexpr OUString msPaneURLPrefix = u"private:resource/pane/"_ustr;
     static const OUString msCenterPaneURL;
     static const OUString msFullScreenPaneURL;
     static const OUString msLeftImpressPaneURL;
     static const OUString msLeftDrawPaneURL;
 
     // URLs of frequently used views.
-    static constexpr OUStringLiteral msViewURLPrefix = u"private:resource/view/";
+    static constexpr OUString msViewURLPrefix = u"private:resource/view/"_ustr;
     static const OUString msImpressViewURL;
     static const OUString msDrawViewURL;
     static const OUString msOutlineViewURL;
@@ -74,19 +74,19 @@ public:
     static const OUString msSidebarViewURL;
 
     // URLs of frequently used tool bars.
-    static constexpr OUStringLiteral msToolBarURLPrefix = u"private:resource/toolbar/";
+    static constexpr OUString msToolBarURLPrefix = u"private:resource/toolbar/"_ustr;
     static const OUString msViewTabBarURL;
 
     // Names of frequently used events.
-    static constexpr OUStringLiteral msResourceActivationRequestEvent
-        = u"ResourceActivationRequested";
-    static constexpr OUStringLiteral msResourceDeactivationRequestEvent
-        = u"ResourceDeactivationRequest";
-    static constexpr OUStringLiteral msResourceActivationEvent = u"ResourceActivation";
-    static constexpr OUStringLiteral msResourceDeactivationEvent = u"ResourceDeactivation";
-    static constexpr OUStringLiteral msResourceDeactivationEndEvent = u"ResourceDeactivationEnd";
-    static constexpr OUStringLiteral msConfigurationUpdateStartEvent = u"ConfigurationUpdateStart";
-    static constexpr OUStringLiteral msConfigurationUpdateEndEvent = u"ConfigurationUpdateEnd";
+    static constexpr OUString msResourceActivationRequestEvent
+        = u"ResourceActivationRequested"_ustr;
+    static constexpr OUString msResourceDeactivationRequestEvent
+        = u"ResourceDeactivationRequest"_ustr;
+    static constexpr OUString msResourceActivationEvent = u"ResourceActivation"_ustr;
+    static constexpr OUString msResourceDeactivationEvent = u"ResourceDeactivation"_ustr;
+    static constexpr OUString msResourceDeactivationEndEvent = u"ResourceDeactivationEnd"_ustr;
+    static constexpr OUString msConfigurationUpdateStartEvent = u"ConfigurationUpdateStart"_ustr;
+    static constexpr OUString msConfigurationUpdateEndEvent = u"ConfigurationUpdateEnd"_ustr;
 
     /** Return the FrameworkHelper object that is associated with the given
         ViewShellBase.  If such an object does not yet exist, a new one is
diff --git a/sd/source/ui/inc/unokywds.hxx b/sd/source/ui/inc/unokywds.hxx
index 37a03d3d6b31..a298e93b7c1b 100644
--- a/sd/source/ui/inc/unokywds.hxx
+++ b/sd/source/ui/inc/unokywds.hxx
@@ -23,97 +23,93 @@
 #include <rtl/ustring.hxx>
 
 // SdUnoPseudoStyleFamily
-inline constexpr OUStringLiteral sUNO_PseudoSheet_Background = u"background";
+inline constexpr OUString sUNO_PseudoSheet_Background = u"background"_ustr;
 
 // SdLayer
-inline constexpr OUStringLiteral sUNO_LayerName_background = u"background";
-inline constexpr OUStringLiteral sUNO_LayerName_background_objects = u"backgroundobjects";
-inline constexpr OUStringLiteral sUNO_LayerName_layout = u"layout";
-inline constexpr OUStringLiteral sUNO_LayerName_controls = u"controls";
-inline constexpr OUStringLiteral sUNO_LayerName_measurelines = u"measurelines";
+inline constexpr OUString sUNO_LayerName_background = u"background"_ustr;
+inline constexpr OUString sUNO_LayerName_background_objects = u"backgroundobjects"_ustr;
+inline constexpr OUString sUNO_LayerName_layout = u"layout"_ustr;
+inline constexpr OUString sUNO_LayerName_controls = u"controls"_ustr;
+inline constexpr OUString sUNO_LayerName_measurelines = u"measurelines"_ustr;
 
 // services
-inline constexpr OUStringLiteral sUNO_Service_FillProperties
-    = u"com.sun.star.drawing.FillProperties";
-inline constexpr OUStringLiteral sUNO_Service_PageBackground
-    = u"com.sun.star.drawing.PageBackground";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapRectangleObject
-    = u"com.sun.star.image.ImageMapRectangleObject";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapCircleObject
-    = u"com.sun.star.image.ImageMapCircleObject";
-inline constexpr OUStringLiteral sUNO_Service_ImageMapPolygonObject
-    = u"com.sun.star.image.ImageMapPolygonObject";
+inline constexpr OUString sUNO_Service_FillProperties = u"com.sun.star.drawing.FillProperties"_ustr;
+inline constexpr OUString sUNO_Service_PageBackground = u"com.sun.star.drawing.PageBackground"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapRectangleObject
+    = u"com.sun.star.image.ImageMapRectangleObject"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapCircleObject
+    = u"com.sun.star.image.ImageMapCircleObject"_ustr;
+inline constexpr OUString sUNO_Service_ImageMapPolygonObject
+    = u"com.sun.star.image.ImageMapPolygonObject"_ustr;
 
 // properties
-inline constexpr OUStringLiteral sUNO_Prop_ForbiddenCharacters = u"ForbiddenCharacters";
-inline constexpr OUStringLiteral sUNO_Prop_MapUnit = u"MapUnit";
-inline constexpr OUStringLiteral sUNO_Prop_VisibleArea = u"VisibleArea";
-inline constexpr OUStringLiteral sUNO_Prop_TabStop = u"TabStop";
-inline constexpr OUStringLiteral sUNO_Prop_CharLocale = u"CharLocale";
-inline constexpr OUStringLiteral sUNO_Prop_AutomContFocus = u"AutomaticControlFocus";
-inline constexpr OUStringLiteral sUNO_Prop_ApplyFrmDsgnMode = u"ApplyFormDesignMode";
-inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundVisible = u"IsBackgroundVisible";
-inline constexpr OUStringLiteral sUNO_Prop_IsBackgroundObjectsVisible
-    = u"IsBackgroundObjectsVisible";
-inline constexpr OUStringLiteral sUNO_Prop_UserDefinedAttributes = u"UserDefinedAttributes";
-inline constexpr OUStringLiteral sUNO_Prop_BookmarkURL = u"BookmarkURL";
-inline constexpr OUStringLiteral sUNO_Prop_RuntimeUID = u"RuntimeUID";
-inline constexpr OUStringLiteral sUNO_Prop_HasValidSignatures = u"HasValidSignatures";
-inline constexpr OUStringLiteral sUNO_Prop_InteropGrabBag = u"InteropGrabBag";
-inline constexpr OUStringLiteral sUNO_Prop_Theme = u"Theme";
+inline constexpr OUString sUNO_Prop_ForbiddenCharacters = u"ForbiddenCharacters"_ustr;
+inline constexpr OUString sUNO_Prop_MapUnit = u"MapUnit"_ustr;
+inline constexpr OUString sUNO_Prop_VisibleArea = u"VisibleArea"_ustr;
+inline constexpr OUString sUNO_Prop_TabStop = u"TabStop"_ustr;
+inline constexpr OUString sUNO_Prop_CharLocale = u"CharLocale"_ustr;
+inline constexpr OUString sUNO_Prop_AutomContFocus = u"AutomaticControlFocus"_ustr;
+inline constexpr OUString sUNO_Prop_ApplyFrmDsgnMode = u"ApplyFormDesignMode"_ustr;
+inline constexpr OUString sUNO_Prop_IsBackgroundVisible = u"IsBackgroundVisible"_ustr;
+inline constexpr OUString sUNO_Prop_IsBackgroundObjectsVisible = u"IsBackgroundObjectsVisible"_ustr;
+inline constexpr OUString sUNO_Prop_UserDefinedAttributes = u"UserDefinedAttributes"_ustr;
+inline constexpr OUString sUNO_Prop_BookmarkURL = u"BookmarkURL"_ustr;
+inline constexpr OUString sUNO_Prop_RuntimeUID = u"RuntimeUID"_ustr;
+inline constexpr OUString sUNO_Prop_HasValidSignatures = u"HasValidSignatures"_ustr;
+inline constexpr OUString sUNO_Prop_InteropGrabBag = u"InteropGrabBag"_ustr;
+inline constexpr OUString sUNO_Prop_Theme = u"Theme"_ustr;
 
 // view settings
-inline constexpr OUStringLiteral sUNO_View_ViewId = u"ViewId";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesNotes = u"SnapLinesNotes";
-inline constexpr OUStringLiteral sUNO_View_SnapLinesHandout = u"SnapLinesHandout";
-inline constexpr OUStringLiteral sUNO_View_RulerIsVisible = u"RulerIsVisible";
-inline constexpr OUStringLiteral sUNO_View_PageKind = u"PageKind";
-inline constexpr OUStringLiteral sUNO_View_SelectedPage = u"SelectedPage";
-inline constexpr OUStringLiteral sUNO_View_IsLayerMode = u"IsLayerMode";
-inline constexpr OUStringLiteral sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit";
-inline constexpr OUStringLiteral sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation";
-inline constexpr OUStringLiteral sUNO_View_SlidesPerRow = u"SlidesPerRow";
-inline constexpr OUStringLiteral sUNO_View_EditMode = u"EditMode";
+inline constexpr OUString sUNO_View_ViewId = u"ViewId"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesDrawing = u"SnapLinesDrawing"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesNotes = u"SnapLinesNotes"_ustr;
+inline constexpr OUString sUNO_View_SnapLinesHandout = u"SnapLinesHandout"_ustr;
+inline constexpr OUString sUNO_View_RulerIsVisible = u"RulerIsVisible"_ustr;
+inline constexpr OUString sUNO_View_PageKind = u"PageKind"_ustr;
+inline constexpr OUString sUNO_View_SelectedPage = u"SelectedPage"_ustr;
+inline constexpr OUString sUNO_View_IsLayerMode = u"IsLayerMode"_ustr;
+inline constexpr OUString sUNO_View_IsDoubleClickTextEdit = u"IsDoubleClickTextEdit"_ustr;
+inline constexpr OUString sUNO_View_IsClickChangeRotation = u"IsClickChangeRotation"_ustr;
+inline constexpr OUString sUNO_View_SlidesPerRow = u"SlidesPerRow"_ustr;
+inline constexpr OUString sUNO_View_EditMode = u"EditMode"_ustr;
 inline const char sUNO_View_EditModeStandard[] = "EditModeStandard"; // To be deprecated
 // inline const char sUNO_View_EditModeNotes[] = "EditModeNotes";
 // inline const char sUNO_View_EditModeHandout[] = "EditModeHandout";
 
-inline constexpr OUStringLiteral sUNO_View_GridIsVisible = u"GridIsVisible";
-inline constexpr OUStringLiteral sUNO_View_GridIsFront = u"GridIsFront";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToGrid = u"IsSnapToGrid";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame";
-inline constexpr OUStringLiteral sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints";
-inline constexpr OUStringLiteral sUNO_View_IsPlusHandlesAlwaysVisible
-    = u"IsPlusHandlesAlwaysVisible";
-inline constexpr OUStringLiteral sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles";
-inline constexpr OUStringLiteral sUNO_View_EliminatePolyPointLimitAngle
-    = u"EliminatePolyPointLimitAngle";
-inline constexpr OUStringLiteral sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints";
+inline constexpr OUString sUNO_View_GridIsVisible = u"GridIsVisible"_ustr;
+inline constexpr OUString sUNO_View_GridIsFront = u"GridIsFront"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToGrid = u"IsSnapToGrid"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToPageMargins = u"IsSnapToPageMargins"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToSnapLines = u"IsSnapToSnapLines"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToObjectFrame = u"IsSnapToObjectFrame"_ustr;
+inline constexpr OUString sUNO_View_IsSnapToObjectPoints = u"IsSnapToObjectPoints"_ustr;
+inline constexpr OUString sUNO_View_IsPlusHandlesAlwaysVisible = u"IsPlusHandlesAlwaysVisible"_ustr;
+inline constexpr OUString sUNO_View_IsFrameDragSingles = u"IsFrameDragSingles"_ustr;
+inline constexpr OUString sUNO_View_EliminatePolyPointLimitAngle
+    = u"EliminatePolyPointLimitAngle"_ustr;
+inline constexpr OUString sUNO_View_IsEliminatePolyPoints = u"IsEliminatePolyPoints"_ustr;
 inline const char sUNO_View_ActiveLayer[] = "ActiveLayer";
-inline constexpr OUStringLiteral sUNO_View_NoAttribs = u"NoAttribs";
-inline constexpr OUStringLiteral sUNO_View_NoColors = u"NoColors";
-inline constexpr OUStringLiteral sUNO_View_GridCoarseWidth = u"GridCoarseWidth";
-inline constexpr OUStringLiteral sUNO_View_GridCoarseHeight = u"GridCoarseHeight";
-inline constexpr OUStringLiteral sUNO_View_GridFineWidth = u"GridFineWidth";
-inline constexpr OUStringLiteral sUNO_View_GridFineHeight = u"GridFineHeight";
-inline constexpr OUStringLiteral sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled";
-inline constexpr OUStringLiteral sUNO_View_SnapAngle = u"SnapAngle";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator";
-inline constexpr OUStringLiteral sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator";
-inline constexpr OUStringLiteral sUNO_View_VisibleLayers = u"VisibleLayers";
-inline constexpr OUStringLiteral sUNO_View_PrintableLayers = u"PrintableLayers";
-inline constexpr OUStringLiteral sUNO_View_LockedLayers = u"LockedLayers";
+inline constexpr OUString sUNO_View_NoAttribs = u"NoAttribs"_ustr;
+inline constexpr OUString sUNO_View_NoColors = u"NoColors"_ustr;
+inline constexpr OUString sUNO_View_GridCoarseWidth = u"GridCoarseWidth"_ustr;
+inline constexpr OUString sUNO_View_GridCoarseHeight = u"GridCoarseHeight"_ustr;
+inline constexpr OUString sUNO_View_GridFineWidth = u"GridFineWidth"_ustr;
+inline constexpr OUString sUNO_View_GridFineHeight = u"GridFineHeight"_ustr;
+inline constexpr OUString sUNO_View_IsAngleSnapEnabled = u"IsAngleSnapEnabled"_ustr;
+inline constexpr OUString sUNO_View_SnapAngle = u"SnapAngle"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthXNumerator = u"GridSnapWidthXNumerator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthXDenominator = u"GridSnapWidthXDenominator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthYNumerator = u"GridSnapWidthYNumerator"_ustr;
+inline constexpr OUString sUNO_View_GridSnapWidthYDenominator = u"GridSnapWidthYDenominator"_ustr;
+inline constexpr OUString sUNO_View_VisibleLayers = u"VisibleLayers"_ustr;
+inline constexpr OUString sUNO_View_PrintableLayers = u"PrintableLayers"_ustr;
+inline constexpr OUString sUNO_View_LockedLayers = u"LockedLayers"_ustr;
 
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaTop = u"VisibleAreaTop";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth";
-inline constexpr OUStringLiteral sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight";
+inline constexpr OUString sUNO_View_VisibleAreaTop = u"VisibleAreaTop"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaLeft = u"VisibleAreaLeft"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaWidth = u"VisibleAreaWidth"_ustr;
+inline constexpr OUString sUNO_View_VisibleAreaHeight = u"VisibleAreaHeight"_ustr;
 
-inline constexpr OUStringLiteral sUNO_View_ZoomOnPage = u"ZoomOnPage";
+inline constexpr OUString sUNO_View_ZoomOnPage = u"ZoomOnPage"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */