Move MediaDescriptor from comphelper to unotools

...so it will be able to use SvtSecurityOptions internally.

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9

5 files changed, 14 insertions, 15 deletions

diff --git a/reportdesign/inc/ReportDefinition.hxx b/reportdesign/inc/ReportDefinition.hxx
index b4842117ab97..47f2d5a4d7cf 100644
--- a/reportdesign/inc/ReportDefinition.hxx
+++ b/reportdesign/inc/ReportDefinition.hxx
@@ -57,7 +57,7 @@ namespace rptui
 {
     class OReportModel;
 }
-namespace comphelper
+namespace utl
 {
     class MediaDescriptor;
 }
@@ -147,7 +147,7 @@ namespace reportdesign
 
         void notifyEvent(const OUString& _sEventName);
         void init();
-        void fillArgs(::comphelper::MediaDescriptor& _aDescriptor);
+        void fillArgs(utl::MediaDescriptor& _aDescriptor);
 
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTitle >             impl_getTitleHelper_throw();
         ::com::sun::star::uno::Reference< ::com::sun::star::frame::XUntitledNumbers >   impl_getUntitledHelper_throw();
diff --git a/reportdesign/source/core/api/ReportDefinition.cxx b/reportdesign/source/core/api/ReportDefinition.cxx
index d88832fd36e2..1b72bb5e270e 100644
--- a/reportdesign/source/core/api/ReportDefinition.cxx
+++ b/reportdesign/source/core/api/ReportDefinition.cxx
@@ -82,7 +82,7 @@
 #include <comphelper/broadcasthelper.hxx>
 #include <comphelper/documentconstants.hxx>
 #include <comphelper/genericpropertyset.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/namecontainer.hxx>
 #include <comphelper/namedvaluecollection.hxx>
@@ -203,7 +203,7 @@ void lcl_setModelReadOnly(const uno::Reference< embed::XStorage >& _xStorage,::b
 
     _rModel->SetReadOnly((nOpenMode & embed::ElementModes::WRITE) != embed::ElementModes::WRITE);
 }
