summaryrefslogtreecommitdiff
path: root/xmlhelp
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2023-10-19 16:39:09 +0200
committerStephan Bergmann <sbergman@redhat.com>2023-10-23 11:04:42 +0200
commitbd6fb0cd3eee3c7d414e55a7678c0097aadc7646 (patch)
tree5f754d7e485ab31dd4e04782b8eccd50d854d91e /xmlhelp
parent3501c52176d1122d9de08462435f633cd21de370 (diff)
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>
Diffstat (limited to 'xmlhelp')
-rw-r--r--xmlhelp/source/cxxhelp/provider/databases.cxx4
-rw-r--r--xmlhelp/source/cxxhelp/provider/provider.hxx2
2 files changed, 3 insertions, 3 deletions
diff --git a/xmlhelp/source/cxxhelp/provider/databases.cxx b/xmlhelp/source/cxxhelp/provider/databases.cxx
index 351625e7dbcb..1969c1d3908c 100644
--- a/xmlhelp/source/cxxhelp/provider/databases.cxx
+++ b/xmlhelp/source/cxxhelp/provider/databases.cxx
@@ -849,7 +849,7 @@ Reference< XHierarchicalNameAccess > Databases::jarFile(
// let ZipPackage be used ( no manifest.xml is required )
beans::NamedValue aArg;
aArg.Name = "StorageFormat";
- aArg.Value <<= OUString(ZIP_STORAGE_FORMAT_STRING);
+ aArg.Value <<= ZIP_STORAGE_FORMAT_STRING;
pArguments[ 1 ] <<= aArg;
Reference< XInterface > xIfc
@@ -1668,7 +1668,7 @@ Reference< XHierarchicalNameAccess > JarFileIterator::implGetJarFromPackage(
Any(zipFile),
// let ZipPackage be used ( no manifest.xml is required )
Any(comphelper::makePropertyValue("StorageFormat",
- OUString(ZIP_STORAGE_FORMAT_STRING)))
+ ZIP_STORAGE_FORMAT_STRING))
};
Reference< XMultiComponentFactory >xSMgr = m_xContext->getServiceManager();
diff --git a/xmlhelp/source/cxxhelp/provider/provider.hxx b/xmlhelp/source/cxxhelp/provider/provider.hxx
index 2989d7f85cfc..3c1c8eec50c3 100644
--- a/xmlhelp/source/cxxhelp/provider/provider.hxx
+++ b/xmlhelp/source/cxxhelp/provider/provider.hxx
@@ -35,7 +35,7 @@ namespace chelp {
// contents ) according to this scheme.
#define MYUCP_URL_SCHEME "vnd.sun.star.help"
-inline constexpr OUStringLiteral MYUCP_CONTENT_TYPE = u"application/vnd.sun.star.xmlhelp"; // UCB Content Type.
+inline constexpr OUString MYUCP_CONTENT_TYPE = u"application/vnd.sun.star.xmlhelp"_ustr; // UCB Content Type.
class Databases;