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, 24 insertions, 24 deletions

diff --git a/include/svtools/genericunodialog.hxx b/include/svtools/genericunodialog.hxx
index 467a52382363..d21d76291d8d 100644
--- a/include/svtools/genericunodialog.hxx
+++ b/include/svtools/genericunodialog.hxx
@@ -44,8 +44,8 @@ namespace svt
 #define     UNODIALOG_PROPERTY_ID_TITLE     1
 #define     UNODIALOG_PROPERTY_ID_PARENT    2
 
-inline constexpr OUStringLiteral UNODIALOG_PROPERTY_TITLE = u"Title";
-inline constexpr OUStringLiteral UNODIALOG_PROPERTY_PARENT = u"ParentWindow";
+inline constexpr OUString UNODIALOG_PROPERTY_TITLE = u"Title"_ustr;
+inline constexpr OUString UNODIALOG_PROPERTY_PARENT = u"ParentWindow"_ustr;
 
     typedef cppu::WeakImplHelper< css::ui::dialogs::XExecutableDialog,
                                   css::lang::XServiceInfo,
diff --git a/include/svtools/helpids.h b/include/svtools/helpids.h
index 3a8bd633865e..12870129c192 100644
--- a/include/svtools/helpids.h
+++ b/include/svtools/helpids.h
@@ -21,29 +21,29 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral HID_FILEDLG_LINK_CB = u"SVT_HID_FILEDLG_LINK_CB";
-inline constexpr OUStringLiteral HID_FILEDLG_PREVIEW_CB = u"SVT_HID_FILEDLG_PREVIEW_CB";
-inline constexpr OUStringLiteral HID_FILEDLG_STANDARD = u"SVT_HID_FILEDLG_STANDARD";
+inline constexpr OUString HID_FILEDLG_LINK_CB = u"SVT_HID_FILEDLG_LINK_CB"_ustr;
+inline constexpr OUString HID_FILEDLG_PREVIEW_CB = u"SVT_HID_FILEDLG_PREVIEW_CB"_ustr;
+inline constexpr OUString HID_FILEDLG_STANDARD = u"SVT_HID_FILEDLG_STANDARD"_ustr;
 
 // help ids for the different modi of the file picker dialog
