avmedia/source/framework/soundhandler.cxx | 10
chart2/source/controller/main/ChartFrameloader.cxx | 6
desktop/source/app/dispatchwatcher.cxx | 4
desktop/source/lib/init.cxx | 4
filter/source/config/cache/typedetection.cxx | 52 +-
filter/source/storagefilterdetect/filterdetect.cxx | 12
filter/source/svg/svgfilter.cxx | 4
filter/source/textfilterdetect/filterdetect.cxx | 38 -
filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx | 4
framework/source/dispatch/oxt_handler.cxx | 4
framework/source/fwe/helper/titlehelper.cxx | 4
framework/source/helper/statusindicatorfactory.cxx | 2
framework/source/layoutmanager/helpers.cxx | 2
framework/source/loadenv/loadenv.cxx | 104 ++--
framework/source/services/autorecovery.cxx | 60 +-
framework/source/uielement/toolbarmanager.cxx | 2
hwpfilter/source/hwpreader.cxx | 4
include/unotools/mediadescriptor.hxx | 88 ++--
oox/source/core/filterbase.cxx | 12
oox/source/core/filterdetect.cxx | 12
oox/source/core/xmlfilterbase.cxx | 4
reportdesign/source/core/api/ReportDefinition.cxx | 4
reportdesign/source/filter/xml/xmlfilter.cxx | 2
sc/source/filter/orcus/filterdetect.cxx | 4
sc/source/ui/unoobj/exceldetect.cxx | 12
sc/source/ui/unoobj/scdetect.cxx | 6
scripting/source/provider/BrowseNodeFactoryImpl.cxx | 4
sd/source/ui/framework/factories/BasicToolBarFactory.cxx | 2
sd/source/ui/unoidl/sddetect.cxx | 6
sfx2/source/appl/fileobj.cxx | 2
sfx2/source/bastyp/fltfnc.cxx | 14
sfx2/source/doc/DocumentMetadataAccess.cxx | 18
sfx2/source/doc/SfxDocumentMetaData.cxx | 12
sfx2/source/doc/docfile.cxx | 14
starmath/source/smdetect.cxx | 2
starmath/source/unofilter.cxx | 2
sw/qa/unit/swmodeltestbase.cxx | 2
sw/source/core/docnode/retrieveinputstream.cxx | 4
sw/source/core/layout/dumpfilter.cxx | 2
sw/source/core/unocore/unocrsrhelper.cxx | 18
sw/source/filter/indexing/IndexingExportFilter.cxx | 2
sw/source/filter/ww8/docxexportfilter.cxx | 2
sw/source/filter/ww8/rtfexportfilter.cxx | 2
sw/source/ui/uno/swdetect.cxx | 4
unotools/source/misc/mediadescriptor.cxx | 328 +--------------
vbahelper/source/vbahelper/vbadocumentsbase.cxx | 2
writerfilter/source/dmapper/DomainMapper_Impl.cxx | 4
writerfilter/source/dmapper/domainmapperfactory.cxx | 2
writerfilter/source/filter/RtfFilter.cxx | 6
writerfilter/source/filter/WriterFilter.cxx | 4
writerfilter/source/rtftok/rtfdocumentimpl.cxx | 2
writerperfect/inc/ImportFilter.hxx | 2
writerperfect/qa/unit/ImportTest.cxx | 6
writerperfect/source/calc/MSWorksCalcImportFilter.cxx | 4
writerperfect/source/writer/EBookImportFilter.cxx | 2
writerperfect/source/writer/EPUBPackage.cxx | 4
writerperfect/source/writer/MSWorksImportFilter.cxx | 2
57 files changed, 338 insertions(+), 602 deletions(-)
New commits:
commit 2ab40e9ecc9092e2227a30e43a7fc319f8632a17
Author: Noel Grandin <noel.gran...@collabora.co.uk>
AuthorDate: Mon Nov 8 11:36:27 2021 +0200
Commit: Noel Grandin <noel.gran...@collabora.co.uk>
CommitDate: Mon Nov 8 11:31:36 2021 +0100
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.gran...@collabora.co.uk>
diff --git a/avmedia/source/framework/soundhandler.cxx
b/avmedia/source/framework/soundhandler.cxx
index 0724a2729150..07bee2113358 100644
--- a/avmedia/source/framework/soundhandler.cxx
+++ b/avmedia/source/framework/soundhandler.cxx
@@ -172,7 +172,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const
css::util::URL&
//close streams otherwise on windows we can't reopen the file in the
//media player when we pass the url to directx as it'll already be open
css::uno::Reference< css::io::XInputStream > xInputStream =
-
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM(),
+
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM,
css::uno::Reference< css::io::XInputStream >());
if (xInputStream.is()) xInputStream->closeInput();
}
@@ -192,7 +192,7 @@ void SAL_CALL SoundHandler::dispatchWithNotification(const
css::util::URL&
try
{
m_bError = false;
- m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete,
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(),
OUString()) ), css::uno::UNO_SET_THROW );
+ m_xPlayer.set( avmedia::MediaWindow::createPlayer( aURL.Complete,
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER,
OUString()) ), css::uno::UNO_SET_THROW );
// OK- we can start async playing ...
// Count this request and initialize self-holder against dying by uno
ref count ...
m_xSelfHold.set(static_cast< ::cppu::OWeakObject* >(this),
css::uno::UNO_QUERY);
@@ -243,8 +243,8 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence<
css::beans::Property
// Analyze given descriptor to find filename or input stream or ...
utl::MediaDescriptor aDescriptor(lDescriptor);
- OUString sURL =
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(),
OUString());
- OUString sReferer =
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER(),
OUString());
+ OUString sURL =
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL,
OUString());
+ OUString sReferer =
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REFERRER,
OUString());
if (
!sURL.isEmpty() &&
@@ -256,7 +256,7 @@ OUString SAL_CALL SoundHandler::detect( css::uno::Sequence<
css::beans::Property
// a) look for given extension of url to map our type decision HARD
CODED!!!
// b) return preferred type every time... it's easy :-)
sTypeName = "wav_Wave_Audio_File";
- aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
+ aDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/chart2/source/controller/main/ChartFrameloader.cxx
b/chart2/source/controller/main/ChartFrameloader.cxx
index c03a3f6b619e..f598a7fff4a7 100644
--- a/chart2/source/controller/main/ChartFrameloader.cxx
+++ b/chart2/source/controller/main/ChartFrameloader.cxx
@@ -81,7 +81,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const
uno::Sequence< beans::PropertyVa
utl::MediaDescriptor aMediaDescriptor(rMediaDescriptor);
{
- utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find(
utl::MediaDescriptor::PROP_MODEL()));
+ utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find(
utl::MediaDescriptor::PROP_MODEL));
if( aIt != aMediaDescriptor.end())
{
xModel.set( (*aIt).second.get< uno::Reference< frame::XModel >
>());
@@ -137,7 +137,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const
uno::Sequence< beans::PropertyVa
if(!bHaveLoadedModel)
try
{
- utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find(
utl::MediaDescriptor::PROP_URL()));
+ utl::MediaDescriptor::const_iterator aIt( aMediaDescriptor.find(
utl::MediaDescriptor::PROP_URL));
if( aIt != aMediaDescriptor.end())
{
OUString aURL( (*aIt).second.get< OUString >());
@@ -152,7 +152,7 @@ sal_Bool SAL_CALL ChartFrameLoader::load( const
uno::Sequence< beans::PropertyVa
// use the URL as BaseURL, similar to what SfxBaseModel
effectively does
if (!aURL.isEmpty())
{
-
aMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= aURL;
+
aMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTBASEURL] <<= aURL;
}
aMediaDescriptor.addInputStream();
uno::Sequence< beans::PropertyValue >
aCompleteMediaDescriptor;
diff --git a/desktop/source/app/dispatchwatcher.cxx
b/desktop/source/app/dispatchwatcher.cxx
index a3c5bc40d5c4..a0b7e370b1b1 100644
--- a/desktop/source/app/dispatchwatcher.cxx
+++ b/desktop/source/app/dispatchwatcher.cxx
@@ -364,7 +364,7 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
if ( !aDispatchRequest.aPreselectedFactory.isEmpty() )
{
- aArgs.emplace_back(utl::MediaDescriptor::PROP_DOCUMENTSERVICE(), 0,
+ aArgs.emplace_back(utl::MediaDescriptor::PROP_DOCUMENTSERVICE, 0,
Any(aDispatchRequest.aPreselectedFactory),
PropertyState_DIRECT_VALUE);
}
@@ -590,7 +590,7 @@ bool DispatchWatcher::executeDispatchRequests( const
std::vector<DispatchRequest
if ( xModel.is() )
{
utl::MediaDescriptor aMediaDesc(
xModel->getArgs() );
- aDocService =
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE(),
OUString() );
+ aDocService =
aMediaDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE,
OUString() );
}
aFilter = impl_GuessFilter( aOutFile,
aDocService );
}
diff --git a/desktop/source/lib/init.cxx b/desktop/source/lib/init.cxx
index fe6fd88b1c7b..e748aa006411 100644
--- a/desktop/source/lib/init.cxx
+++ b/desktop/source/lib/init.cxx
@@ -2931,7 +2931,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
auto aFilteredOptionSeq =
comphelper::containerToSequence<OUString>(aFilteredOptionVec);
aFilterOptions =
comphelper::string::convertCommaSeparated(aFilteredOptionSeq);
- aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS()] <<=
aFilterOptions;
+ aSaveMediaDescriptor[MediaDescriptor::PROP_FILTEROPTIONS] <<=
aFilterOptions;
comphelper::SequenceAsHashMap aFilterDataMap;
@@ -2956,7 +2956,7 @@ static int doc_saveAs(LibreOfficeKitDocument* pThis,
const char* sUrl, const cha
new LOKInteractionHandler("saveas", gImpl, pDocument));
uno::Reference<task::XInteractionHandler2> const
xInteraction(pInteraction);
- aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER()]
<<= xInteraction;
+ aSaveMediaDescriptor[MediaDescriptor::PROP_INTERACTIONHANDLER] <<=
xInteraction;
}
diff --git a/filter/source/config/cache/typedetection.cxx
b/filter/source/config/cache/typedetection.cxx
index 774005722a32..9f80798a8cb7 100644
--- a/filter/source/config/cache/typedetection.cxx
+++ b/filter/source/config/cache/typedetection.cxx
@@ -380,7 +380,7 @@ OUString SAL_CALL
TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
osl::ClearableMutexGuard aLock(m_aLock);
// parse given URL to split it into e.g. main and jump marks ...
- sURL =
stlDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(),
OUString());
+ sURL =
stlDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL,
OUString());
#if OSL_DEBUG_LEVEL > 0
if (stlDescriptor.find( "FileName" ) != stlDescriptor.end())
@@ -393,13 +393,13 @@ OUString SAL_CALL
TypeDetection::queryTypeByDescriptor(css::uno::Sequence< css::
xParser->parseStrict(aURL);
OUString aSelectedFilter = stlDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_FILTERNAME(), OUString());
+ utl::MediaDescriptor::PROP_FILTERNAME, OUString());
if (!aSelectedFilter.isEmpty())
{
// Caller specified the filter type. Honor it. Just get the
default
// type for that filter, and bail out.
if (impl_validateAndSetFilterOnDescriptor(stlDescriptor,
aSelectedFilter))
- return
stlDescriptor[utl::MediaDescriptor::PROP_TYPENAME()].get<OUString>();
+ return
stlDescriptor[utl::MediaDescriptor::PROP_TYPENAME].get<OUString>();
}
FlatDetection lFlatTypes;
@@ -467,7 +467,7 @@ void
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// a)
// Don't overwrite a might preselected filter!
OUString sFilter = rDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_FILTERNAME(),
+ utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
if (!sFilter.isEmpty())
return;
@@ -478,7 +478,7 @@ void
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// check a preselected document service too.
// Then we have to search a suitable filter within this module.
OUString sDocumentService = rDescriptor.getUnpackedValueOrDefault(
-
utl::MediaDescriptor::PROP_DOCUMENTSERVICE(),
+
utl::MediaDescriptor::PROP_DOCUMENTSERVICE,
OUString());
if (!sDocumentService.isEmpty())
{
@@ -524,8 +524,8 @@ void
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
if (!sFilter.isEmpty())
{
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<=
sRealType;
- rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<=
sFilter;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME ] <<=
sRealType;
+ rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<= sFilter;
sType = sRealType;
return;
}
@@ -555,8 +555,8 @@ void
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
// <- SAFE
// no exception => found valid type and filter => set it on the given
descriptor
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<= sType ;
- rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME ] <<= sType ;
+ rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<= sFilter;
return;
}
catch(const css::uno::Exception&)
@@ -607,8 +607,8 @@ void
TypeDetection::impl_checkResultsAndAddBestFilter(utl::MediaDescriptor& rDes
if (!sFilter.isEmpty())
{
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<= sType ;
- rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME ] <<= sType ;
+ rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<= sFilter;
return;
}
}
@@ -840,12 +840,12 @@ void TypeDetection::impl_getAllFormatTypes(
rFlatTypes.erase(last, rFlatTypes.end());
// Mark pre-selected type (if any) to have it prioritized.
- OUString sSelectedType =
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(),
OUString());
+ OUString sSelectedType =
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME,
OUString());
if (!sSelectedType.isEmpty())
impl_getPreselectionForType(sSelectedType, aParsedURL, rFlatTypes,
false);
// Mark all types preferred by the current document service, to have it
prioritized.
- OUString sSelectedDoc =
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE(),
OUString());
+ OUString sSelectedDoc =
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTSERVICE,
OUString());
if (!sSelectedDoc.isEmpty())
impl_getPreselectionForDocumentService(sSelectedDoc, aParsedURL,
rFlatTypes);
}
@@ -936,7 +936,7 @@ void
TypeDetection::impl_seekStreamToZero(utl::MediaDescriptor const & rDescript
// try to seek to 0 ...
// But because XSeekable is an optional interface ... try it only .-)
css::uno::Reference< css::io::XInputStream > xStream =
rDescriptor.getUnpackedValueOrDefault(
-
utl::MediaDescriptor::PROP_INPUTSTREAM(),
+
utl::MediaDescriptor::PROP_INPUTSTREAM,
css::uno::Reference< css::io::XInputStream >());
css::uno::Reference< css::io::XSeekable > xSeek(xStream,
css::uno::UNO_QUERY);
if (!xSeek.is())
@@ -1045,18 +1045,18 @@ OUString TypeDetection::impl_askDetectService(const
OUString& sDet
OUString
TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescriptor&
rDescriptor)
{
css::uno::Reference< css::task::XInteractionHandler > xInteraction =
-
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INTERACTIONHANDLER(),
+
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INTERACTIONHANDLER,
css::uno::Reference< css::task::XInteractionHandler >());
if (!xInteraction.is())
return OUString();
OUString sURL =
- rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL(),
+ rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_URL,
OUString());
css::uno::Reference< css::io::XInputStream > xStream =
-
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM(),
+
rDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_INPUTSTREAM,
css::uno::Reference< css::io::XInputStream >());
// Don't disturb the user for "non existing files - means empty URLs" or
@@ -1092,7 +1092,7 @@ OUString
TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
return OUString();
OUString sType;
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] >>= sType;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME] >>= sType;
return sType;
}
catch(const css::uno::Exception&)
@@ -1105,8 +1105,8 @@ OUString
TypeDetection::impl_askUserForTypeAndFilterIfAllowed(utl::MediaDescript
void TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor)
{
bool bSuccess = false;
- OUString sURL = rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_URL(), OUString() );
- bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_READONLY(), false );
+ OUString sURL = rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_URL, OUString() );
+ bool bRequestedReadOnly = rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_READONLY, false );
if ( comphelper::isFileUrl( sURL ) )
{
// OOo uses own file locking mechanics in case of local file
@@ -1126,15 +1126,15 @@ void
TypeDetection::impl_openStream(utl::MediaDescriptor& rDescriptor)
// this argument should be either removed or an additional argument
should be added so that application
// can separate the case when the user explicitly requests readonly
document.
// The current solution is to remove it here.
- rDescriptor.erase( utl::MediaDescriptor::PROP_READONLY() );
+ rDescriptor.erase( utl::MediaDescriptor::PROP_READONLY );
}
}
void TypeDetection::impl_removeTypeFilterFromDescriptor(utl::MediaDescriptor&
rDescriptor)
{
- utl::MediaDescriptor::iterator pItType =
rDescriptor.find(utl::MediaDescriptor::PROP_TYPENAME() );
- utl::MediaDescriptor::iterator pItFilter =
rDescriptor.find(utl::MediaDescriptor::PROP_FILTERNAME());
+ utl::MediaDescriptor::iterator pItType =
rDescriptor.find(utl::MediaDescriptor::PROP_TYPENAME );
+ utl::MediaDescriptor::iterator pItFilter =
rDescriptor.find(utl::MediaDescriptor::PROP_FILTERNAME);
if (pItType != rDescriptor.end())
rDescriptor.erase(pItType);
if (pItFilter != rDescriptor.end())
@@ -1150,7 +1150,7 @@ bool TypeDetection::impl_validateAndSetTypeOnDescriptor(
utl::MediaDescript
osl::MutexGuard aLock(m_aLock);
if (GetTheFilterCache().hasItem(FilterCache::E_TYPE, sType))
{
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sType;
return true;
}
}
@@ -1179,8 +1179,8 @@ bool
TypeDetection::impl_validateAndSetFilterOnDescriptor( utl::MediaDescri
// <- SAFE
// found valid type and filter => set it on the given descriptor
- rDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<= sType ;
- rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= sFilter;
+ rDescriptor[utl::MediaDescriptor::PROP_TYPENAME ] <<= sType ;
+ rDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<= sFilter;
return true;
}
catch(const css::container::NoSuchElementException&){}
diff --git a/filter/source/storagefilterdetect/filterdetect.cxx
b/filter/source/storagefilterdetect/filterdetect.cxx
index f4d3e47abf28..6784b12b780a 100644
--- a/filter/source/storagefilterdetect/filterdetect.cxx
+++ b/filter/source/storagefilterdetect/filterdetect.cxx
@@ -87,7 +87,7 @@ OUString SAL_CALL
StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue
try
{
- uno::Reference< io::XInputStream > xInStream(
aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
+ uno::Reference< io::XInputStream > xInStream(
aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY );
if ( !xInStream.is() )
return OUString();
@@ -109,16 +109,16 @@ OUString SAL_CALL
StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue
packages::zip::ZipIOException aZipException;
// We don't do any type detection on broken packages (f.e. because it
might be impossible),
// so for repairing we'll use the requested type, which was detected
by the flat detection.
- OUString aRequestedTypeName = aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME(), OUString() );
+ OUString aRequestedTypeName = aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME, OUString() );
if ( ( aWrap.TargetException >>= aZipException ) &&
!aRequestedTypeName.isEmpty() )
{
// The package is a broken one.
uno::Reference< task::XInteractionHandler > xInteraction =
- aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INTERACTIONHANDLER(), uno::Reference<
task::XInteractionHandler >() );
+ aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INTERACTIONHANDLER, uno::Reference<
task::XInteractionHandler >() );
if ( xInteraction.is() )
{
- INetURLObject aParser( aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL(), OUString() ) );
+ INetURLObject aParser( aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL, OUString() ) );
OUString aDocumentTitle = aParser.getName(
INetURLObject::LAST_SEGMENT, true, INetURLObject::DecodeMechanism::WithCharset
);
bool bRepairPackage = aMediaDesc.getUnpackedValueOrDefault(
"RepairPackage", false );
// fdo#46310 Don't try to repair if the user rejected it once.
@@ -133,8 +133,8 @@ OUString SAL_CALL
StorageFilterDetect::detect(uno::Sequence<beans::PropertyValue
if ( aRequest.isApproved() )
{
aTypeName = aRequestedTypeName;
- aMediaDesc[MediaDescriptor::PROP_DOCUMENTTITLE()] <<=
aDocumentTitle;
- aMediaDesc[MediaDescriptor::PROP_ASTEMPLATE()] <<=
true;
+ aMediaDesc[MediaDescriptor::PROP_DOCUMENTTITLE] <<=
aDocumentTitle;
+ aMediaDesc[MediaDescriptor::PROP_ASTEMPLATE] <<= true;
aMediaDesc["RepairPackage"] <<= true;
}
else
diff --git a/filter/source/svg/svgfilter.cxx b/filter/source/svg/svgfilter.cxx
index bf7389176097..359bd34e3dd8 100644
--- a/filter/source/svg/svgfilter.cxx
+++ b/filter/source/svg/svgfilter.cxx
@@ -153,7 +153,7 @@ bool SVGFilter::filterImpressOrDraw( const Sequence<
PropertyValue >& rDescripto
utl::MediaDescriptor aMediaDescriptor(rDescriptor);
uno::Reference<io::XInputStream> xInputStream;
-
xInputStream.set(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()],
UNO_QUERY);
+
xInputStream.set(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM],
UNO_QUERY);
if(!xInputStream.is())
{
@@ -777,7 +777,7 @@ public:
OUString SAL_CALL SVGFilter::detect(Sequence<PropertyValue>& rDescriptor)
{
utl::MediaDescriptor aMediaDescriptor(rDescriptor);
- uno::Reference<io::XInputStream>
xInput(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY);
+ uno::Reference<io::XInputStream>
xInput(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM], UNO_QUERY);
OUString aRetval;
if (!xInput.is())
diff --git a/filter/source/textfilterdetect/filterdetect.cxx
b/filter/source/textfilterdetect/filterdetect.cxx
index 5087066d552b..22db169b36e5 100644
--- a/filter/source/textfilterdetect/filterdetect.cxx
+++ b/filter/source/textfilterdetect/filterdetect.cxx
@@ -137,7 +137,7 @@ bool IsHTMLStream( const uno::Reference<io::XInputStream>&
xInStream )
bool HandleEmptyFileUrlByExtension(MediaDescriptor& rMediaDesc, const
OUString& rExt,
OUString& rType, OUString& rService)
{
- OUString aURL =
rMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString());
+ OUString aURL =
rMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL, OUString());
if (!tools::isEmptyFileUrl(aURL))
{
return false;
@@ -154,7 +154,7 @@ bool HandleEmptyFileUrlByExtension(MediaDescriptor&
rMediaDesc, const OUString&
return false;
}
- rMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
pFilter->GetFilterName();
+ rMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= pFilter->GetFilterName();
rType = pFilter->GetTypeName();
rService = pFilter->GetServiceName();
return true;
@@ -169,27 +169,27 @@ OUString SAL_CALL
PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
{
MediaDescriptor aMediaDesc(lDescriptor);
- OUString aType =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_TYPENAME(),
OUString() );
- OUString aDocService =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_DOCUMENTSERVICE(),
OUString() );
+ OUString aType =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_TYPENAME, OUString()
);
+ OUString aDocService =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_DOCUMENTSERVICE,
OUString() );
if ((aType == "generic_HTML") || (aType == "calc_HTML"))
{
- uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY);
+ uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY);
if (!xInStream.is() || !IsHTMLStream(xInStream))
return OUString();
if ((aDocService == CALC_DOCSERVICE) || (aType == "calc_HTML"))
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(CALC_HTML_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(CALC_HTML_FILTER);
else if (aDocService == WRITER_DOCSERVICE)
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(WRITER_HTML_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WRITER_HTML_FILTER);
else
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(WEB_HTML_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WEB_HTML_FILTER);
}
else if (aType == "generic_Text")
{
- uno::Reference<io::XStream>
xStream(aMediaDesc[MediaDescriptor::PROP_STREAM()], uno::UNO_QUERY);
- uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY);
+ uno::Reference<io::XStream>
xStream(aMediaDesc[MediaDescriptor::PROP_STREAM], uno::UNO_QUERY);
+ uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY);
if (xStream.is() || xInStream.is())
{
ZCodec aCodecGZ;
@@ -202,16 +202,16 @@ OUString SAL_CALL
PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
if (aCodecGZ.AttemptDecompression(*pInStream,
*pDecompressedStream))
{
uno::Reference<io::XStream> xStreamDecompressed(new
utl::OStreamWrapper(std::move(pDecompressedStream)));
- aMediaDesc[MediaDescriptor::PROP_STREAM()] <<=
xStreamDecompressed;
- aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()] <<=
xStreamDecompressed->getInputStream();
- OUString aURL =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(), OUString() );
+ aMediaDesc[MediaDescriptor::PROP_STREAM] <<=
xStreamDecompressed;
+ aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM] <<=
xStreamDecompressed->getInputStream();
+ OUString aURL =
aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL, OUString() );
sal_Int32 nIdx = aURL.lastIndexOf(".gz");
if (nIdx != -1)
- aMediaDesc[MediaDescriptor::PROP_URL()] <<= aURL.copy(0,
nIdx);
+ aMediaDesc[MediaDescriptor::PROP_URL] <<= aURL.copy(0,
nIdx);
}
}
// Get the file name extension.
- INetURLObject
aParser(aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL(),
OUString() ) );
+ INetURLObject
aParser(aMediaDesc.getUnpackedValueOrDefault(MediaDescriptor::PROP_URL,
OUString() ) );
OUString aExt = aParser.getExtension(INetURLObject::LAST_SEGMENT,
true, INetURLObject::DecodeMechanism::WithCharset);
aExt = aExt.toAsciiLowerCase();
OUString aName = aParser.getName().toAsciiLowerCase();
@@ -228,15 +228,15 @@ OUString SAL_CALL
PlainTextFilterDetect::detect(uno::Sequence<beans::PropertyVal
}
if (aDocService == CALC_DOCSERVICE)
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(CALC_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(CALC_TEXT_FILTER);
else if (aDocService == WRITER_DOCSERVICE)
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(WRITER_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WRITER_TEXT_FILTER);
else if (aExt == "csv" || aExt == "tsv" || aExt == "tab" || aExt ==
"xls" || aName.endsWith(".csv.gz"))
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(CALC_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(CALC_TEXT_FILTER);
else if (bEmpty)
aType = aEmptyType; // aMediaDesc is already updated in
HandleEmptyFileUrlByExtension
else
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<=
OUString(WRITER_TEXT_FILTER);
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<=
OUString(WRITER_TEXT_FILTER);
}
else
diff --git a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
index 4bce69876d3c..c4fb3eef20cd 100644
--- a/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
+++ b/filter/source/xmlfilteradaptor/XmlFilterAdaptor.cxx
@@ -64,7 +64,7 @@ bool XmlFilterAdaptor::importImpl( const Sequence<
css::beans::PropertyValue >&
utl::MediaDescriptor aMediaMap(aDescriptor);
Reference< XStatusIndicator >
xStatusIndicator(aMediaMap.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference<
XStatusIndicator >()));
+ utl::MediaDescriptor::PROP_STATUSINDICATOR, Reference<
XStatusIndicator >()));
if (xStatusIndicator.is()){
xStatusIndicator->start( "Loading :", 4);
@@ -231,7 +231,7 @@ bool XmlFilterAdaptor::exportImpl( const Sequence<
css::beans::PropertyValue >&
sal_Int32 nSteps= 1;
utl::MediaDescriptor aMediaMap(aDescriptor);
Reference< XStatusIndicator >
xStatusIndicator(aMediaMap.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_STATUSINDICATOR(), Reference<
XStatusIndicator >()));
+ utl::MediaDescriptor::PROP_STATUSINDICATOR, Reference<
XStatusIndicator >()));
if (xStatusIndicator.is())
xStatusIndicator->start( "Saving :", 3);
diff --git a/framework/source/dispatch/oxt_handler.cxx
b/framework/source/dispatch/oxt_handler.cxx
index 92aa2711d827..8c806dd9a2cc 100644
--- a/framework/source/dispatch/oxt_handler.cxx
+++ b/framework/source/dispatch/oxt_handler.cxx
@@ -142,7 +142,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence<
css::beans::PropertyV
// Analyze given descriptor to find filename or input stream or...
utl::MediaDescriptor aDescriptor( lDescriptor );
- OUString sURL = aDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_URL(), OUString() );
+ OUString sURL = aDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_URL, OUString() );
tools::Long nLength = sURL.getLength();
if ( ( nLength > 4 ) && sURL.matchIgnoreAsciiCase( ".oxt", nLength-4 ) )
@@ -153,7 +153,7 @@ OUString SAL_CALL Oxt_Handler::detect( css::uno::Sequence<
css::beans::PropertyV
// a) look for given extension of url to map our type decision HARD
CODED!!!
// b) return preferred type every time... it's easy :-)
sTypeName = "oxt_OpenOffice_Extension";
- aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sTypeName;
+ aDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sTypeName;
aDescriptor >> lDescriptor;
}
diff --git a/framework/source/fwe/helper/titlehelper.cxx
b/framework/source/fwe/helper/titlehelper.cxx
index dfd695eab3a1..ac3a8d830cc4 100644
--- a/framework/source/fwe/helper/titlehelper.cxx
+++ b/framework/source/fwe/helper/titlehelper.cxx
@@ -350,9 +350,9 @@ void TitleHelper::impl_updateTitleForModel (const
css::uno::Reference< css::fram
if (xURLProvider.is())
sURL = xURLProvider->getLocation ();
- utl::MediaDescriptor aDescriptor(xModel->getArgs2( {
utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME() } ));
+ utl::MediaDescriptor aDescriptor(xModel->getArgs2( {
utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME } ));
const OUString sSuggestedSaveAsName =
aDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME(), OUString());
+ utl::MediaDescriptor::PROP_SUGGESTEDSAVEASNAME, OUString());
if (!sURL.isEmpty())
{
diff --git a/framework/source/helper/statusindicatorfactory.cxx
b/framework/source/helper/statusindicatorfactory.cxx
index 65cf6141d5ae..285d53fb683f 100644
--- a/framework/source/helper/statusindicatorfactory.cxx
+++ b/framework/source/helper/statusindicatorfactory.cxx
@@ -353,7 +353,7 @@ void
StatusIndicatorFactory::implts_makeParentVisibleIfAllowed()
{
utl::MediaDescriptor lDocArgs(xModel->getArgs());
bHiddenDoc = lDocArgs.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_HIDDEN(),
+ utl::MediaDescriptor::PROP_HIDDEN,
false);
}
}
diff --git a/framework/source/layoutmanager/helpers.cxx
b/framework/source/layoutmanager/helpers.cxx
index 494281f16e5e..d3b58351d95c 100644
--- a/framework/source/layoutmanager/helpers.cxx
+++ b/framework/source/layoutmanager/helpers.cxx
@@ -263,7 +263,7 @@ bool implts_isPreviewModel( const uno::Reference<
frame::XModel >& xModel )
if ( xModel.is() )
{
utl::MediaDescriptor aDesc( xModel->getArgs() );
- return
aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(), false);
+ return
aDesc.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW, false);
}
else
return false;
diff --git a/framework/source/loadenv/loadenv.cxx
b/framework/source/loadenv/loadenv.cxx
index f51c2591070f..45cc86ad582e 100644
--- a/framework/source/loadenv/loadenv.cxx
+++ b/framework/source/loadenv/loadenv.cxx
@@ -213,14 +213,14 @@ namespace {
utl::MediaDescriptor addModelArgs(const uno::Sequence<beans::PropertyValue>&
rDescriptor)
{
utl::MediaDescriptor rResult(rDescriptor);
- uno::Reference<frame::XModel>
xModel(rResult.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MODEL(),
uno::Reference<frame::XModel>()));
+ uno::Reference<frame::XModel>
xModel(rResult.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MODEL,
uno::Reference<frame::XModel>()));
if (xModel.is())
{
utl::MediaDescriptor aModelArgs(xModel->getArgs());
- utl::MediaDescriptor::iterator pIt = aModelArgs.find(
utl::MediaDescriptor::PROP_MACROEXECUTIONMODE());
+ utl::MediaDescriptor::iterator pIt = aModelArgs.find(
utl::MediaDescriptor::PROP_MACROEXECUTIONMODE);
if (pIt != aModelArgs.end())
- rResult[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()] =
pIt->second;
+ rResult[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE] =
pIt->second;
}
return rResult;
@@ -266,7 +266,7 @@ void LoadEnv::startLoading(const OUString& sURL, const
uno::Sequence<beans::Prop
// make URL part of the MediaDescriptor
// It doesn't matter if it is already an item of it.
// It must be the same value... so we can overwrite it :-)
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_URL()] <<= aRealURL;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_URL] <<= aRealURL;
// parse it - because some following code require that
m_aURL.Complete = aRealURL;
@@ -276,10 +276,10 @@ void LoadEnv::startLoading(const OUString& sURL, const
uno::Sequence<beans::Prop
// BTW: Split URL and JumpMark ...
// Because such mark is an explicit value of the media descriptor!
if (!m_aURL.Mark.isEmpty())
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_JUMPMARK()] <<=
m_aURL.Mark;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_JUMPMARK] <<=
m_aURL.Mark;
// By the way: remove the old and deprecated value "FileName" from the
descriptor!
- utl::MediaDescriptor::iterator pIt =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FILENAME());
+ utl::MediaDescriptor::iterator pIt =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FILENAME);
if (pIt != m_lMediaDescriptor.end())
m_lMediaDescriptor.erase(pIt);
@@ -292,8 +292,8 @@ void LoadEnv::startLoading(const OUString& sURL, const
uno::Sequence<beans::Prop
// UI mode
const bool bUIMode =
(m_eFeature & LoadEnvFeatures::WorkWithUI) &&
-
!m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
false) &&
-
!m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(),
false);
+
!m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN,
false) &&
+
!m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW,
false);
initializeUIDefaults(m_xContext, m_lMediaDescriptor, bUIMode,
&m_pQuietInteraction);
@@ -334,21 +334,21 @@ void LoadEnv::initializeUIDefaults( const
css::uno::Reference< css::uno::XCompon
if ( xInteractionHandler.is() )
{
- if(
io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_INTERACTIONHANDLER()) ==
io_lMediaDescriptor.end() )
+ if(
io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_INTERACTIONHANDLER) ==
io_lMediaDescriptor.end() )
{
-
io_lMediaDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<=
xInteractionHandler;
+ io_lMediaDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER]
<<= xInteractionHandler;
}
- if(
io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_AUTHENTICATIONHANDLER()) ==
io_lMediaDescriptor.end() )
+ if(
io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_AUTHENTICATIONHANDLER) ==
io_lMediaDescriptor.end() )
{
-
io_lMediaDescriptor[utl::MediaDescriptor::PROP_AUTHENTICATIONHANDLER()] <<=
xInteractionHandler;
+
io_lMediaDescriptor[utl::MediaDescriptor::PROP_AUTHENTICATIONHANDLER] <<=
xInteractionHandler;
}
}
- if
(io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()) ==
io_lMediaDescriptor.end())
- io_lMediaDescriptor[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE()]
<<= nMacroMode;
+ if
(io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_MACROEXECUTIONMODE) ==
io_lMediaDescriptor.end())
+ io_lMediaDescriptor[utl::MediaDescriptor::PROP_MACROEXECUTIONMODE] <<=
nMacroMode;
- if (io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_UPDATEDOCMODE())
== io_lMediaDescriptor.end())
- io_lMediaDescriptor[utl::MediaDescriptor::PROP_UPDATEDOCMODE()] <<=
nUpdateMode;
+ if (io_lMediaDescriptor.find(utl::MediaDescriptor::PROP_UPDATEDOCMODE) ==
io_lMediaDescriptor.end())
+ io_lMediaDescriptor[utl::MediaDescriptor::PROP_UPDATEDOCMODE] <<=
nUpdateMode;
}
void LoadEnv::start()
@@ -574,7 +574,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
OUString&
utl::MediaDescriptor::const_iterator pIt;
if (ProtocolCheck::isProtocol(sURL,EProtocol::PrivateStream))
{
- pIt =
stlMediaDescriptor.find(utl::MediaDescriptor::PROP_INPUTSTREAM());
+ pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_INPUTSTREAM);
css::uno::Reference< css::io::XInputStream > xStream;
if (pIt != stlMediaDescriptor.end())
pIt->second >>= xStream;
@@ -587,7 +587,7 @@ LoadEnv::EContentType LoadEnv::classifyContent(const
OUString&
// using of a full featured document
if (ProtocolCheck::isProtocol(sURL,EProtocol::PrivateObject))
{
- pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_MODEL());
+ pIt = stlMediaDescriptor.find(utl::MediaDescriptor::PROP_MODEL);
css::uno::Reference< css::frame::XModel > xModel;
if (pIt != stlMediaDescriptor.end())
pIt->second >>= xModel;
@@ -743,10 +743,10 @@ void LoadEnv::impl_detectTypeAndFilter()
// Orcus type detected. Skip the normal type detection process.
m_lMediaDescriptor << lDescriptor;
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<=
sFilter;
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERPROVIDER()] <<=
OUString("orcus");
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<=
OUString("com.sun.star.sheet.SpreadsheetDocument");
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sType;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<= sFilter;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERPROVIDER] <<=
OUString("orcus");
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE] <<=
OUString("com.sun.star.sheet.SpreadsheetDocument");
return;
// <- SAFE
}
@@ -767,16 +767,16 @@ void LoadEnv::impl_detectTypeAndFilter()
// detection was successful => update the descriptor member of this class
m_lMediaDescriptor << lDescriptor;
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME()] <<= sType;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_TYPENAME] <<= sType;
// Is there an already detected (may be preselected) filter?
// see below ...
- sFilter =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME(),
OUString());
+ sFilter =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
aWriteLock.clear();
// <- SAFE
// We do have potentially correct type, but the detection process was
aborted.
- if
(m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED(),
false))
+ if
(m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED,
false))
throw LoadEnvException(
LoadEnvException::ID_UNSUPPORTED_CONTENT, "type detection
aborted");
@@ -800,7 +800,7 @@ void LoadEnv::impl_detectTypeAndFilter()
{
// SAFE ->
aWriteLock.reset();
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()]
<<= sFilter;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<=
sFilter;
aWriteLock.clear();
// <- SAFE
}
@@ -835,9 +835,9 @@ void LoadEnv::impl_detectTypeAndFilter()
// SAFE ->
aWriteLock.reset();
// Don't overwrite external decisions! See comments before ...
- utl::MediaDescriptor::const_iterator pAsTemplateItem =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_ASTEMPLATE());
+ utl::MediaDescriptor::const_iterator pAsTemplateItem =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_ASTEMPLATE);
if (pAsTemplateItem == m_lMediaDescriptor.end())
- m_lMediaDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<=
true;
+ m_lMediaDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE] <<= true;
aWriteLock.clear();
// <- SAFE
}
@@ -849,7 +849,7 @@ bool LoadEnv::impl_handleContent()
osl::ClearableMutexGuard aReadLock(m_mutex);
// the type must exist inside the descriptor ... otherwise this class is
implemented wrong :-)
- OUString sType =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(),
OUString());
+ OUString sType =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME,
OUString());
if (sType.isEmpty())
throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
@@ -946,7 +946,7 @@ bool LoadEnv::impl_furtherDocsAllowed()
// SAFE ->
aReadLock.reset();
css::uno::Reference< css::task::XInteractionHandler > xInteraction =
m_lMediaDescriptor.getUnpackedValueOrDefault(
-
utl::MediaDescriptor::PROP_INTERACTIONHANDLER(),
+
utl::MediaDescriptor::PROP_INTERACTIONHANDLER,
css::uno::Reference< css::task::XInteractionHandler >());
aReadLock.clear();
// <- SAFE
@@ -984,7 +984,7 @@ bool LoadEnv::impl_filterHasInteractiveDialog() const
if (m_aURL.Arguments.indexOf("slot=") != -1)
return true;
- OUString sFilter =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME(),
OUString());
+ OUString sFilter =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
if (sFilter.isEmpty())
return false;
@@ -1084,14 +1084,14 @@ bool LoadEnv::impl_loadContent()
// So we prevent our code against wrong using. Why?
// It could be, that using of this progress could make trouble. e.g. He
makes window visible...
// but shouldn't do that. But if no indicator is available... nobody has a
chance to do that!
- bool bHidden =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
false);
- bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(),
false);
- bool bPreview =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW(),
false);
+ bool bHidden =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN,
false);
+ bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED,
false);
+ bool bPreview =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_PREVIEW,
false);
if (!bHidden && !bMinimized && !bPreview)
{
css::uno::Reference<css::task::XStatusIndicator> xProgress =
m_lMediaDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_STATUSINDICATOR(),
css::uno::Reference<css::task::XStatusIndicator>());
+ utl::MediaDescriptor::PROP_STATUSINDICATOR,
css::uno::Reference<css::task::XStatusIndicator>());
if (!xProgress.is())
{
// Note: it's an optional interface!
@@ -1100,14 +1100,14 @@ bool LoadEnv::impl_loadContent()
{
xProgress = xProgressFactory->createStatusIndicator();
if (xProgress.is())
-
m_lMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<= xProgress;
+
m_lMediaDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR] <<= xProgress;
}
}
// Now that we have a target window into which we can load, reinit the
interaction handler to have this
// window as its parent for modal dialogs and ensure the window is
visible
css::uno::Reference< css::task::XInteractionHandler > xInteraction =
m_lMediaDescriptor.getUnpackedValueOrDefault(
-
utl::MediaDescriptor::PROP_INTERACTIONHANDLER(),
+
utl::MediaDescriptor::PROP_INTERACTIONHANDLER,
css::uno::Reference< css::task::XInteractionHandler >());
css::uno::Reference<css::lang::XInitialization> xHandler(xInteraction,
css::uno::UNO_QUERY);
if (xHandler.is())
@@ -1193,7 +1193,7 @@ css::uno::Reference< css::uno::XInterface >
LoadEnv::impl_searchLoader()
// Otherwise...
// We need this type information to locate a registered frame loader
// Without such information we can't work!
- OUString sType =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME(),
OUString());
+ OUString sType =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TYPENAME,
OUString());
if (sType.isEmpty())
throw LoadEnvException(LoadEnvException::ID_INVALID_MEDIADESCRIPTOR);
@@ -1268,9 +1268,9 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
// or better it's not allowed for some requests in general :-)
if (
( ! TargetHelper::matchSpecialTarget(m_sTarget,
TargetHelper::ESpecialTarget::Default)
) ||
-
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
, false) ||
+
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE
, false) ||
//
(m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN()
, false) == sal_True) ||
-
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(),
false)
+
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW,
false)
)
{
return css::uno::Reference< css::frame::XFrame >();
@@ -1299,7 +1299,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
// Note: To detect if a document was already loaded before
// we check URLs here only. But might the existing and the required
// document has different versions! Then its URLs are the same...
- sal_Int16 nNewVersion =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VERSION(),
sal_Int16(-1));
+ sal_Int16 nNewVersion =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VERSION,
sal_Int16(-1));
// will be used to save the first hidden frame referring the searched model
// Normally we are interested on visible frames... but if there is no such
visible
@@ -1367,7 +1367,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
lOldDocDescriptor = xModel->getArgs();
if (lOldDocDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_VERSION(), sal_Int32(-1))
+ utl::MediaDescriptor::PROP_VERSION, sal_Int32(-1))
!= nNewVersion)
{
xTask.clear();
@@ -1378,7 +1378,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchAlreadyLoaded()
// Hidden frames are special.
// They will be used as "last chance" if there is no visible frame
pointing to the same model.
// Safe the result but continue with current loop might be looking
for other visible frames.
- bool bIsHidden =
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
false);
+ bool bIsHidden =
lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN,
false);
if ( bIsHidden && ! xHiddenTask.is() )
{
xHiddenTask = xTask;
@@ -1440,7 +1440,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchRecycleTarget()
// It doesn't matter if somewhere wants to create a new view
// or open a new untitled document...
// The only exception from that - hidden frames!
- if
(m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
false))
+ if
(m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN,
false))
return css::uno::Reference< css::frame::XFrame >();
css::uno::Reference< css::frame::XFramesSupplier > xSupplier =
css::frame::Desktop::create( m_xContext );
@@ -1458,8 +1458,8 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchRecycleTarget()
// These states indicates a wish for creation of a new view in general.
if (
-
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE()
, false) ||
-
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW(),
false)
+
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ASTEMPLATE
, false) ||
+
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_OPENNEWVIEW,
false)
)
{
return css::uno::Reference< css::frame::XFrame >();
@@ -1543,7 +1543,7 @@ css::uno::Reference< css::frame::XFrame >
LoadEnv::impl_searchRecycleTarget()
utl::MediaDescriptor lOldDocDescriptor(xModel->getArgs());
// replaceable document
- if
(!lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REPLACEABLE(),
false))
+ if
(!lOldDocDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_REPLACEABLE,
false))
return css::uno::Reference< css::frame::XFrame >();
bReactivateOldControllerOnError = xOldDoc->suspend(true);
@@ -1582,8 +1582,8 @@ void LoadEnv::impl_reactForLoadingState()
// Note: We show new created frames here only.
// We don't hide already visible frames here ...
css::uno::Reference< css::awt::XWindow > xWindow =
m_xTargetFrame->getContainerWindow();
- bool bHidden =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN(),
false);
- bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED(),
false);
+ bool bHidden =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_HIDDEN,
false);
+ bool bMinimized =
m_lMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_MINIMIZED,
false);
if (bMinimized)
{
@@ -1603,7 +1603,7 @@ void LoadEnv::impl_reactForLoadingState()
// Note: Only if an existing property "FrameName" is given by this
media descriptor,
// it should be used. Otherwise we should do nothing. May be the
outside code has already
// set a frame name on the target!
- utl::MediaDescriptor::const_iterator pFrameName =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FRAMENAME());
+ utl::MediaDescriptor::const_iterator pFrameName =
m_lMediaDescriptor.find(utl::MediaDescriptor::PROP_FRAMENAME);
if (pFrameName != m_lMediaDescriptor.end())
{
OUString sFrameName;
@@ -1699,7 +1699,7 @@ void LoadEnv::impl_makeFrameWindowVisible(const
css::uno::Reference< css::awt::X
return;
bool const preview( m_lMediaDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_PREVIEW(), false) );
+ utl::MediaDescriptor::PROP_PREVIEW, false) );
bool bForceFrontAndFocus(false);
if ( !preview )
@@ -1754,7 +1754,7 @@ void LoadEnv::impl_applyPersistentWindowState(const
css::uno::Reference< css::aw
// no filter -> no module -> no persistent window state
OUString sFilter = m_lMediaDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_FILTERNAME(),
+ utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
if (sFilter.isEmpty())
return;
diff --git a/framework/source/services/autorecovery.cxx
b/framework/source/services/autorecovery.cxx
index 193504354306..ebcae2a0862b 100644
--- a/framework/source/services/autorecovery.cxx
+++ b/framework/source/services/autorecovery.cxx
@@ -2374,11 +2374,11 @@ void AutoRecovery::implts_registerDocument(const
css::uno::Reference< css::frame
aCacheLock.unlock();
- utl::MediaDescriptor lDescriptor(xDocument->getArgs2( {
utl::MediaDescriptor::PROP_FILTERNAME(),
utl::MediaDescriptor::PROP_NOAUTOSAVE() } ));
+ utl::MediaDescriptor lDescriptor(xDocument->getArgs2( {
utl::MediaDescriptor::PROP_FILTERNAME, utl::MediaDescriptor::PROP_NOAUTOSAVE }
));
// check if this document must be ignored for recovery !
// Some use cases don't wish support for AutoSave/Recovery ... as e.g.
OLE-Server / ActiveX Control etcpp.
- bool bNoAutoSave =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(),
false);
+ bool bNoAutoSave =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE,
false);
if (bNoAutoSave)
return;
@@ -2433,7 +2433,7 @@ void AutoRecovery::implts_registerDocument(const
css::uno::Reference< css::frame
// and save an information about the real used filter by this document.
// We save this document with DefaultFilter ... and load it with the
RealFilter.
implts_specifyDefaultFilterAndExtension(aNew);
- aNew.RealFilter =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME()
, OUString());
+ aNew.RealFilter =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
// Further we must know, if this document base on a template.
// Then we must load it in a different way.
@@ -2626,16 +2626,16 @@ void AutoRecovery::implts_markDocumentAsSaved(const
css::uno::Reference< css::fr
aInfo.NewTempURL.clear();
utl::MediaDescriptor lDescriptor(aInfo.Document->getArgs());
- aInfo.RealFilter =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME(),
OUString());
+ aInfo.RealFilter =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_FILTERNAME,
OUString());
css::uno::Reference< css::frame::XTitle > xDocTitle(xDocument,
css::uno::UNO_QUERY);
if (xDocTitle.is ())
aInfo.Title = xDocTitle->getTitle ();
else
{
- aInfo.Title =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TITLE() ,
OUString());
+ aInfo.Title =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_TITLE,
OUString());
if (aInfo.Title.isEmpty())
- aInfo.Title =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTTITLE(),
OUString());
+ aInfo.Title =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTTITLE,
OUString());
}
aInfo.UsedForSaving = false;
@@ -2796,7 +2796,7 @@ bool
lc_checkIfSaveForbiddenByArguments(AutoRecovery::TDocumentInfo const & rInf
return true;
utl::MediaDescriptor lDescriptor(rInfo.Document->getArgs());
- bool bNoAutoSave =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE(),
false);
+ bool bNoAutoSave =
lDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_NOAUTOSAVE,
false);
return bNoAutoSave;
}
@@ -2989,24 +2989,24 @@ void AutoRecovery::implts_saveOneDoc(const OUString&
// stored with password
utl::MediaDescriptor lNewArgs;
css::uno::Sequence< css::beans::NamedValue > aEncryptionData =
-
lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA(),
+
lOldArgs.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ENCRYPTIONDATA,
css::uno::Sequence< css::beans::NamedValue >());
if (aEncryptionData.hasElements())
- lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA()] <<=
aEncryptionData;
+ lNewArgs[utl::MediaDescriptor::PROP_ENCRYPTIONDATA] <<=
aEncryptionData;
// Further it must be saved using the default file format of that
application.
// Otherwise we will some data lost.
if (!rInfo.DefaultFilter.isEmpty())
- lNewArgs[utl::MediaDescriptor::PROP_FILTERNAME()] <<=
rInfo.DefaultFilter;
+ lNewArgs[utl::MediaDescriptor::PROP_FILTERNAME] <<=
rInfo.DefaultFilter;
// prepare frame/document/mediadescriptor in a way, that it uses OUR
progress .-)
if (xExternalProgress.is())
- lNewArgs[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<=
xExternalProgress;
+ lNewArgs[utl::MediaDescriptor::PROP_STATUSINDICATOR] <<=
xExternalProgress;
impl_establishProgress(rInfo, lNewArgs, css::uno::Reference<
css::frame::XFrame >());
// #i66598# use special handling of property "DocumentBaseURL" (it must be
an empty string!)
// for make hyperlinks working
- lNewArgs[utl::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
+ lNewArgs[utl::MediaDescriptor::PROP_DOCUMENTBASEURL] <<= OUString();
// try to save this document as a new temp file every time.
// Mark AutoSave state as "INCOMPLETE" if it failed.
@@ -3150,14 +3150,14 @@ AutoRecovery::ETimerType
AutoRecovery::implts_openDocs(const DispatchParams& aPa
utl::MediaDescriptor lDescriptor;
// it's a UI feature - so the "USER" itself must be set as referrer
- lDescriptor[utl::MediaDescriptor::PROP_REFERRER()] <<=
OUString(REFERRER_USER);
- lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE()] <<= OUString();
+ lDescriptor[utl::MediaDescriptor::PROP_REFERRER] <<=
OUString(REFERRER_USER);
+ lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE] <<= OUString();
// recovered documents are loaded hidden, and shown all at once, later
- lDescriptor[utl::MediaDescriptor::PROP_HIDDEN()] <<= true;
+ lDescriptor[utl::MediaDescriptor::PROP_HIDDEN] <<= true;
if (aParams.m_xProgress.is())
- lDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR()] <<=
aParams.m_xProgress;
+ lDescriptor[utl::MediaDescriptor::PROP_STATUSINDICATOR] <<=
aParams.m_xProgress;
bool bBackupWasTried = (
((info.DocumentState &
DocState::TryLoadBackup ) == DocState::TryLoadBackup) || // temp. state!
@@ -3192,13 +3192,13 @@ AutoRecovery::ETimerType
AutoRecovery::implts_openDocs(const DispatchParams& aPa
else if (!info.TemplateURL.isEmpty())
{
sLoadOriginalURL = info.TemplateURL;
- lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= true;
- lDescriptor[utl::MediaDescriptor::PROP_TEMPLATENAME()] <<=
info.TemplateURL;
+ lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE] <<= true;
+ lDescriptor[utl::MediaDescriptor::PROP_TEMPLATENAME] <<=
info.TemplateURL;
}
else if (!info.FactoryURL.isEmpty())
{
sLoadOriginalURL = info.FactoryURL;
- lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE()] <<= true;
+ lDescriptor[utl::MediaDescriptor::PROP_ASTEMPLATE] <<= true;
}
// A "Salvaged" item must exists every time. The core can make
something special then for recovery.
@@ -3208,7 +3208,7 @@ AutoRecovery::ETimerType
AutoRecovery::implts_openDocs(const DispatchParams& aPa
{
sURL = sLoadBackupURL;
info.DocumentState |= DocState::TryLoadBackup;
- lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE()] <<=
sLoadOriginalURL;
+ lDescriptor[utl::MediaDescriptor::PROP_SALVAGEDFILE] <<=
sLoadOriginalURL;
}
else if (!sLoadOriginalURL.isEmpty())
{
@@ -3259,7 +3259,7 @@ AutoRecovery::ETimerType
AutoRecovery::implts_openDocs(const DispatchParams& aPa
if (!info.RealFilter.isEmpty())
{
utl::MediaDescriptor lPatchDescriptor(info.Document->getArgs());
- lPatchDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<=
info.RealFilter;
+ lPatchDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<=
info.RealFilter;
info.Document->attachResource(info.Document->getURL(),
lPatchDescriptor.getAsConstPropertyValueList());
// do *not* use sURL here. In case this points to the recovery
file, it has already been passed
// to recoverFromFile. Also, passing it here is logically
wrong, as attachResource is intended
@@ -3318,9 +3318,9 @@ void AutoRecovery::implts_openOneDoc(const OUString&
sURL ,
// put the filter name into the descriptor - we're not going to
involve any type detection, so
// the document might be lost without the FilterName property
if ( (rInfo.DocumentState & DocState::TryLoadOriginal) ==
DocState::TryLoadOriginal)
- lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME() ] <<=
rInfo.RealFilter;
+ lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME ] <<=
rInfo.RealFilter;
else
- lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME() ] <<=
rInfo.DefaultFilter;
+ lDescriptor[ utl::MediaDescriptor::PROP_FILTERNAME ] <<=
rInfo.DefaultFilter;
if ( sURL == rInfo.FactoryURL )
{
@@ -3336,7 +3336,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&
sURL ,
else
{
OUString sFilterName;
- lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>=
sFilterName;
+ lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] >>= sFilterName;
if (!sFilterName.isEmpty()
&& ( sFilterName == "Calc MS Excel 2007 XML"
|| sFilterName == "Impress MS PowerPoint 2007 XML"
@@ -3353,12 +3353,12 @@ void AutoRecovery::implts_openOneDoc(const OUString&
sURL ,
m_xContext->getServiceManager()->createInstanceWithContext(
"com.sun.star.comp.oox.FormatDetector", m_xContext),
UNO_QUERY_THROW);
- lDescriptor[utl::MediaDescriptor::PROP_URL()] <<= sURL;
+ lDescriptor[utl::MediaDescriptor::PROP_URL] <<= sURL;
Sequence< css::beans::PropertyValue > aDescriptorSeq =
lDescriptor.getAsConstPropertyValueList();
OUString sType = xDetection->detect(aDescriptorSeq);
OUString sNewFilterName;
- lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] >>=
sNewFilterName;
+ lDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] >>=
sNewFilterName;
if (!sType.isEmpty() && sNewFilterName == sFilterName)
{
// Filter detection was okay, update media descriptor with
one received from FilterDetect
@@ -3370,7 +3370,7 @@ void AutoRecovery::implts_openOneDoc(const OUString&
sURL ,
Reference< XDocumentRecovery > xDocRecover( xModel,
UNO_QUERY_THROW );
xDocRecover->recoverFromFile(
sURL,
- lDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_SALVAGEDFILE(), OUString() ),
+ lDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_SALVAGEDFILE, OUString() ),
lDescriptor.getAsConstPropertyValueList()
);
@@ -4088,7 +4088,7 @@ void AutoRecovery::impl_establishProgress(const
AutoRecovery::TDocumentInfo&
// Only if there is no progress, we can create our own one.
css::uno::Reference< css::task::XStatusIndicator > xInternalProgress;
css::uno::Reference< css::task::XStatusIndicator > xExternalProgress =
rArgs.getUnpackedValueOrDefault(
-
utl::MediaDescriptor::PROP_STATUSINDICATOR(),
+
utl::MediaDescriptor::PROP_STATUSINDICATOR,
css::uno::Reference< css::task::XStatusIndicator >() );
// Normally a progress is set from outside (e.g. by the CrashSave/Recovery
dialog, which uses our dispatch API).
@@ -4126,7 +4126,7 @@ void AutoRecovery::impl_establishProgress(const
AutoRecovery::TDocumentInfo&
// But inside the MediaDescriptor we must set our own create progress ...
// in case there is not already another progress set.
- rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR(),
xInternalProgress);
+ rArgs.createItemIfMissing(utl::MediaDescriptor::PROP_STATUSINDICATOR,
xInternalProgress);
}
void AutoRecovery::impl_forgetProgress(const AutoRecovery::TDocumentInfo&
rInfo ,
@@ -4155,7 +4155,7 @@ void AutoRecovery::impl_forgetProgress(const
AutoRecovery::TDocumentInfo&
xFrameProps->setPropertyValue(FRAME_PROPNAME_ASCII_INDICATORINTERCEPTION,
css::uno::makeAny(css::uno::Reference< css::task::XStatusIndicator >()));
// forget progress inside list of arguments.
- utl::MediaDescriptor::iterator pArg =
rArgs.find(utl::MediaDescriptor::PROP_STATUSINDICATOR());
+ utl::MediaDescriptor::iterator pArg =
rArgs.find(utl::MediaDescriptor::PROP_STATUSINDICATOR);
if (pArg != rArgs.end())
{
rArgs.erase(pArg);
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 1664040e76cc..42d6163dcf8b 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1850,7 +1850,7 @@ bool ToolBarManager::IsPluginMode() const
{
Sequence< PropertyValue > aSeq = xModel->getArgs();
utl::MediaDescriptor aMediaDescriptor( aSeq );
- bPluginMode =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VIEWONLY(),
false );
+ bPluginMode =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_VIEWONLY,
false );
}
}
diff --git a/hwpfilter/source/hwpreader.cxx b/hwpfilter/source/hwpreader.cxx
index 753697ee688e..43f48d535a0a 100644
--- a/hwpfilter/source/hwpreader.cxx
+++ b/hwpfilter/source/hwpreader.cxx
@@ -148,7 +148,7 @@ sal_Bool HwpReader::filter(const Sequence< PropertyValue >&
rDescriptor)
aDescriptor.addInputStream();
Reference< XInputStream > xInputStream(
- aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()],
UNO_QUERY_THROW);
+ aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM], UNO_QUERY_THROW);
std::unique_ptr<HStream> stream(new HStream);
Sequence < sal_Int8 > aBuffer;
@@ -4911,7 +4911,7 @@ OUString HwpImportFilter::detect( css::uno::Sequence<
css::beans::PropertyValue
aDescriptor.addInputStream();
Reference< XInputStream > xInputStream(
- aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()], UNO_QUERY);
+ aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM], UNO_QUERY);
if (xInputStream.is())
{
diff --git a/include/unotools/mediadescriptor.hxx
b/include/unotools/mediadescriptor.hxx
index bba9ea9a9ab4..1e4b3c064d1c 100644
--- a/include/unotools/mediadescriptor.hxx
+++ b/include/unotools/mediadescriptor.hxx
@@ -57,50 +57,50 @@ class UNOTOOLS_DLLPUBLIC MediaDescriptor : public
comphelper::SequenceAsHashMap
does not work as expected under windows (under unix it
works as well)
these way must be used :-(
*/
- static const OUString& PROP_ABORTED();
- static const OUString& PROP_ASTEMPLATE();
- static const OUString& PROP_COMPONENTDATA();
- static const OUString& PROP_DOCUMENTSERVICE();
- static const OUString& PROP_ENCRYPTIONDATA();
- static const OUString& PROP_FILENAME();
- static const OUString& PROP_FILTERNAME();
- static const OUString& PROP_FILTERPROVIDER();
- static const OUString& PROP_FILTEROPTIONS();
- static const OUString& PROP_FRAME();
- static const OUString& PROP_FRAMENAME();
- static const OUString& PROP_HIDDEN();
- static const OUString& PROP_INPUTSTREAM();
- static const OUString& PROP_INTERACTIONHANDLER();
- static const OUString& PROP_AUTHENTICATIONHANDLER();
- static const OUString& PROP_JUMPMARK();
- static const OUString& PROP_MACROEXECUTIONMODE();
- static const OUString& PROP_MEDIATYPE();
- static const OUString& PROP_MINIMIZED();
- static const OUString& PROP_NOAUTOSAVE();
- static const OUString& PROP_OPENNEWVIEW();
- static const OUString& PROP_OUTPUTSTREAM();
- static const OUString& PROP_PASSWORD();
- static const OUString& PROP_POSTDATA();
- static const OUString& PROP_PREVIEW();
- static const OUString& PROP_READONLY();
- static const OUString& PROP_REFERRER();
- static const OUString& PROP_REPLACEABLE();
- static const OUString& PROP_SALVAGEDFILE();
- static const OUString& PROP_STATUSINDICATOR();
- static const OUString& PROP_STREAM();
- static const OUString& PROP_STREAMFOROUTPUT();
- static const OUString& PROP_TEMPLATENAME();
- static const OUString& PROP_TITLE();
- static const OUString& PROP_TYPENAME();
- static const OUString& PROP_UCBCONTENT();
- static const OUString& PROP_UPDATEDOCMODE();
- static const OUString& PROP_URL();
- static const OUString& PROP_VERSION();
- static const OUString& PROP_DOCUMENTTITLE();
- static const OUString& PROP_MODEL();
- static const OUString& PROP_VIEWONLY();
- static const OUString& PROP_DOCUMENTBASEURL();
- static const OUString& PROP_SUGGESTEDSAVEASNAME();
+ static constexpr OUStringLiteral PROP_ABORTED = u"Aborted";
+ static constexpr OUStringLiteral PROP_ASTEMPLATE = u"AsTemplate";
+ static constexpr OUStringLiteral PROP_COMPONENTDATA = u"ComponentData";
+ static constexpr OUStringLiteral PROP_DOCUMENTSERVICE =
u"DocumentService";
+ static constexpr OUStringLiteral PROP_ENCRYPTIONDATA =
u"EncryptionData";
+ static constexpr OUStringLiteral PROP_FILENAME = u"FileName";
+ static constexpr OUStringLiteral PROP_FILTERNAME = u"FilterName";
+ static constexpr OUStringLiteral PROP_FILTERPROVIDER =
u"FilterProvider";
+ static constexpr OUStringLiteral PROP_FILTEROPTIONS = u"FilterOptions";
+ static constexpr OUStringLiteral PROP_FRAME = u"Frame";
+ static constexpr OUStringLiteral PROP_FRAMENAME = u"FrameName";
+ static constexpr OUStringLiteral PROP_HIDDEN = u"Hidden";
+ static constexpr OUStringLiteral PROP_INPUTSTREAM = u"InputStream";
+ static constexpr OUStringLiteral PROP_INTERACTIONHANDLER =
u"InteractionHandler";
+ static constexpr OUStringLiteral PROP_AUTHENTICATIONHANDLER =
u"AuthenticationHandler";
+ static constexpr OUStringLiteral PROP_JUMPMARK = u"JumpMark";
+ static constexpr OUStringLiteral PROP_MACROEXECUTIONMODE =
u"MacroExecutionMode";
+ static constexpr OUStringLiteral PROP_MEDIATYPE = u"MediaType";
+ static constexpr OUStringLiteral PROP_MINIMIZED = u"Minimized";
+ static constexpr OUStringLiteral PROP_NOAUTOSAVE = u"NoAutoSave";
+ static constexpr OUStringLiteral PROP_OPENNEWVIEW = u"OpenNewView";
+ static constexpr OUStringLiteral PROP_OUTPUTSTREAM = u"OutputStream";
+ static constexpr OUStringLiteral PROP_PASSWORD = u"Password";
+ static constexpr OUStringLiteral PROP_POSTDATA = u"PostData";
+ static constexpr OUStringLiteral PROP_PREVIEW = u"Preview";
+ static constexpr OUStringLiteral PROP_READONLY = u"ReadOnly";
+ static constexpr OUStringLiteral PROP_REFERRER = u"Referer";
+ static constexpr OUStringLiteral PROP_REPLACEABLE = u"Replaceable";
+ static constexpr OUStringLiteral PROP_SALVAGEDFILE = u"SalvagedFile";
+ static constexpr OUStringLiteral PROP_STATUSINDICATOR =
u"StatusIndicator";
+ static constexpr OUStringLiteral PROP_STREAM = u"Stream";
+ static constexpr OUStringLiteral PROP_STREAMFOROUTPUT =
u"StreamForOutput";
+ static constexpr OUStringLiteral PROP_TEMPLATENAME = u"TemplateName";
+ static constexpr OUStringLiteral PROP_TITLE = u"Title";
+ static constexpr OUStringLiteral PROP_TYPENAME = u"TypeName";
+ static constexpr OUStringLiteral PROP_UCBCONTENT = u"UCBContent";
+ static constexpr OUStringLiteral PROP_UPDATEDOCMODE = u"UpdateDocMode";
+ static constexpr OUStringLiteral PROP_URL = u"URL";
+ static constexpr OUStringLiteral PROP_VERSION = u"Version";
+ static constexpr OUStringLiteral PROP_DOCUMENTTITLE = u"DocumentTitle";
+ static constexpr OUStringLiteral PROP_MODEL = u"Model";
+ static constexpr OUStringLiteral PROP_VIEWONLY = u"ViewOnly";
+ static constexpr OUStringLiteral PROP_DOCUMENTBASEURL =
u"DocumentBaseURL";
+ static constexpr OUStringLiteral PROP_SUGGESTEDSAVEASNAME =
u"SuggestedSaveAsName";
// interface
public:
diff --git a/oox/source/core/filterbase.cxx b/oox/source/core/filterbase.cxx
index ea22d1fbb8bc..95545374e8a4 100644
--- a/oox/source/core/filterbase.cxx
+++ b/oox/source/core/filterbase.cxx
@@ -505,12 +505,12 @@ void SAL_CALL FilterBase::cancel()
Reference< XInputStream > FilterBase::implGetInputStream( MediaDescriptor&
rMediaDesc ) const
{
- return rMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INPUTSTREAM(), Reference< XInputStream >() );
+ return rMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INPUTSTREAM, Reference< XInputStream >() );
}
Reference< XStream > FilterBase::implGetOutputStream( MediaDescriptor&
rMediaDesc ) const
{
- return rMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_STREAMFOROUTPUT(), Reference< XStream >() );
+ return rMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_STREAMFOROUTPUT, Reference< XStream >() );
}
bool FilterBase::implFinalizeExport( MediaDescriptor& /*rMediaDescriptor*/ )
@@ -545,10 +545,10 @@ void FilterBase::setMediaDescriptor( const Sequence<
PropertyValue >& rMediaDesc
break;
}
- mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL(), OUString() );
- mxImpl->mxTargetFrame = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_FRAME(), Reference< XFrame >() );
- mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_STATUSINDICATOR(), Reference< XStatusIndicator >() );
- mxImpl->mxInteractionHandler =
mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INTERACTIONHANDLER(), Reference< XInteractionHandler >()
);
+ mxImpl->maFileUrl = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL, OUString() );
+ mxImpl->mxTargetFrame = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_FRAME, Reference< XFrame >() );
+ mxImpl->mxStatusIndicator = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_STATUSINDICATOR, Reference< XStatusIndicator >() );
+ mxImpl->mxInteractionHandler =
mxImpl->maMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_INTERACTIONHANDLER, Reference< XInteractionHandler >() );
mxImpl->mxParentShape = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
"ParentShape", mxImpl->mxParentShape );
mxImpl->maFilterData = mxImpl->maMediaDesc.getUnpackedValueOrDefault(
"FilterData", Sequence< PropertyValue >() );
diff --git a/oox/source/core/filterdetect.cxx b/oox/source/core/filterdetect.cxx
index 68dbf6d802ec..455d9a8b5c19 100644
--- a/oox/source/core/filterdetect.cxx
+++ b/oox/source/core/filterdetect.cxx
@@ -315,7 +315,7 @@ comphelper::DocPasswordVerifierResult
PasswordVerifier::verifyEncryptionData( co
Reference< XInputStream > FilterDetect::extractUnencryptedPackage(
MediaDescriptor& rMediaDescriptor ) const
{
// try the plain input stream
- Reference<XInputStream> xInputStream( rMediaDescriptor[
MediaDescriptor::PROP_INPUTSTREAM() ], UNO_QUERY );
+ Reference<XInputStream> xInputStream( rMediaDescriptor[
MediaDescriptor::PROP_INPUTSTREAM ], UNO_QUERY );
if( !xInputStream.is() || lclIsZipPackage( mxContext, xInputStream ) )
return xInputStream;
@@ -357,7 +357,7 @@ Reference< XInputStream >
FilterDetect::extractUnencryptedPackage( MediaDescript
if( !aEncryptionData.hasElements() )
{
- rMediaDescriptor[ MediaDescriptor::PROP_ABORTED() ] <<=
true;
+ rMediaDescriptor[ MediaDescriptor::PROP_ABORTED ] <<= true;
}
else
{
@@ -370,7 +370,7 @@ Reference< XInputStream >
FilterDetect::extractUnencryptedPackage( MediaDescript
// if decryption was unsuccessful (corrupted file or any
other reason)
if (!aDecryptor.decrypt(xTempStream))
{
- rMediaDescriptor[ MediaDescriptor::PROP_ABORTED() ]
<<= true;
+ rMediaDescriptor[ MediaDescriptor::PROP_ABORTED ] <<=
true;
}
else
{
@@ -436,7 +436,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence<
PropertyValue >& rMediaDescSeq
aParser.registerNamespace( NMSP_packageContentTypes );
OUString aFileName;
- aMediaDescriptor[utl::MediaDescriptor::PROP_URL()] >>= aFileName;
+ aMediaDescriptor[utl::MediaDescriptor::PROP_URL] >>= aFileName;
aParser.setDocumentHandler( new FilterDetectDocHandler( mxContext,
aFilterName, aFileName ) );
@@ -448,7 +448,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence<
PropertyValue >& rMediaDescSeq
}
catch( const Exception& )
{
- if ( aMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_ABORTED(), false ) )
+ if ( aMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_ABORTED, false ) )
/* The user chose to abort detection, e.g. by hitting 'Cancel' in
the password input dialog,
so we have to return non-empty type name to abort the
detection loop. The loading code is
supposed to check whether the "Aborted" flag is present in the
descriptor, and to not attempt
@@ -459,7 +459,7 @@ OUString SAL_CALL FilterDetect::detect( Sequence<
PropertyValue >& rMediaDescSeq
already know that the file is OLE encrypted package, so trying
with other type detectors doesn't
make much sense anyway.
*/
- aFilterName = aMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME(), OUString() );
+ aFilterName = aMediaDescriptor.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME, OUString() );
}
// write back changed media descriptor members
diff --git a/oox/source/core/xmlfilterbase.cxx
b/oox/source/core/xmlfilterbase.cxx
index 9390cabd04de..6c7aaac65476 100644
--- a/oox/source/core/xmlfilterbase.cxx
+++ b/oox/source/core/xmlfilterbase.cxx
@@ -967,7 +967,7 @@ Reference< XInputStream >
XmlFilterBase::implGetInputStream( MediaDescriptor& rM
Reference<XStream> XmlFilterBase::implGetOutputStream( MediaDescriptor&
rMediaDescriptor ) const
{
const Sequence< NamedValue > aMediaEncData =
rMediaDescriptor.getUnpackedValueOrDefault(
- MediaDescriptor::PROP_ENCRYPTIONDATA(),
+ MediaDescriptor::PROP_ENCRYPTIONDATA,
Sequence< NamedValue >() );
if (aMediaEncData.getLength() == 0)
@@ -988,7 +988,7 @@ bool XmlFilterBase::implFinalizeExport( MediaDescriptor&
rMediaDescriptor )
bool bRet = true;
const Sequence< NamedValue > aMediaEncData =
rMediaDescriptor.getUnpackedValueOrDefault(
- MediaDescriptor::PROP_ENCRYPTIONDATA(),
+ MediaDescriptor::PROP_ENCRYPTIONDATA,
Sequence< NamedValue >() );
if (aMediaEncData.getLength())
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx
b/reportdesign/source/core/api/ReportDefinition.cxx
index 7bc13e65ae51..ad35f9e34354 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -201,7 +201,7 @@ static void lcl_extractAndStartStatusIndicator( const
utl::MediaDescriptor& _rDe
{
try
{
- _rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_STATUSINDICATOR(), _rxStatusIndicator );
+ _rxStatusIndicator = _rDescriptor.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_STATUSINDICATOR, _rxStatusIndicator );
if ( _rxStatusIndicator.is() )
{
_rxStatusIndicator->start( OUString(), sal_Int32(1000000) );
@@ -1320,7 +1320,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const
uno::Reference< embed::XS
xInfoSet->setPropertyValue("UsePrettyPrinting",
uno::makeAny(officecfg::Office::Common::Save::Document::PrettyPrinting::get()));
if ( officecfg::Office::Common::Save::URL::FileSystem::get() )
{
- const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL(),OUString())
);
+ const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL,
OUString()) );
xInfoSet->setPropertyValue("BaseURI", uno::makeAny(sVal));
}
const OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) );
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx
b/reportdesign/source/filter/xml/xmlfilter.cxx
index 18053c097630..b725e57259ee 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -429,7 +429,7 @@ bool ORptFilter::implImport( const Sequence< PropertyValue
>& rDescriptor )
};
utl::MediaDescriptor aDescriptor(rDescriptor);
uno::Reference<beans::XPropertySet> xProp =
comphelper::GenericPropertySet_CreateInstance(new
comphelper::PropertySetInfo(pMap));
- const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL(),OUString())
);
+ const OUString sVal(
aDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_DOCUMENTBASEURL,
OUString()) );
assert(!sVal.isEmpty()); // needed for relative URLs
xProp->setPropertyValue("BaseURI", uno::makeAny(sVal));
const OUString sHierarchicalDocumentName(
aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",OUString()) );
diff --git a/sc/source/filter/orcus/filterdetect.cxx
b/sc/source/filter/orcus/filterdetect.cxx
index 03b057a376d8..4e299f1d9371 100644
--- a/sc/source/filter/orcus/filterdetect.cxx
+++ b/sc/source/filter/orcus/filterdetect.cxx
@@ -63,11 +63,11 @@ css::uno::Sequence<OUString>
OrcusFormatDetect::getSupportedServiceNames()
OUString
OrcusFormatDetect::detect(css::uno::Sequence<css::beans::PropertyValue>&
rMediaDescSeq)
{
utl::MediaDescriptor aMediaDescriptor( rMediaDescSeq );
- bool bAborted =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED(),
false);
+ bool bAborted =
aMediaDescriptor.getUnpackedValueOrDefault(utl::MediaDescriptor::PROP_ABORTED,
false);
if (bAborted)
return OUString();
- css::uno::Reference<css::io::XInputStream>
xInputStream(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()],
css::uno::UNO_QUERY );
+ css::uno::Reference<css::io::XInputStream>
xInputStream(aMediaDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM],
css::uno::UNO_QUERY );
OStringBuffer aContent(xInputStream->available());
static const sal_Int32 nBytes = 4096;
diff --git a/sc/source/ui/unoobj/exceldetect.cxx
b/sc/source/ui/unoobj/exceldetect.cxx
index a56497f5cde3..a50f9994f4d2 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -131,13 +131,13 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
{
MediaDescriptor aMediaDesc(lDescriptor);
OUString aType;
- aMediaDesc[MediaDescriptor::PROP_TYPENAME()] >>= aType;
+ aMediaDesc[MediaDescriptor::PROP_TYPENAME] >>= aType;
if (aType.isEmpty())
// Type is not given. We can't proceed.
return OUString();
aMediaDesc.addInputStream();
- uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY);
+ uno::Reference<io::XInputStream>
xInStream(aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY);
if (!xInStream.is())
// No input stream.
return OUString();
@@ -149,7 +149,7 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
// BIFF8 is expected to contain a stream named "Workbook".
return OUString();
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 97 Vorlage/Template") : OUString("MS Excel 97");
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= isTemplate(aType) ?
OUString("MS Excel 97 Vorlage/Template") : OUString("MS Excel 97");
}
else if (aType == "calc_MS_Excel_95" || aType ==
"calc_MS_Excel_95_VorlageTemplate")
@@ -158,7 +158,7 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
if (!hasStream(xInStream, "Book"))
return OUString();
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 95 Vorlage/Template") : OUString("MS Excel 95");
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= isTemplate(aType) ?
OUString("MS Excel 95 Vorlage/Template") : OUString("MS Excel 95");
}
else if (aType == "calc_MS_Excel_5095" || aType ==
"calc_MS_Excel_5095_VorlageTemplate")
@@ -167,7 +167,7 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
if (!hasStream(xInStream, "Book"))
return OUString();
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 5.0/95 Vorlage/Template") : OUString("MS Excel 5.0/95");
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= isTemplate(aType) ?
OUString("MS Excel 5.0/95 Vorlage/Template") : OUString("MS Excel 5.0/95");
}
else if (aType == "calc_MS_Excel_40" || aType ==
"calc_MS_Excel_40_VorlageTemplate")
@@ -176,7 +176,7 @@ OUString ScExcelBiffDetect::detect(
uno::Sequence<beans::PropertyValue>& lDescri
if (!isExcel40(xInStream))
return OUString();
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= isTemplate(aType) ?
OUString("MS Excel 4.0 Vorlage/Template") : OUString("MS Excel 4.0");
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= isTemplate(aType) ?
OUString("MS Excel 4.0 Vorlage/Template") : OUString("MS Excel 4.0");
}
else
diff --git a/sc/source/ui/unoobj/scdetect.cxx b/sc/source/ui/unoobj/scdetect.cxx
index efe6d3c8993b..08d265a38397 100644
--- a/sc/source/ui/unoobj/scdetect.cxx
+++ b/sc/source/ui/unoobj/scdetect.cxx
@@ -264,8 +264,8 @@ static bool lcl_MayBeDBase( SvStream& rStream )
OUString SAL_CALL ScFilterDetect::detect( uno::Sequence<beans::PropertyValue>&
lDescriptor )
{
MediaDescriptor aMediaDesc( lDescriptor );
- OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME(), OUString() );
- uno::Reference< io::XInputStream > xStream (
aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM()], uno::UNO_QUERY );
+ OUString aTypeName = aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_TYPENAME, OUString() );
+ uno::Reference< io::XInputStream > xStream (
aMediaDesc[MediaDescriptor::PROP_INPUTSTREAM], uno::UNO_QUERY );
if ( !xStream.is() )
return OUString();
@@ -323,7 +323,7 @@ OUString SAL_CALL ScFilterDetect::detect(
uno::Sequence<beans::PropertyValue>& l
if (!pFilter)
return OUString();
- aMediaDesc[MediaDescriptor::PROP_FILTERNAME()] <<= pFilter->GetName();
+ aMediaDesc[MediaDescriptor::PROP_FILTERNAME] <<= pFilter->GetName();
aMediaDesc >> lDescriptor;
return aTypeName;
}
diff --git a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
index 360ae8ee97d2..b18db2bbce31 100644
--- a/scripting/source/provider/BrowseNodeFactoryImpl.cxx
+++ b/scripting/source/provider/BrowseNodeFactoryImpl.cxx
@@ -289,8 +289,8 @@ std::vector< Reference< browse::XBrowseNode > >
getAllBrowseNodes( const Referen
{
utl::MediaDescriptor aMD( model->getArgs() );
bool bDefault = false;
- bool bHidden = aMD.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_HIDDEN(), bDefault );
- bool bPreview = aMD.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_PREVIEW(), bDefault );
+ bool bHidden = aMD.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_HIDDEN, bDefault );
+ bool bPreview = aMD.getUnpackedValueOrDefault(
utl::MediaDescriptor::PROP_PREVIEW, bDefault );
if( !bHidden && !bPreview )
{
Reference< document::XEmbeddedScripts > xScripts( model,
UNO_QUERY );
diff --git a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
index b8ed1a055941..42a1d0a0fb77 100644
--- a/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
+++ b/sd/source/ui/framework/factories/BasicToolBarFactory.cxx
@@ -77,7 +77,7 @@ void SAL_CALL BasicToolBarFactory::initialize (const
Sequence<Any>& aArguments)
utl::MediaDescriptor aDescriptor (mxController->getModel()->getArgs());
if ( ! aDescriptor.getUnpackedValueOrDefault(
- utl::MediaDescriptor::PROP_PREVIEW(),
+ utl::MediaDescriptor::PROP_PREVIEW,
false))
{
// Register the factory for its supported tool bars.
diff --git a/sd/source/ui/unoidl/sddetect.cxx b/sd/source/ui/unoidl/sddetect.cxx
index 4856e4e1dea3..cfa50d14188a 100644
--- a/sd/source/ui/unoidl/sddetect.cxx
+++ b/sd/source/ui/unoidl/sddetect.cxx
@@ -51,8 +51,8 @@ SdFilterDetect::~SdFilterDetect()
OUString SAL_CALL SdFilterDetect::detect( Sequence< beans::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();
@@ -88,7 +88,7 @@ OUString SAL_CALL SdFilterDetect::detect( Sequence<
beans::PropertyValue >& lDes
{
pInStrm->Seek( STREAM_SEEK_TO_BEGIN );
- const OUString aFileName( aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL(), OUString() ) );
+ const OUString aFileName( aMediaDesc.getUnpackedValueOrDefault(
MediaDescriptor::PROP_URL, OUString() ) );
GraphicDescriptor aDesc( *pInStrm, &aFileName );
if( !aDesc.Detect() )
{
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index f420e2704a8c..11464dceb64a 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -212,7 +212,7 @@ static OUString impl_getFilter( const OUString& _rURL )
if ( xTypeDetection.is() )
{
utl::MediaDescriptor aDescr;
- aDescr[ utl::MediaDescriptor::PROP_URL() ] <<= _rURL;
+ aDescr[ utl::MediaDescriptor::PROP_URL ] <<= _rURL;
css::uno::Sequence< css::beans::PropertyValue > aDescrList =
aDescr.getAsConstPropertyValueList();
OUString sType = xTypeDetection->queryTypeByDescriptor(
aDescrList, true );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 00a9b3d517e6..5aa4cb57a688 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -376,23 +376,23 @@ ErrCode SfxFilterMatcher::GuessFilterControlDefaultUI(
SfxMedium& rMedium, std:
{
utl::MediaDescriptor aDescriptor;
- aDescriptor[utl::MediaDescriptor::PROP_URL() ] <<=
sURL;
- aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM() ] <<=
xInStream;
- aDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<=
rMedium.GetInteractionHandler();
+ aDescriptor[utl::MediaDescriptor::PROP_URL ] <<=
sURL;
+ aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM ] <<=
xInStream;
+ aDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER] <<=
rMedium.GetInteractionHandler();
SfxStringItem const * it = static_cast<SfxStringItem const *>(
rMedium.GetItemSet()->GetItem(SID_REFERER));
if (it != nullptr) {
- aDescriptor[utl::MediaDescriptor::PROP_REFERRER()]
+ aDescriptor[utl::MediaDescriptor::PROP_REFERRER]
<<= it->GetValue();
}
if ( !m_rImpl.aName.isEmpty() )
- aDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<=
m_rImpl.aName;
+ aDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE] <<=
m_rImpl.aName;
if ( pOldFilter )
{
- aDescriptor[utl::MediaDescriptor::PROP_TYPENAME() ] <<=
pOldFilter->GetTypeName();
- aDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<=
pOldFilter->GetFilterName();
+ aDescriptor[utl::MediaDescriptor::PROP_TYPENAME ] <<=
pOldFilter->GetTypeName();
+ aDescriptor[utl::MediaDescriptor::PROP_FILTERNAME] <<=
pOldFilter->GetFilterName();
}
uno::Sequence< beans::PropertyValue > lDescriptor =
aDescriptor.getAsConstPropertyValueList();
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx
b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 33c60ec0b268..160dfce000f5 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -612,7 +612,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl,
try {
OUString mimeType;
xDirProps->getPropertyValue(
- utl::MediaDescriptor::PROP_MEDIATYPE() )
+ utl::MediaDescriptor::PROP_MEDIATYPE )
>>= mimeType;
if (mimeType.startsWith(s_odfmime)) {
SAL_WARN("sfx", "readStream: refusing to recurse into
embedded document");
@@ -707,7 +707,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl,
try {
OUString mimeType;
xDirProps->getPropertyValue(
- utl::MediaDescriptor::PROP_MEDIATYPE() )
+ utl::MediaDescriptor::PROP_MEDIATYPE )
>>= mimeType;
if (mimeType.startsWith(s_odfmime)) {
SAL_WARN("sfx", "writeStream: refusing to recurse into
embedded document");
@@ -1262,11 +1262,11 @@ DocumentMetadataAccess::loadMetadataFromMedium(
uno::Reference<io::XInputStream> xIn;
utl::MediaDescriptor md(i_rMedium);
OUString URL;
- md[ utl::MediaDescriptor::PROP_URL() ] >>= URL;
+ md[ utl::MediaDescriptor::PROP_URL ] >>= URL;
OUString BaseURL;
- md[ utl::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= BaseURL;
+ md[ utl::MediaDescriptor::PROP_DOCUMENTBASEURL ] >>= BaseURL;
if (md.addInputStream()) {
- md[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
+ md[ utl::MediaDescriptor::PROP_INPUTSTREAM ] >>= xIn;
}
if (!xIn.is() && URL.isEmpty()) {
throw lang::IllegalArgumentException(
@@ -1309,7 +1309,7 @@ DocumentMetadataAccess::loadMetadataFromMedium(
}
... etc. - the rest is truncated
