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, 41 insertions, 42 deletions

diff --git a/cui/source/inc/cfg.hxx b/cui/source/inc/cfg.hxx
index aaf15b5a870c..1ae5b23a2999 100644
--- a/cui/source/inc/cfg.hxx
+++ b/cui/source/inc/cfg.hxx
@@ -40,24 +40,24 @@
 #include "cfgutil.hxx"
 #include "CommandCategoryListBox.hxx"
 
-inline constexpr OUStringLiteral notebookbarTabScope = u"notebookbarTabScope";
+inline constexpr OUString notebookbarTabScope = u"notebookbarTabScope"_ustr;
 
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_COMMANDURL  = u"CommandURL";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_LABEL = u"Label";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_TYPE = u"Type";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_STYLE = u"Style";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL";
-inline constexpr OUStringLiteral ITEM_DESCRIPTOR_UINAME = u"UIName";
+inline constexpr OUString ITEM_DESCRIPTOR_COMMANDURL  = u"CommandURL"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_CONTAINER = u"ItemDescriptorContainer"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_LABEL = u"Label"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_TYPE = u"Type"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_STYLE = u"Style"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_ISVISIBLE = u"IsVisible"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_RESOURCEURL = u"ResourceURL"_ustr;
+inline constexpr OUString ITEM_DESCRIPTOR_UINAME = u"UIName"_ustr;
 
-inline constexpr OUStringLiteral ITEM_MENUBAR_URL = u"private:resource/menubar/menubar";
-inline constexpr OUStringLiteral ITEM_TOOLBAR_URL = u"private:resource/toolbar/";
-inline constexpr OUStringLiteral ITEM_EVENT_URL = u"private:resource/event/";
+inline constexpr OUString ITEM_MENUBAR_URL = u"private:resource/menubar/menubar"_ustr;
+inline constexpr OUString ITEM_TOOLBAR_URL = u"private:resource/toolbar/"_ustr;
+inline constexpr OUString ITEM_EVENT_URL = u"private:resource/event/"_ustr;
 
-inline constexpr OUStringLiteral CUSTOM_TOOLBAR_STR = u"custom_toolbar_";
+inline constexpr OUString CUSTOM_TOOLBAR_STR = u"custom_toolbar_"_ustr;
 
-inline constexpr OUStringLiteral aMenuSeparatorStr = u" | ";
+inline constexpr OUString aMenuSeparatorStr = u" | "_ustr;
 
 class SvxConfigEntry;
 class SvxConfigPage;
diff --git a/cui/source/inc/helpids.h b/cui/source/inc/helpids.h
index b17932ffa558..8f9af7fd9570 100644
--- a/cui/source/inc/helpids.h
+++ b/cui/source/inc/helpids.h
@@ -20,34 +20,33 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
-    = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME";
-inline constexpr OUStringLiteral HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB";
-inline constexpr OUStringLiteral HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH";
+inline constexpr OUString HID_OPTIONS_COLORCONFIG_SAVE_SCHEME
+    = u"CUI_HID_OPTIONS_COLORCONFIG_SAVE_SCHEME"_ustr;
+inline constexpr OUString HID_OFA_FONT_SUBST_CLB = u"CUI_HID_OFA_FONT_SUBST_CLB"_ustr;
+inline constexpr OUString HID_DBPATH_CTL_PATH = u"CUI_HID_DBPATH_CTL_PATH"_ustr;
 #define HID_DBPATH_HEADERBAR "CUI_HID_DBPATH_HEADERBAR"
-inline constexpr OUStringLiteral HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_TOOLBAR_CONTENTS
-    = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
-    = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS";
-inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_GRID
-    = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID";
-inline constexpr OUStringLiteral HID_HANGULDLG_SUGGESTIONS_LIST
-    = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_NAME_SUBMENU = u"CUI_HID_SVX_CONFIG_NAME_SUBMENU";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU = u"CUI_HID_SVX_CONFIG_RENAME_MENU";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_MENU_ITEM
-    = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR
-    = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR";
-inline constexpr OUStringLiteral HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
-    = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM";
-inline constexpr OUStringLiteral HID_SVX_UP_TOOLBAR_ITEM = u"CUI_HID_SVX_UP_TOOLBAR_ITEM";
-inline constexpr OUStringLiteral HID_SVX_DOWN_TOOLBAR_ITEM = u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM";
-inline constexpr OUStringLiteral HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN";
-inline constexpr OUStringLiteral HID_SVX_TOPLEVELLISTBOX = u"CUI_HID_SVX_TOPLEVELLISTBOX";
-inline constexpr OUStringLiteral HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD";
-inline constexpr OUStringLiteral HID_MACRO_HEADERTABLISTBOX = u"CUI_HID_MACRO_HEADERTABLISTBOX";
+inline constexpr OUString HID_OFADLG_TREELISTBOX = u"CUI_HID_OFADLG_TREELISTBOX"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_TOOLBAR = u"CUI_HID_SVX_CONFIG_TOOLBAR"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_TOOLBAR_CONTENTS
+    = u"CUI_HID_SVX_CONFIG_TOOLBAR_CONTENTS"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS
+    = u"CUI_HID_SVX_CONFIG_NOTEBOOKBAR_CONTENTS"_ustr;
+inline constexpr OUString HID_HANGULDLG_SUGGESTIONS_GRID
+    = u"CUI_HID_HANGULDLG_SUGGESTIONS_GRID"_ustr;
+inline constexpr OUString HID_HANGULDLG_SUGGESTIONS_LIST
+    = u"CUI_HID_HANGULDLG_SUGGESTIONS_LIST"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_NAME_SUBMENU = u"CUI_HID_SVX_CONFIG_NAME_SUBMENU"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_RENAME_MENU = u"CUI_HID_SVX_CONFIG_RENAME_MENU"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_RENAME_MENU_ITEM
+    = u"CUI_HID_SVX_CONFIG_RENAME_MENU_ITEM"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_RENAME_TOOLBAR = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR"_ustr;
+inline constexpr OUString HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM
+    = u"CUI_HID_SVX_CONFIG_RENAME_TOOLBAR_ITEM"_ustr;
+inline constexpr OUString HID_SVX_UP_TOOLBAR_ITEM = u"CUI_HID_SVX_UP_TOOLBAR_ITEM"_ustr;
+inline constexpr OUString HID_SVX_DOWN_TOOLBAR_ITEM = u"CUI_HID_SVX_DOWN_TOOLBAR_ITEM"_ustr;
+inline constexpr OUString HID_SVX_SAVE_IN = u"CUI_HID_SVX_SAVE_IN"_ustr;
+inline constexpr OUString HID_SVX_TOPLEVELLISTBOX = u"CUI_HID_SVX_TOPLEVELLISTBOX"_ustr;
+inline constexpr OUString HID_SVX_DESCFIELD = u"CUI_HID_SVX_DESCFIELD"_ustr;
+inline constexpr OUString HID_MACRO_HEADERTABLISTBOX = u"CUI_HID_MACRO_HEADERTABLISTBOX"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */