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 /writerfilter | |
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 'writerfilter')
-rw-r--r-- | writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/dmapper/domainmapperfactory.cxx | 2 | ||||
-rw-r--r-- | writerfilter/source/filter/RtfFilter.cxx | 6 | ||||
-rw-r--r-- | writerfilter/source/filter/WriterFilter.cxx | 4 | ||||
-rw-r--r-- | writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2 |
5 files changed, 9 insertions, 9 deletions
diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.cxx b/writerfilter/source/dmapper/DomainMapper_Impl.cxx index 8887a79d65a2..c42a085bfa87 100644 --- a/writerfilter/source/dmapper/DomainMapper_Impl.cxx +++ b/writerfilter/source/dmapper/DomainMapper_Impl.cxx @@ -353,10 +353,10 @@ DomainMapper_Impl::DomainMapper_Impl( m_bSaxError(false) { m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_DOCUMENTBASEURL(), OUString()); + utl::MediaDescriptor::PROP_DOCUMENTBASEURL, OUString()); if (m_aBaseUrl.isEmpty()) { m_aBaseUrl = rMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_URL(), OUString()); + utl::MediaDescriptor::PROP_URL, OUString()); } appendTableManager( ); diff --git a/writerfilter/source/dmapper/domainmapperfactory.cxx b/writerfilter/source/dmapper/domainmapperfactory.cxx index d2c0b4adb557..eab017c57a2b 100644 --- a/writerfilter/source/dmapper/domainmapperfactory.cxx +++ b/writerfilter/source/dmapper/domainmapperfactory.cxx @@ -22,7 +22,7 @@ DomainMapperFactory::createMapper(css::uno::Reference<css::uno::XComponentContex { #ifdef DBG_UTIL OUString sURL - = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(), OUString()); + = rMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL, OUString()); ::std::string sURLc = OUStringToOString(sURL, RTL_TEXTENCODING_ASCII_US).getStr(); if (getenv("SW_DEBUG_WRITERFILTER")) diff --git a/writerfilter/source/filter/RtfFilter.cxx b/writerfilter/source/filter/RtfFilter.cxx index bfa9a208786e..52930c1b0e8c 100644 --- a/writerfilter/source/filter/RtfFilter.cxx +++ b/writerfilter/source/filter/RtfFilter.cxx @@ -119,7 +119,7 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto uno::Reference<io::XInputStream> xInputStream; aMediaDesc.addInputStream(); - aMediaDesc[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream; + aMediaDesc[utl::MediaDescriptor::PROP_INPUTSTREAM] >>= xInputStream; // If this is set, write to this file, instead of the real document during paste. char* pEnv = getenv("SW_DEBUG_RTF_PASTE_TO"); @@ -148,10 +148,10 @@ sal_Bool RtfFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescripto } uno::Reference<frame::XFrame> xFrame = aMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_FRAME(), uno::Reference<frame::XFrame>()); + utl::MediaDescriptor::PROP_FRAME, uno::Reference<frame::XFrame>()); xStatusIndicator = aMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_STATUSINDICATOR(), uno::Reference<task::XStatusIndicator>()); + utl::MediaDescriptor::PROP_STATUSINDICATOR, uno::Reference<task::XStatusIndicator>()); writerfilter::Stream::Pointer_t pStream( writerfilter::dmapper::DomainMapperFactory::createMapper( diff --git a/writerfilter/source/filter/WriterFilter.cxx b/writerfilter/source/filter/WriterFilter.cxx index f546446e1da4..f62dff1fe19a 100644 --- a/writerfilter/source/filter/WriterFilter.cxx +++ b/writerfilter/source/filter/WriterFilter.cxx @@ -190,7 +190,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri = writerfilter::ooxml::OOXMLDocumentFactory::createStream(m_xContext, xInputStream, bRepairStorage); uno::Reference<task::XStatusIndicator> xStatusIndicator - = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR(), + = aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_STATUSINDICATOR, uno::Reference<task::XStatusIndicator>()); writerfilter::ooxml::OOXMLDocument::Pointer_t pDocument( writerfilter::ooxml::OOXMLDocumentFactory::createDocument(pDocStream, xStatusIndicator, @@ -261,7 +261,7 @@ sal_Bool WriterFilter::filter(const uno::Sequence<beans::PropertyValue>& rDescri { ::oox::ole::VbaProject aVbaProject(m_xContext, xModel, u"Writer"); uno::Reference<frame::XFrame> xFrame = aMediaDesc.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_FRAME(), uno::Reference<frame::XFrame>()); + utl::MediaDescriptor::PROP_FRAME, uno::Reference<frame::XFrame>()); // if no XFrame try fallback to what we can glean from the Model if (!xFrame.is()) diff --git a/writerfilter/source/rtftok/rtfdocumentimpl.cxx b/writerfilter/source/rtftok/rtfdocumentimpl.cxx index a67cbe904089..d9d15551a4d0 100644 --- a/writerfilter/source/rtftok/rtfdocumentimpl.cxx +++ b/writerfilter/source/rtftok/rtfdocumentimpl.cxx @@ -2246,7 +2246,7 @@ RTFError RTFDocumentImpl::beforePopState(RTFParserState& rState) if (m_aPicturePath.endsWith(".png")) dispatchFlag(RTFKeyword::PNGBLIP); OUString aFileURL = m_rMediaDescriptor.getUnpackedValueOrDefault( - utl::MediaDescriptor::PROP_URL(), OUString()); + utl::MediaDescriptor::PROP_URL, OUString()); OUString aPictureURL; try { |