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>

20 files changed, 64 insertions, 64 deletions

diff --git a/ucb/source/core/ucbcmds.hxx b/ucb/source/core/ucbcmds.hxx
index 063c79e5f998..f4589abe9363 100644
--- a/ucb/source/core/ucbcmds.hxx
+++ b/ucb/source/core/ucbcmds.hxx
@@ -24,13 +24,13 @@
 // Definitions for the commands supported by the UCB.
 
 
-inline constexpr OUStringLiteral GETCOMMANDINFO_NAME = u"getCommandInfo";
+inline constexpr OUString GETCOMMANDINFO_NAME = u"getCommandInfo"_ustr;
 #define GETCOMMANDINFO_HANDLE   1024
 
-inline constexpr OUStringLiteral GLOBALTRANSFER_NAME = u"globalTransfer";
+inline constexpr OUString GLOBALTRANSFER_NAME = u"globalTransfer"_ustr;
 #define GLOBALTRANSFER_HANDLE   1025
 
-inline constexpr OUStringLiteral CHECKIN_NAME = u"checkin";
+inline constexpr OUString CHECKIN_NAME = u"checkin"_ustr;
 #define CHECKIN_HANDLE          1026
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/sorter/sortresult.hxx b/ucb/source/sorter/sortresult.hxx
index d385d2303e2f..51b768a3d4d6 100644
--- a/ucb/source/sorter/sortresult.hxx
+++ b/ucb/source/sorter/sortresult.hxx
@@ -82,7 +82,7 @@ public:
 };
 
 
-inline constexpr OUStringLiteral RESULTSET_SERVICE_NAME = u"com.sun.star.ucb.SortedResultSet";
+inline constexpr OUString RESULTSET_SERVICE_NAME = u"com.sun.star.ucb.SortedResultSet"_ustr;
 
 
 class SortedResultSet: public cppu::WeakImplHelper <
diff --git a/ucb/source/ucp/cmis/cmis_content.hxx b/ucb/source/ucp/cmis/cmis_content.hxx
index 4d878133aa0a..7c2938c65b64 100644
--- a/ucb/source/ucp/cmis/cmis_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_content.hxx
@@ -55,8 +55,8 @@ namespace ucbhelper
 namespace cmis
 {
 
-inline constexpr OUStringLiteral CMIS_FILE_TYPE = u"application/vnd.libreoffice.cmis-file";
-inline constexpr OUStringLiteral CMIS_FOLDER_TYPE = u"application/vnd.libreoffice.cmis-folder";
+inline constexpr OUString CMIS_FILE_TYPE = u"application/vnd.libreoffice.cmis-file"_ustr;
+inline constexpr OUString CMIS_FOLDER_TYPE = u"application/vnd.libreoffice.cmis-folder"_ustr;
 
 class ContentProvider;
 class Content : public ::ucbhelper::ContentImplHelper,
diff --git a/ucb/source/ucp/cmis/cmis_repo_content.hxx b/ucb/source/ucp/cmis/cmis_repo_content.hxx
index 0b68c4960e93..0f78bf0be14d 100644
--- a/ucb/source/ucp/cmis/cmis_repo_content.hxx
+++ b/ucb/source/ucp/cmis/cmis_repo_content.hxx
@@ -41,7 +41,7 @@ namespace ucbhelper
 
 namespace cmis
 {
-inline constexpr OUStringLiteral CMIS_REPO_TYPE = u"application/vnd.libreoffice.cmis-repository";
+inline constexpr OUString CMIS_REPO_TYPE = u"application/vnd.libreoffice.cmis-repository"_ustr;
 
 class ContentProvider;
 class RepoContent : public ::ucbhelper::ContentImplHelper,
diff --git a/ucb/source/ucp/cmis/cmis_strings.hxx b/ucb/source/ucp/cmis/cmis_strings.hxx
index 8b93198560b8..d0537238bb0c 100644
--- a/ucb/source/ucp/cmis/cmis_strings.hxx
+++ b/ucb/source/ucp/cmis/cmis_strings.hxx
@@ -14,10 +14,10 @@
 
 #include <rtl/ustring.hxx>
 
-inline constexpr OUStringLiteral CMIS_TYPE_STRING = u"String";
-inline constexpr OUStringLiteral CMIS_TYPE_INTEGER = u"Integer";
-inline constexpr OUStringLiteral CMIS_TYPE_DECIMAL = u"Decimal";
-inline constexpr OUStringLiteral CMIS_TYPE_DATETIME = u"Datetime";
-inline constexpr OUStringLiteral CMIS_TYPE_BOOL = u"Bool";
+inline constexpr OUString CMIS_TYPE_STRING = u"String"_ustr;
+inline constexpr OUString CMIS_TYPE_INTEGER = u"Integer"_ustr;
+inline constexpr OUString CMIS_TYPE_DECIMAL = u"Decimal"_ustr;
+inline constexpr OUString CMIS_TYPE_DATETIME = u"Datetime"_ustr;
+inline constexpr OUString CMIS_TYPE_BOOL = u"Bool"_ustr;
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/ucb/source/ucp/file/bc.cxx b/ucb/source/ucp/file/bc.cxx
index 607df3ead5a1..8d66f26fa884 100644
--- a/ucb/source/ucp/file/bc.cxx
+++ b/ucb/source/ucp/file/bc.cxx
@@ -652,8 +652,8 @@ BaseContent::getPropertyValues(
 
             if ( rProp.Name == "ContentType" )
             {
-                rValue <<= (m_bFolder ? OUString(TaskManager::FolderContentType)
-                    : OUString(TaskManager::FileContentType));
+                rValue <<= (m_bFolder ? TaskManager::FolderContentType
+                    : TaskManager::FileContentType);
             }
             else if ( rProp.Name == "IsFolder" )
             {
diff --git a/ucb/source/ucp/file/filtask.hxx b/ucb/source/ucp/file/filtask.hxx
index c2623c60be05..9d4169255427 100644
--- a/ucb/source/ucp/file/filtask.hxx
+++ b/ucb/source/ucp/file/filtask.hxx
@@ -624,10 +624,10 @@ namespace fileaccess
 
     public:
 
-        static constexpr OUStringLiteral FolderContentType =
-            u"application/vnd.sun.staroffice.fsys-folder";
-        static constexpr OUStringLiteral FileContentType =
-            u"application/vnd.sun.staroffice.fsys-file";
+        static constexpr OUString FolderContentType =
+            u"application/vnd.sun.staroffice.fsys-folder"_ustr;
+        static constexpr OUString FileContentType =
+            u"application/vnd.sun.staroffice.fsys-file"_ustr;
 
 
     private:
diff --git a/ucb/source/ucp/ftp/ftpcontentprovider.hxx b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
index fe1247b9e756..145fe15483c2 100644
--- a/ucb/source/ucp/ftp/ftpcontentprovider.hxx
+++ b/ucb/source/ucp/ftp/ftpcontentprovider.hxx
@@ -29,8 +29,8 @@
 // UNO service name for the provider. This name will be used by the UCB to
 // create instances of the provider.
 
-inline constexpr OUStringLiteral FTP_CONTENT_PROVIDER_SERVICE_NAME  = u"com.sun.star.ucb.FTPContentProvider";
-inline constexpr OUStringLiteral FTP_CONTENT_TYPE  = u"application/ftp-content";
+inline constexpr OUString FTP_CONTENT_PROVIDER_SERVICE_NAME  = u"com.sun.star.ucb.FTPContentProvider"_ustr;
+inline constexpr OUString FTP_CONTENT_TYPE  = u"application/ftp-content"_ustr;
 
 /**
  *  Definition of ftpcontentprovider
diff --git a/ucb/source/ucp/gio/gio_content.cxx b/ucb/source/ucp/gio/gio_content.cxx
index f7e1fd11a3f0..51df5a4e3c07 100644
--- a/ucb/source/ucp/gio/gio_content.cxx
+++ b/ucb/source/ucp/gio/gio_content.cxx
@@ -124,8 +124,8 @@ void SAL_CALL Content::abort( sal_Int32 /*CommandId*/ )
 OUString SAL_CALL Content::getContentType()
 {
     return isFolder(css::uno::Reference< css::ucb::XCommandEnvironment >())
-        ? OUString( GIO_FOLDER_TYPE )
-        : OUString( GIO_FILE_TYPE );
+        ? GIO_FOLDER_TYPE
+        : GIO_FILE_TYPE;
 }
 
 #define EXCEPT(aExcept) \
diff --git a/ucb/source/ucp/gio/gio_content.hxx b/ucb/source/ucp/gio/gio_content.hxx
index 0c80da5cdac4..243b74a4a222 100644
--- a/ucb/source/ucp/gio/gio_content.hxx
+++ b/ucb/source/ucp/gio/gio_content.hxx
@@ -49,8 +49,8 @@ namespace gio
 {
 
 
-inline constexpr OUStringLiteral GIO_FILE_TYPE = u"application/vnd.sun.staroffice.gio-file";
-inline constexpr OUStringLiteral GIO_FOLDER_TYPE = u"application/vnd.sun.staroffice.gio-folder";
+inline constexpr OUString GIO_FILE_TYPE = u"application/vnd.sun.staroffice.gio-file"_ustr;
+inline constexpr OUString GIO_FOLDER_TYPE = u"application/vnd.sun.staroffice.gio-folder"_ustr;
 
 css::uno::Any convertToException(GError *pError,
     const css::uno::Reference< css::uno::XInterface >& rContext, bool bThrow=true);
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.cxx b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
index 7dbfd1deef26..885dc8663911 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.cxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.cxx
@@ -1567,8 +1567,8 @@ void HierarchyContent::transfer(
 
 
     OUString aType = xSource->isFolder()
-        ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : OUString( HIERARCHY_LINK_CONTENT_TYPE );
+        ? HIERARCHY_FOLDER_CONTENT_TYPE
+        : HIERARCHY_LINK_CONTENT_TYPE;
     ucb::ContentInfo aContentInfo;
     aContentInfo.Type = aType;
     aContentInfo.Attributes = 0;
diff --git a/ucb/source/ucp/hierarchy/hierarchycontent.hxx b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
index 596299851cd5..c7b0d773ceb9 100644
--- a/ucb/source/ucp/hierarchy/hierarchycontent.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchycontent.hxx
@@ -51,14 +51,14 @@ public:
     explicit HierarchyContentProperties( const HierarchyEntryData::Type & rType )
     : m_aData( rType ),
       m_aContentType( rType == HierarchyEntryData::FOLDER
-        ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {}
+        ? HIERARCHY_FOLDER_CONTENT_TYPE
+        : HIERARCHY_LINK_CONTENT_TYPE ) {}
 
     explicit HierarchyContentProperties( const HierarchyEntryData & rData )
     : m_aData( rData ),
       m_aContentType( rData.getType() == HierarchyEntryData::FOLDER
-        ? OUString( HIERARCHY_FOLDER_CONTENT_TYPE )
-        : OUString( HIERARCHY_LINK_CONTENT_TYPE ) ) {}
+        ? HIERARCHY_FOLDER_CONTENT_TYPE
+        : HIERARCHY_LINK_CONTENT_TYPE ) {}
 
     const OUString & getName() const { return m_aData.getName(); }
     void setName( const OUString & rName ) { m_aData.setName( rName ); };
diff --git a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
index 27367e32f335..f32a2c692582 100644
--- a/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
+++ b/ucb/source/ucp/hierarchy/hierarchyprovider.hxx
@@ -40,10 +40,10 @@ namespace hierarchy_ucp {
                 "vnd.sun.star.hier"
 #define HIERARCHY_URL_SCHEME_LENGTH 17
 
-inline constexpr OUStringLiteral HIERARCHY_FOLDER_CONTENT_TYPE =
-                u"application/" HIERARCHY_URL_SCHEME "-folder";
-inline constexpr OUStringLiteral HIERARCHY_LINK_CONTENT_TYPE =
-                u"application/" HIERARCHY_URL_SCHEME "-link";
+inline constexpr OUString HIERARCHY_FOLDER_CONTENT_TYPE =
+                u"application/" HIERARCHY_URL_SCHEME "-folder"_ustr;
+inline constexpr OUString HIERARCHY_LINK_CONTENT_TYPE =
+                u"application/" HIERARCHY_URL_SCHEME "-link"_ustr;
 
 struct ConfigProviderMapEntry
 {
diff --git a/ucb/source/ucp/tdoc/tdoc_content.hxx b/ucb/source/ucp/tdoc/tdoc_content.hxx
index 08d2ba933759..a292877f2e2e 100644
--- a/ucb/source/ucp/tdoc/tdoc_content.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_content.hxx
@@ -52,12 +52,12 @@ public:
     ContentProperties( const ContentType & rType, OUString aTitle )
     : m_eType( rType ),
       m_aContentType( rType == STREAM
-        ? OUString( TDOC_STREAM_CONTENT_TYPE )
+        ? TDOC_STREAM_CONTENT_TYPE
         : rType == FOLDER
-            ? OUString( TDOC_FOLDER_CONTENT_TYPE )
+            ? TDOC_FOLDER_CONTENT_TYPE
             : rType == DOCUMENT
-                ? OUString( TDOC_DOCUMENT_CONTENT_TYPE )
-                : OUString( TDOC_ROOT_CONTENT_TYPE ) ),
+                ? TDOC_DOCUMENT_CONTENT_TYPE
+                : TDOC_ROOT_CONTENT_TYPE ),
       m_aTitle(std::move( aTitle ))
     {}
 
diff --git a/ucb/source/ucp/tdoc/tdoc_provider.hxx b/ucb/source/ucp/tdoc/tdoc_provider.hxx
index 1eae1409fec2..8a859ac65a40 100644
--- a/ucb/source/ucp/tdoc/tdoc_provider.hxx
+++ b/ucb/source/ucp/tdoc/tdoc_provider.hxx
@@ -46,14 +46,14 @@ namespace com::sun::star::util {
 namespace tdoc_ucp {
 
 
-inline constexpr OUStringLiteral TDOC_ROOT_CONTENT_TYPE =
-                u"application/" TDOC_URL_SCHEME "-root";
-inline constexpr OUStringLiteral TDOC_DOCUMENT_CONTENT_TYPE =
-                u"application/" TDOC_URL_SCHEME "-document";
-inline constexpr OUStringLiteral TDOC_FOLDER_CONTENT_TYPE =
-                u"application/" TDOC_URL_SCHEME "-folder";
-inline constexpr OUStringLiteral TDOC_STREAM_CONTENT_TYPE =
-                u"application/" TDOC_URL_SCHEME "-stream";
+inline constexpr OUString TDOC_ROOT_CONTENT_TYPE =
+                u"application/" TDOC_URL_SCHEME "-root"_ustr;
+inline constexpr OUString TDOC_DOCUMENT_CONTENT_TYPE =
+                u"application/" TDOC_URL_SCHEME "-document"_ustr;
+inline constexpr OUString TDOC_FOLDER_CONTENT_TYPE =
+                u"application/" TDOC_URL_SCHEME "-folder"_ustr;
+inline constexpr OUString TDOC_STREAM_CONTENT_TYPE =
+                u"application/" TDOC_URL_SCHEME "-stream"_ustr;
 
 
 class StorageElementFactory;
diff --git a/ucb/source/ucp/webdav-curl/ContentProperties.cxx b/ucb/source/ucp/webdav-curl/ContentProperties.cxx
index d76c03d7589d..c89710a1eafb 100644
--- a/ucb/source/ucp/webdav-curl/ContentProperties.cxx
+++ b/ucb/source/ucp/webdav-curl/ContentProperties.cxx
@@ -474,8 +474,8 @@ void ContentProperties::addProperty( const OUString & rName,
             = PropertyValue( uno::Any( bool( !bFolder ) ), true );
         (*m_xProps)[ OUString( "ContentType" ) ]
             = PropertyValue( uno::Any( bFolder
-                ? OUString( WEBDAV_COLLECTION_TYPE )
-                : OUString( WEBDAV_CONTENT_TYPE ) ), true );
+                ? WEBDAV_COLLECTION_TYPE
+                : WEBDAV_CONTENT_TYPE ), true );
     }
     //  else if ( rName.equals( DAVProperties::SUPPORTEDLOCK ) )
     //  {
diff --git a/ucb/source/ucp/webdav-curl/DAVProperties.hxx b/ucb/source/ucp/webdav-curl/DAVProperties.hxx
index 902e184e7b7d..8466692612a0 100644
--- a/ucb/source/ucp/webdav-curl/DAVProperties.hxx
+++ b/ucb/source/ucp/webdav-curl/DAVProperties.hxx
@@ -29,17 +29,17 @@ typedef struct { const char *nspace, *name; } SerfPropName;
 
 struct DAVProperties
 {
-    static constexpr OUStringLiteral CREATIONDATE = u"DAV:creationdate";
-    static constexpr OUStringLiteral DISPLAYNAME = u"DAV:displayname";
-    static constexpr OUStringLiteral GETCONTENTLANGUAGE = u"DAV:getcontentlanguage";
-    static constexpr OUStringLiteral GETCONTENTLENGTH = u"DAV:getcontentlength";
-    static constexpr OUStringLiteral GETCONTENTTYPE = u"DAV:getcontenttype";
-    static constexpr OUStringLiteral GETETAG = u"DAV:getetag";
-    static constexpr OUStringLiteral GETLASTMODIFIED = u"DAV:getlastmodified";
-    static constexpr OUStringLiteral LOCKDISCOVERY = u"DAV:lockdiscovery";
-    static constexpr OUStringLiteral RESOURCETYPE = u"DAV:resourcetype";
-    static constexpr OUStringLiteral SUPPORTEDLOCK = u"DAV:supportedlock";
-    static constexpr OUStringLiteral EXECUTABLE = u"http://apache.org/dav/props/executable";
+    static constexpr OUString CREATIONDATE = u"DAV:creationdate"_ustr;
+    static constexpr OUString DISPLAYNAME = u"DAV:displayname"_ustr;
+    static constexpr OUString GETCONTENTLANGUAGE = u"DAV:getcontentlanguage"_ustr;
+    static constexpr OUString GETCONTENTLENGTH = u"DAV:getcontentlength"_ustr;
+    static constexpr OUString GETCONTENTTYPE = u"DAV:getcontenttype"_ustr;
+    static constexpr OUString GETETAG = u"DAV:getetag"_ustr;
+    static constexpr OUString GETLASTMODIFIED = u"DAV:getlastmodified"_ustr;
+    static constexpr OUString LOCKDISCOVERY = u"DAV:lockdiscovery"_ustr;
+    static constexpr OUString RESOURCETYPE = u"DAV:resourcetype"_ustr;
+    static constexpr OUString SUPPORTEDLOCK = u"DAV:supportedlock"_ustr;
+    static constexpr OUString EXECUTABLE = u"http://apache.org/dav/props/executable"_ustr;
 
     static void createSerfPropName( ::std::u16string_view rFullName,
                                     SerfPropName & rName );
diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.cxx b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
index 26fa01d16027..2111263bf49c 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.cxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.cxx
@@ -1606,7 +1606,7 @@ uno::Reference< sdbc::XRow > Content::getPropertyValues(
                 true );
             xProps->addProperty(
                 "ContentType",
-                uno::Any( OUString(WEBDAV_CONTENT_TYPE) ),
+                uno::Any( WEBDAV_CONTENT_TYPE ),
                 true );
         }
     }
diff --git a/ucb/source/ucp/webdav-curl/webdavcontent.hxx b/ucb/source/ucp/webdav-curl/webdavcontent.hxx
index a44eb1c99d43..60661b867411 100644
--- a/ucb/source/ucp/webdav-curl/webdavcontent.hxx
+++ b/ucb/source/ucp/webdav-curl/webdavcontent.hxx
@@ -54,7 +54,7 @@ namespace http_dav_ucp
 
 
 // UNO service name for the content.
-inline constexpr OUStringLiteral WEBDAV_CONTENT_SERVICE_NAME = u"com.sun.star.ucb.WebDAVContent";
+inline constexpr OUString WEBDAV_CONTENT_SERVICE_NAME = u"com.sun.star.ucb.WebDAVContent"_ustr;
 
 
 class ContentProvider;
diff --git a/ucb/source/ucp/webdav-curl/webdavprovider.hxx b/ucb/source/ucp/webdav-curl/webdavprovider.hxx
index a05377cfeb9f..138f776eeef2 100644
--- a/ucb/source/ucp/webdav-curl/webdavprovider.hxx
+++ b/ucb/source/ucp/webdav-curl/webdavprovider.hxx
@@ -39,7 +39,7 @@ namespace http_dav_ucp {
 
 // UNO service name for the provider. This name will be used by the UCB to
 // create instances of the provider.
-inline constexpr OUStringLiteral WEBDAV_CONTENT_PROVIDER_SERVICE_NAME = u"com.sun.star.ucb.WebDAVContentProvider";
+inline constexpr OUString WEBDAV_CONTENT_PROVIDER_SERVICE_NAME = u"com.sun.star.ucb.WebDAVContentProvider"_ustr;
 
 // URL scheme. This is the scheme the provider will be able to create
 // contents for. The UCB will select the provider ( i.e. in order to create
@@ -53,10 +53,10 @@ inline constexpr OUStringLiteral WEBDAV_CONTENT_PROVIDER_SERVICE_NAME = u"com.su
 #define WEBDAV_URL_SCHEME            u"webdav"
 #define WEBDAVS_URL_SCHEME           u"webdavs"
 
-inline constexpr OUStringLiteral HTTP_CONTENT_TYPE = u"application/" HTTP_URL_SCHEME "-content";
+inline constexpr OUString HTTP_CONTENT_TYPE = u"application/" HTTP_URL_SCHEME "-content"_ustr;
 
 #define WEBDAV_CONTENT_TYPE    HTTP_CONTENT_TYPE
-inline constexpr OUStringLiteral WEBDAV_COLLECTION_TYPE = u"application/" VNDSUNSTARWEBDAV_URL_SCHEME "-collection";
+inline constexpr OUString WEBDAV_COLLECTION_TYPE = u"application/" VNDSUNSTARWEBDAV_URL_SCHEME "-collection"_ustr;
 
 
 class ContentProvider : public ::ucbhelper::ContentProviderImplHelper