summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
Diffstat (limited to 'sw')
-rw-r--r--sw/qa/unit/swmodeltestbase.cxx2
-rw-r--r--sw/source/core/docnode/retrieveinputstream.cxx4
-rw-r--r--sw/source/core/layout/dumpfilter.cxx2
-rw-r--r--sw/source/core/unocore/unocrsrhelper.cxx18
-rw-r--r--sw/source/filter/indexing/IndexingExportFilter.cxx2
-rw-r--r--sw/source/filter/ww8/docxexportfilter.cxx2
-rw-r--r--sw/source/filter/ww8/rtfexportfilter.cxx2
-rw-r--r--sw/source/ui/uno/swdetect.cxx4
8 files changed, 18 insertions, 18 deletions
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index 3a3508e5eb32..ee35a1cc7259 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -545,7 +545,7 @@ void SwModelTestBase::reload(const char* pFilter, const char* filename, const ch
{ "CryptoType", css::uno::makeAny(OUString("Standard")) },
{ "OOXPassword", css::uno::makeAny(sPassword) }
};
- aMediaDescriptor[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<= aEncryptionData;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_ENCRYPTIONDATA] <<= aEncryptionData;
}
}
xStorable->storeToURL(maTempFile.GetURL(), aMediaDescriptor.getAsConstPropertyValueList());
diff --git a/sw/source/core/docnode/retrieveinputstream.cxx b/sw/source/core/docnode/retrieveinputstream.cxx
index a01d75d1c24c..8054e341b7bb 100644
--- a/sw/source/core/docnode/retrieveinputstream.cxx
+++ b/sw/source/core/docnode/retrieveinputstream.cxx
@@ -64,11 +64,11 @@ void SwAsyncRetrieveInputStreamThread::threadFunction()
aMedium.addInputStream();
css::uno::Reference<css::io::XInputStream> xInputStream;
- aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
+ aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM] >>= xInputStream;
if ( !xInputStream.is() )
{
css::uno::Reference<css::io::XStream> xStream;
- aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= xStream;
+ aMedium[utl::MediaDescriptor::PROP_STREAM] >>= xStream;
if ( xStream.is() )
{
xInputStream = xStream->getInputStream();
diff --git a/sw/source/core/layout/dumpfilter.cxx b/sw/source/core/layout/dumpfilter.cxx
index f931b1cc35ad..f52d9188bb8a 100644
--- a/sw/source/core/layout/dumpfilter.cxx
+++ b/sw/source/core/layout/dumpfilter.cxx
@@ -83,7 +83,7 @@ namespace sw
// Get the output stream
uno::Reference< io::XOutputStream > xOut = aMediaDesc.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_OUTPUTSTREAM(),
+ utl::MediaDescriptor::PROP_OUTPUTSTREAM,
uno::Reference< io::XOutputStream >() );
// Actually get the SwRootFrame to call dumpAsXml
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 480c81b3dfd5..8343e1f37a3b 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -1036,16 +1036,16 @@ void InsertFile(SwUnoCursor* pUnoCursor, const OUString& rURL,
uno::Reference < io::XInputStream > xInputStream;
if( sFileName.isEmpty() )
- aMediaDescriptor[utl::MediaDescriptor::PROP_URL()] >>= sFileName;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_URL] >>= sFileName;
if( sFileName.isEmpty() )
- aMediaDescriptor[utl::MediaDescriptor::PROP_FILENAME()] >>= sFileName;
- aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
- aMediaDescriptor[utl::MediaDescriptor::PROP_STREAM()] >>= xStream;
- aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
- aMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>= sFilterName;
- aMediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS()] >>= sFilterOptions;
- aMediaDescriptor[utl::MediaDescriptor::PROP_PASSWORD()] >>= sPassword;
- aMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= sBaseURL;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_FILENAME] >>= sFileName;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM] >>= xInputStream;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_STREAM] >>= xStream;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM] >>= xInputStream;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] >>= sFilterName;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_FILTEROPTIONS] >>= sFilterOptions;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_PASSWORD] >>= sPassword;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTBASEURL ] >>= sBaseURL;
if ( !xInputStream.is() && xStream.is() )
xInputStream = xStream->getInputStream();
diff --git a/sw/source/filter/indexing/IndexingExportFilter.cxx b/sw/source/filter/indexing/IndexingExportFilter.cxx
index 1f9f43aa18f0..13001764a573 100644
--- a/sw/source/filter/indexing/IndexingExportFilter.cxx
+++ b/sw/source/filter/indexing/IndexingExportFilter.cxx
@@ -35,7 +35,7 @@ sal_Bool IndexingExportFilter::filter(const uno::Sequence<beans::PropertyValue>&
if (pXTextDocument)
{
uno::Reference<io::XOutputStream> xOutputStream = aMediaDesc.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_OUTPUTSTREAM(), uno::Reference<io::XOutputStream>());
+ utl::MediaDescriptor::PROP_OUTPUTSTREAM, uno::Reference<io::XOutputStream>());
std::unique_ptr<SvStream> pStream(new SvOutputStream(xOutputStream));
SwDocShell* pShell = pXTextDocument->GetDocShell();
diff --git a/sw/source/filter/ww8/docxexportfilter.cxx b/sw/source/filter/ww8/docxexportfilter.cxx
index b914cc1815ce..08308ca9398c 100644
--- a/sw/source/filter/ww8/docxexportfilter.cxx
+++ b/sw/source/filter/ww8/docxexportfilter.cxx
@@ -76,7 +76,7 @@ bool DocxExportFilter::exportDocument()
*pCurPam->GetPoint() = *aPam.Start();
OUString aFilterName;
- getMediaDescriptor()[utl::MediaDescriptor::PROP_FILTERNAME()] >>= aFilterName;
+ getMediaDescriptor()[utl::MediaDescriptor::PROP_FILTERNAME] >>= aFilterName;
bool bDocm = aFilterName.endsWith("VBA");
// export the document
diff --git a/sw/source/filter/ww8/rtfexportfilter.cxx b/sw/source/filter/ww8/rtfexportfilter.cxx
index 8ae2b1c50fc7..6fcae65d2376 100644
--- a/sw/source/filter/ww8/rtfexportfilter.cxx
+++ b/sw/source/filter/ww8/rtfexportfilter.cxx
@@ -41,7 +41,7 @@ sal_Bool RtfExportFilter::filter(const uno::Sequence<beans::PropertyValue>& aDes
{
utl::MediaDescriptor aMediaDesc = aDescriptor;
uno::Reference<io::XStream> xStream = aMediaDesc.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_STREAMFOROUTPUT(), uno::Reference<io::XStream>());
+ utl::MediaDescriptor::PROP_STREAMFOROUTPUT, uno::Reference<io::XStream>());
std::unique_ptr<SvStream> pStream = utl::UcbStreamHelper::CreateStream(xStream, true);
m_aWriter.SetStream(pStream.get());
diff --git a/sw/source/ui/uno/swdetect.cxx b/sw/source/ui/uno/swdetect.cxx
index 29badcd437c3..9e354dedaf6b 100644
--- a/sw/source/ui/uno/swdetect.cxx
+++ b/sw/source/ui/uno/swdetect.cxx
@@ -45,8 +45,8 @@ SwFilterDetect::~SwFilterDetect()
OUString SAL_CALL SwFilterDetect::detect( Sequence< PropertyValue >& lDescriptor )
{
MediaDescriptor aMediaDesc( lDescriptor );
- OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME(), OUString() );
- uno::Reference< io::XInputStream > xInStream ( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
+ OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault( MediaDescriptor::PROP_TYPENAME, OUString() );
+ uno::Reference< io::XInputStream > xInStream ( aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY );
if ( !xInStream.is() )
return OUString();
generated by cgit (git 2.34.1) at 2024-07-12 00:28:17 +0000