-void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs )
+void lcl_stripLoadArguments( utl::MediaDescriptor& _rDescriptor, uno::Sequence< beans::PropertyValue >& _rArgs )
 {
     _rDescriptor.erase( OUString( "StatusIndicator" ) );
     _rDescriptor.erase( OUString( "InteractionHandler" ) );
@@ -211,7 +211,7 @@ void lcl_stripLoadArguments( ::comphelper::MediaDescriptor& _rDescriptor, uno::S
     _rDescriptor >> _rArgs;
 }
 // -----------------------------------------------------------------------------
-void lcl_extractAndStartStatusIndicator( const ::comphelper::MediaDescriptor& _rDescriptor, uno::Reference< task::XStatusIndicator >& _rxStatusIndicator,
+void lcl_extractAndStartStatusIndicator( const utl::MediaDescriptor& _rDescriptor, uno::Reference< task::XStatusIndicator >& _rxStatusIndicator,
     uno::Sequence< uno::Any >& _rCallArgs )
 {
     try
@@ -1263,7 +1263,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
 
     ::osl::MutexGuard aGuard(m_aMutex);
     ::connectivity::checkDisposed( ReportDefinitionBase::rBHelper.bDisposed );
-    ::comphelper::MediaDescriptor aDescriptor( _aArguments );
+    utl::MediaDescriptor aDescriptor( _aArguments );
 
     m_pImpl->m_pUndoManager->GetSfxUndoManager().EnableUndo( false );
     try
@@ -1280,7 +1280,7 @@ void SAL_CALL OReportDefinition::close( ::sal_Bool _bDeliverOwnership ) throw (u
     return sal_True;
 }
 // -----------------------------------------------------------------------------
-void OReportDefinition::fillArgs(::comphelper::MediaDescriptor& _aDescriptor)
+void OReportDefinition::fillArgs(utl::MediaDescriptor& _aDescriptor)
 {
     uno::Sequence<beans::PropertyValue> aComponentData;
     aComponentData = _aDescriptor.getUnpackedValueOrDefault("ComponentData",aComponentData);
@@ -1383,7 +1383,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
 {
     m_pImpl->m_xStorage = _xStorageToLoadFrom;
 
-    ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
+    utl::MediaDescriptor aDescriptor( _aMediaDescriptor );
     fillArgs(aDescriptor);
     aDescriptor.createItemIfMissing(OUString("Storage"),uno::makeAny(_xStorageToLoadFrom));
 
@@ -1412,7 +1412,7 @@ void OReportDefinition::impl_loadFromStorage_nolck_throw( const uno::Reference<
         uno::Reference<XComponent> xComponent(static_cast<OWeakObject*>(this),uno::UNO_QUERY);
         xImporter->setTargetDocument(xComponent);
 
-        ::comphelper::MediaDescriptor aTemp;
+        utl::MediaDescriptor aTemp;
         aTemp << aDelegatorArguments;
         xFilter->filter(aTemp.getAsConstPropertyValueList());
 
@@ -1443,7 +1443,7 @@ void SAL_CALL OReportDefinition::storeToStorage( const uno::Reference< embed::XS
     // create XStatusIndicator
     uno::Reference<task::XStatusIndicator> xStatusIndicator;
     uno::Sequence< uno::Any > aDelegatorArguments;
-    ::comphelper::MediaDescriptor aDescriptor( _aMediaDescriptor );
+    utl::MediaDescriptor aDescriptor( _aMediaDescriptor );
     lcl_extractAndStartStatusIndicator( aDescriptor, xStatusIndicator, aDelegatorArguments );
 
     // properties
diff --git a/reportdesign/source/filter/xml/xmlHelper.cxx b/reportdesign/source/filter/xml/xmlHelper.cxx
index 30830c5501ba..b11bd0f85fc6 100644
--- a/reportdesign/source/filter/xml/xmlHelper.cxx
+++ b/reportdesign/source/filter/xml/xmlHelper.cxx
@@ -23,7 +23,6 @@
 #include <xmloff/controlpropertyhdl.hxx>
 #include <connectivity/dbtools.hxx>
 #include <comphelper/propertysethelper.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/genericpropertyset.hxx>
 #include <com/sun/star/style/ParagraphAdjust.hpp>
 #include <com/sun/star/awt/TextAlign.hpp>
diff --git a/reportdesign/source/filter/xml/xmlfilter.cxx b/reportdesign/source/filter/xml/xmlfilter.cxx
index 1cdc9c46c4c2..bc50f664d2c7 100644
--- a/reportdesign/source/filter/xml/xmlfilter.cxx
+++ b/reportdesign/source/filter/xml/xmlfilter.cxx
@@ -40,7 +40,7 @@
 
 #include <comphelper/processfactory.hxx>
 #include <comphelper/genericpropertyset.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <cppuhelper/supportsservice.hxx>
 #include <xmloff/ProgressBarHelper.hxx>
 #include <sfx2/docfile.hxx>
@@ -538,7 +538,7 @@ sal_Bool ORptFilter::implImport( const Sequence< PropertyValue >& rDescriptor )
             { MAP_LEN( "StreamRelPath"), 0, &::getCppuType( (OUString *)0 ),             beans::PropertyAttribute::MAYBEVOID, 0 },
             { NULL, 0, 0, NULL, 0, 0 }
         };
-        ::comphelper::MediaDescriptor aDescriptor(rDescriptor);
+        utl::MediaDescriptor aDescriptor(rDescriptor);
         uno::Reference<beans::XPropertySet> xProp = comphelper::GenericPropertySet_CreateInstance(new comphelper::PropertySetInfo(pMap));
         const OUString sVal( aDescriptor.getUnpackedValueOrDefault(aDescriptor.PROP_DOCUMENTBASEURL(),OUString()) );
         xProp->setPropertyValue("BaseURI", uno::makeAny(sVal));
diff --git a/reportdesign/source/ui/report/ReportController.cxx b/reportdesign/source/ui/report/ReportController.cxx
index 50a4aea4a0c2..9820d40153b5 100644
--- a/reportdesign/source/ui/report/ReportController.cxx
+++ b/reportdesign/source/ui/report/ReportController.cxx
@@ -41,7 +41,7 @@
 #include "reportformula.hxx"
 
 #include <comphelper/documentconstants.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/property.hxx>
 #include <comphelper/sequenceashashmap.hxx>
@@ -1685,7 +1685,7 @@ void OReportController::impl_initialize( )
             m_xFormatter.set(util::NumberFormatter::create(m_xContext), UNO_QUERY_THROW);
             m_xFormatter->attachNumberFormatsSupplier(Reference< XNumberFormatsSupplier>(m_xReportDefinition,uno::UNO_QUERY));
 
-            ::comphelper::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() );
+            utl::MediaDescriptor aDescriptor( m_xReportDefinition->getArgs() );
             OUString sHierarchicalDocumentName;
             sHierarchicalDocumentName = aDescriptor.getUnpackedValueOrDefault("HierarchicalDocumentName",sHierarchicalDocumentName);