diff options
author | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-08 11:36:27 +0200 |
---|---|---|
committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2021-11-08 11:31:36 +0100 |
commit | 2ab40e9ecc9092e2227a30e43a7fc319f8632a17 (patch) | |
tree | 4a81335b8b08e02273ad32ec39da6f92e2469740 /writerperfect | |
parent | 7cbc8a8d866225f513b90b69bcc29cb6f230d65b (diff) |
use more OUStringLiteral in MediaDescriptor
Change-Id: I0567d103db8db401c737fed98483912a39352929
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/124835
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'writerperfect')
-rw-r--r-- | writerperfect/inc/ImportFilter.hxx | 2 | ||||
-rw-r--r-- | writerperfect/qa/unit/ImportTest.cxx | 6 | ||||
-rw-r--r-- | writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/writer/EBookImportFilter.cxx | 2 | ||||
-rw-r--r-- | writerperfect/source/writer/EPUBPackage.cxx | 4 | ||||
-rw-r--r-- | writerperfect/source/writer/MSWorksImportFilter.cxx | 2 |
6 files changed, 10 insertions, 10 deletions
diff --git a/writerperfect/inc/ImportFilter.hxx b/writerperfect/inc/ImportFilter.hxx index 4f69d160419f..f2cfb614d1b4 100644 --- a/writerperfect/inc/ImportFilter.hxx +++ b/writerperfect/inc/ImportFilter.hxx @@ -59,7 +59,7 @@ public: { utl::MediaDescriptor aDescriptor(rDescriptor); css::uno::Reference<css::io::XInputStream> xInputStream; - aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream; + aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM] >>= xInputStream; if (!xInputStream.is()) { OSL_ASSERT(false); diff --git a/writerperfect/qa/unit/ImportTest.cxx b/writerperfect/qa/unit/ImportTest.cxx index f37a7f8810ea..ef58118b0bb8 100644 --- a/writerperfect/qa/unit/ImportTest.cxx +++ b/writerperfect/qa/unit/ImportTest.cxx @@ -96,13 +96,13 @@ WpftLoader ImportTest::createCalcLoader(std::u16string_view rFile) const WpftLoader ImportTest::createLoader(const OUString& rUrl, const OUString& rFactoryUrl) const { utl::MediaDescriptor aDesc; - aDesc[utl::MediaDescriptor::PROP_URL()] <<= rUrl; - aDesc[utl::MediaDescriptor::PROP_READONLY()] <<= true; + aDesc[utl::MediaDescriptor::PROP_URL] <<= rUrl; + aDesc[utl::MediaDescriptor::PROP_READONLY] <<= true; uno::Sequence<beans::PropertyValue> lDesc(aDesc.getAsConstPropertyValueList()); m_xTypeDetection->queryTypeByDescriptor(lDesc, true); aDesc = lDesc; OUString sFilter; - aDesc[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilter; + aDesc[utl::MediaDescriptor::PROP_FILTERNAME] >>= sFilter; CPPUNIT_ASSERT(!sFilter.isEmpty()); const uno::Reference<document::XFilter> xFilter(m_xFilterFactory->createInstance(sFilter), UNO_QUERY); diff --git a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx index 40ada02ccfdf..b0118eaad5b7 100644 --- a/writerperfect/source/calc/MSWorksCalcImportFilter.cxx +++ b/writerperfect/source/calc/MSWorksCalcImportFilter.cxx @@ -197,7 +197,7 @@ bool MSWorksCalcImportFilter::doImportDocument(weld::Window* pParent, { OUString encoding; // first check if we can find the encoding in the filter options (headless mode) - mediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS()] >>= encoding; + mediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS] >>= encoding; if (!encoding.isEmpty()) // TODO: check if the encoding string is valid fileEncoding = encoding.toUtf8().getStr(); else @@ -258,7 +258,7 @@ bool MSWorksCalcImportFilter::doImportDocument(weld::Window* pParent, OUString sPassword; // now check if we can find the password in the properties // (just in case, "soffice --headless" adds an option to send password) - mediaDescriptor[utl::MediaDescriptor::PROP_PASSWORD()] >>= sPassword; + mediaDescriptor[utl::MediaDescriptor::PROP_PASSWORD] >>= sPassword; if (!sPassword.isEmpty()) aUtf8Passwd = OUStringToOString(sPassword, RTL_TEXTENCODING_UTF8); else diff --git a/writerperfect/source/writer/EBookImportFilter.cxx b/writerperfect/source/writer/EBookImportFilter.cxx index d734397bce5b..3c53f2d9e9df 100644 --- a/writerperfect/source/writer/EBookImportFilter.cxx +++ b/writerperfect/source/writer/EBookImportFilter.cxx @@ -24,7 +24,7 @@ bool EBookImportFilter::doImportDocument(weld::Window*, librevenge::RVNGInputStr { OUString aFilterName; - rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName; + rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] >>= aFilterName; assert(!aFilterName.isEmpty()); if (aFilterName == "Palm_Text_Document") diff --git a/writerperfect/source/writer/EPUBPackage.cxx b/writerperfect/source/writer/EPUBPackage.cxx index fe5cbf069ce4..476c3a94625a 100644 --- a/writerperfect/source/writer/EPUBPackage.cxx +++ b/writerperfect/source/writer/EPUBPackage.cxx @@ -32,8 +32,8 @@ EPUBPackage::EPUBPackage(uno::Reference<uno::XComponentContext> xContext, { // Extract the output stream from the descriptor. utl::MediaDescriptor aMediaDesc(rDescriptor); - auto xStream = aMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference<io::XStream>()); + auto xStream = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STREAMFOROUTPUT, + uno::Reference<io::XStream>()); const sal_Int32 nOpenMode = embed::ElementModes::READWRITE | embed::ElementModes::TRUNCATE; mxStorage.set(comphelper::OStorageHelper::GetStorageOfFormatFromStream( ZIP_STORAGE_FORMAT_STRING, xStream, nOpenMode, mxContext), diff --git a/writerperfect/source/writer/MSWorksImportFilter.cxx b/writerperfect/source/writer/MSWorksImportFilter.cxx index ab0efc04f670..e7912040855a 100644 --- a/writerperfect/source/writer/MSWorksImportFilter.cxx +++ b/writerperfect/source/writer/MSWorksImportFilter.cxx @@ -44,7 +44,7 @@ bool MSWorksImportFilter::doImportDocument(weld::Window* pParent, { OUString encoding; // first check if we can find the encoding in the filter options (headless mode) - mediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS()] >>= encoding; + mediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS] >>= encoding; if (!encoding.isEmpty()) // TODO: check if the encoding string is valid fileEncoding = encoding.toUtf8().getStr(); else |