-inline constexpr OUStringLiteral HID_FILESAVE_LEVELUP = u"SVT_HID_FILESAVE_LEVELUP";
-inline constexpr OUStringLiteral HID_FILESAVE_CREATEDIRECTORY = u"SVT_HID_FILESAVE_CREATEDIRECTORY";
-inline constexpr OUStringLiteral HID_FILESAVE_FILEVIEW = u"SVT_HID_FILESAVE_FILEVIEW";
-inline constexpr OUStringLiteral HID_FILESAVE_TEMPLATE = u"SVT_HID_FILESAVE_TEMPLATE";
-inline constexpr OUStringLiteral HID_FILESAVE_FILEURL = u"SVT_HID_FILESAVE_FILEURL";
-inline constexpr OUStringLiteral HID_FILESAVE_FILETYPE = u"SVT_HID_FILESAVE_FILETYPE";
-inline constexpr OUStringLiteral HID_FILESAVE_DOSAVE = u"SVT_HID_FILESAVE_DOSAVE";
-inline constexpr OUStringLiteral HID_FILESAVE_AUTOEXTENSION = u"SVT_HID_FILESAVE_AUTOEXTENSION";
-inline constexpr OUStringLiteral HID_FILESAVE_SAVEWITHPASSWORD = u"SVT_HID_FILESAVE_SAVEWITHPASSWORD";
-inline constexpr OUStringLiteral HID_FILESAVE_CUSTOMIZEFILTER = u"SVT_HID_FILESAVE_CUSTOMIZEFILTER";
-inline constexpr OUStringLiteral HID_FILESAVE_SELECTION = u"SVT_HID_FILESAVE_SELECTION";
-inline constexpr OUStringLiteral HID_FILESAVE_DIALOG = u"SVT_HID_FILESAVE_DIALOG";
-inline constexpr OUStringLiteral HID_FILESAVE_DOPLAY = u"SVT_HID_FILESAVE_DOPLAY";
+inline constexpr OUString HID_FILESAVE_LEVELUP = u"SVT_HID_FILESAVE_LEVELUP"_ustr;
+inline constexpr OUString HID_FILESAVE_CREATEDIRECTORY = u"SVT_HID_FILESAVE_CREATEDIRECTORY"_ustr;
+inline constexpr OUString HID_FILESAVE_FILEVIEW = u"SVT_HID_FILESAVE_FILEVIEW"_ustr;
+inline constexpr OUString HID_FILESAVE_TEMPLATE = u"SVT_HID_FILESAVE_TEMPLATE"_ustr;
+inline constexpr OUString HID_FILESAVE_FILEURL = u"SVT_HID_FILESAVE_FILEURL"_ustr;
+inline constexpr OUString HID_FILESAVE_FILETYPE = u"SVT_HID_FILESAVE_FILETYPE"_ustr;
+inline constexpr OUString HID_FILESAVE_DOSAVE = u"SVT_HID_FILESAVE_DOSAVE"_ustr;
+inline constexpr OUString HID_FILESAVE_AUTOEXTENSION = u"SVT_HID_FILESAVE_AUTOEXTENSION"_ustr;
+inline constexpr OUString HID_FILESAVE_SAVEWITHPASSWORD = u"SVT_HID_FILESAVE_SAVEWITHPASSWORD"_ustr;
+inline constexpr OUString HID_FILESAVE_CUSTOMIZEFILTER = u"SVT_HID_FILESAVE_CUSTOMIZEFILTER"_ustr;
+inline constexpr OUString HID_FILESAVE_SELECTION = u"SVT_HID_FILESAVE_SELECTION"_ustr;
+inline constexpr OUString HID_FILESAVE_DIALOG = u"SVT_HID_FILESAVE_DIALOG"_ustr;
+inline constexpr OUString HID_FILESAVE_DOPLAY = u"SVT_HID_FILESAVE_DOPLAY"_ustr;
 
-inline constexpr OUStringLiteral HID_FILEOPEN_LEVELUP = u"SVT_HID_FILEOPEN_LEVELUP";
-inline constexpr OUStringLiteral HID_FILEOPEN_READONLY = u"SVT_HID_FILEOPEN_READONLY";
-inline constexpr OUStringLiteral HID_FILEOPEN_VERSION = u"SVT_HID_FILEOPEN_VERSION";
-inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_TEMPLATE = u"SVT_HID_FILEOPEN_IMAGE_TEMPLATE";
-inline constexpr OUStringLiteral HID_FILEOPEN_IMAGE_ANCHOR = u"SVT_HID_FILEOPEN_IMAGE_ANCHOR";
+inline constexpr OUString HID_FILEOPEN_LEVELUP = u"SVT_HID_FILEOPEN_LEVELUP"_ustr;
+inline constexpr OUString HID_FILEOPEN_READONLY = u"SVT_HID_FILEOPEN_READONLY"_ustr;
+inline constexpr OUString HID_FILEOPEN_VERSION = u"SVT_HID_FILEOPEN_VERSION"_ustr;
+inline constexpr OUString HID_FILEOPEN_IMAGE_TEMPLATE = u"SVT_HID_FILEOPEN_IMAGE_TEMPLATE"_ustr;
+inline constexpr OUString HID_FILEOPEN_IMAGE_ANCHOR = u"SVT_HID_FILEOPEN_IMAGE_ANCHOR"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/svtools/javainteractionhandler.hxx b/include/svtools/javainteractionhandler.hxx
index 1abeb73a1097..8cd220cc4a0f 100644
--- a/include/svtools/javainteractionhandler.hxx
+++ b/include/svtools/javainteractionhandler.hxx
@@ -26,7 +26,7 @@
 
 namespace com :: sun :: star :: task { class XInteractionRequest; }
 
-inline constexpr OUStringLiteral JAVA_INTERACTION_HANDLER_NAME = u"java-vm.interaction-handler";
+inline constexpr OUString JAVA_INTERACTION_HANDLER_NAME = u"java-vm.interaction-handler"_ustr;
 
 namespace svt
 {