Move MediaDescriptor from comphelper to unotools

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

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9

7 files changed, 43 insertions, 45 deletions

diff --git a/sfx2/inc/pch/precompiled_sfx.hxx b/sfx2/inc/pch/precompiled_sfx.hxx
index cf955e951c8a..8a145d642dc8 100644
--- a/sfx2/inc/pch/precompiled_sfx.hxx
+++ b/sfx2/inc/pch/precompiled_sfx.hxx
@@ -66,7 +66,6 @@
 #include <com/sun/star/xml/sax/Writer.hpp>
 #include <com/sun/star/xml/sax/XSAXSerializable.hpp>
 #include <com/sun/star/xml/xpath/XPathAPI.hpp>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
@@ -534,7 +533,6 @@
 #include <comphelper/flagguard.hxx>
 #include <comphelper/interaction.hxx>
 #include <comphelper/makesequence.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/mimeconfighelper.hxx>
 #include <comphelper/namedvaluecollection.hxx>
 #include <comphelper/numberedcollection.hxx>
@@ -775,6 +773,7 @@
 #include <unotools/localedatawrapper.hxx>
 #include <unotools/localfilehelper.hxx>
 #include <unotools/localisationoptions.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <unotools/misccfg.hxx>
 #include <unotools/moduleoptions.hxx>
 #include <unotools/pathoptions.hxx>
diff --git a/sfx2/source/appl/fileobj.cxx b/sfx2/source/appl/fileobj.cxx
index ea8184a42a57..547a6344594b 100644
--- a/sfx2/source/appl/fileobj.cxx
+++ b/sfx2/source/appl/fileobj.cxx
@@ -33,7 +33,7 @@
 #include <com/sun/star/uno/Sequence.hxx>
 #include <sfx2/docfac.hxx>
 #include <com/sun/star/document/XTypeDetection.hpp>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/opengrf.hxx>
@@ -392,8 +392,8 @@ OUString impl_getFilter( const OUString& _rURL )
                 css::uno::UNO_QUERY );
         if ( xTypeDetection.is() )
         {
-            ::comphelper::MediaDescriptor aDescr;
-            aDescr[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= OUString( _rURL );
+            utl::MediaDescriptor aDescr;
+            aDescr[ utl::MediaDescriptor::PROP_URL() ] <<= OUString( _rURL );
             css::uno::Sequence< css::beans::PropertyValue > aDescrList =
                 aDescr.getAsConstPropertyValueList();
             OUString sType = xTypeDetection->queryTypeByDescriptor( aDescrList, sal_True );
diff --git a/sfx2/source/bastyp/fltfnc.cxx b/sfx2/source/bastyp/fltfnc.cxx
index 67e4ecb0481a..daee557adadb 100644
--- a/sfx2/source/bastyp/fltfnc.cxx
+++ b/sfx2/source/bastyp/fltfnc.cxx
@@ -72,7 +72,7 @@
 #include <com/sun/star/ucb/XContent.hpp>
 #include <unotools/pathoptions.hxx>
 #include <unotools/moduleoptions.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <tools/urlobj.hxx>
 
 #include <rtl/instance.hxx>
@@ -440,19 +440,19 @@ sal_uInt32  SfxFilterMatcher::GuessFilterControlDefaultUI( SfxMedium& rMedium, c
         // stream exists => deep detection (with preselection ... if possible)
         if (xInStream.is())
         {
-            ::comphelper::MediaDescriptor aDescriptor;
+            utl::MediaDescriptor aDescriptor;
 
-            aDescriptor[::comphelper::MediaDescriptor::PROP_URL()               ] <<= sURL;
-            aDescriptor[::comphelper::MediaDescriptor::PROP_INPUTSTREAM()       ] <<= xInStream;
-            aDescriptor[::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= rMedium.GetInteractionHandler();
+            aDescriptor[utl::MediaDescriptor::PROP_URL()               ] <<= sURL;
+            aDescriptor[utl::MediaDescriptor::PROP_INPUTSTREAM()       ] <<= xInStream;
+            aDescriptor[utl::MediaDescriptor::PROP_INTERACTIONHANDLER()] <<= rMedium.GetInteractionHandler();
 
             if ( !m_rImpl.aName.isEmpty() )
-                aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<= m_rImpl.aName;
+                aDescriptor[utl::MediaDescriptor::PROP_DOCUMENTSERVICE()] <<= m_rImpl.aName;
 
             if ( pOldFilter )
             {
-                aDescriptor[::comphelper::MediaDescriptor::PROP_TYPENAME()  ] <<= OUString( pOldFilter->GetTypeName()   );
-                aDescriptor[::comphelper::MediaDescriptor::PROP_FILTERNAME()] <<= OUString( pOldFilter->GetFilterName() );
+                aDescriptor[utl::MediaDescriptor::PROP_TYPENAME()  ] <<= OUString( pOldFilter->GetTypeName()   );
+                aDescriptor[utl::MediaDescriptor::PROP_FILTERNAME()] <<= OUString( pOldFilter->GetFilterName() );
             }
 
             uno::Sequence< beans::PropertyValue > lDescriptor = aDescriptor.getAsConstPropertyValueList();
diff --git a/sfx2/source/dialog/mailmodel.cxx b/sfx2/source/dialog/mailmodel.cxx
index a726242eeabb..99b4c7240c7e 100644
--- a/sfx2/source/dialog/mailmodel.cxx
+++ b/sfx2/source/dialog/mailmodel.cxx
@@ -65,7 +65,6 @@
 #include <tools/urlobj.hxx>
 #include <unotools/useroptions.hxx>
 #include <comphelper/extract.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <comphelper/sequenceasvector.hxx>
diff --git a/sfx2/source/doc/DocumentMetadataAccess.cxx b/sfx2/source/doc/DocumentMetadataAccess.cxx
index 489d5c7416af..1b823cc42893 100644
--- a/sfx2/source/doc/DocumentMetadataAccess.cxx
+++ b/sfx2/source/doc/DocumentMetadataAccess.cxx
@@ -40,7 +40,7 @@
 
 #include <comphelper/interaction.hxx>
 #include <comphelper/makesequence.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <comphelper/storagehelper.hxx>
 
@@ -552,7 +552,7 @@ readStream(struct DocumentMetadataAccess_Impl & i_rImpl,
                 try {
                     OUString mimeType;
                     xDirProps->getPropertyValue(
-                            ::comphelper::MediaDescriptor::PROP_MEDIATYPE() )
+                            utl::MediaDescriptor::PROP_MEDIATYPE() )
                         >>= mimeType;
                     if (mimeType.matchAsciiL(s_odfmime, sizeof(s_odfmime) - 1))
                     {
@@ -655,7 +655,7 @@ writeStream(struct DocumentMetadataAccess_Impl & i_rImpl,
             try {
                 OUString mimeType;
                 xDirProps->getPropertyValue(
-                        ::comphelper::MediaDescriptor::PROP_MEDIATYPE() )
+                        utl::MediaDescriptor::PROP_MEDIATYPE() )
                     >>= mimeType;
                 if (mimeType.matchAsciiL(s_odfmime, sizeof(s_odfmime) - 1)) {
                     OSL_TRACE("writeStream: "
@@ -1275,13 +1275,13 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
     lang::WrappedTargetException)
 {
     uno::Reference<io::XInputStream> xIn;
-    ::comphelper::MediaDescriptor md(i_rMedium);
+    utl::MediaDescriptor md(i_rMedium);
     OUString URL;
-    md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL;
+    md[ utl::MediaDescriptor::PROP_URL() ] >>= URL;
     OUString BaseURL;
-    md[ ::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= BaseURL;
+    md[ utl::MediaDescriptor::PROP_DOCUMENTBASEURL() ] >>= BaseURL;
     if (md.addInputStream()) {
-        md[ ::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
+        md[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
     }
     if (!xIn.is() && URL.isEmpty()) {
         throw lang::IllegalArgumentException(OUString(
@@ -1324,7 +1324,7 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
         }
     }
     uno::Reference<task::XInteractionHandler> xIH;
-    md[ ::comphelper::MediaDescriptor::PROP_INTERACTIONHANDLER() ] >>= xIH;
+    md[ utl::MediaDescriptor::PROP_INTERACTIONHANDLER() ] >>= xIH;
     loadMetadataFromStorage(xStorage, xBaseURI, xIH);
 }
 
@@ -1334,9 +1334,9 @@ DocumentMetadataAccess::storeMetadataToMedium(
 throw (uno::RuntimeException, lang::IllegalArgumentException,
     lang::WrappedTargetException)
 {
-    ::comphelper::MediaDescriptor md(i_rMedium);
+    utl::MediaDescriptor md(i_rMedium);
     OUString URL;
-    md[ ::comphelper::MediaDescriptor::PROP_URL() ] >>= URL;
+    md[ utl::MediaDescriptor::PROP_URL() ] >>= URL;
     if (URL.isEmpty()) {
         throw lang::IllegalArgumentException(OUString(
             "DocumentMetadataAccess::storeMetadataToMedium: "
@@ -1360,15 +1360,15 @@ throw (uno::RuntimeException, lang::IllegalArgumentException,
             "cannot get Storage"), *this);
     }
     // set MIME type of the storage
-    ::comphelper::MediaDescriptor::const_iterator iter
-        = md.find(::comphelper::MediaDescriptor::PROP_MEDIATYPE());
+    utl::MediaDescriptor::const_iterator iter
+        = md.find(utl::MediaDescriptor::PROP_MEDIATYPE());
     if (iter != md.end()) {
         uno::Reference< beans::XPropertySet > xProps(xStorage,
             uno::UNO_QUERY_THROW);
         try {
             // this is NOT supported in FileSystemStorage
             xProps->setPropertyValue(
-                ::comphelper::MediaDescriptor::PROP_MEDIATYPE(),
+                utl::MediaDescriptor::PROP_MEDIATYPE(),
                 iter->second);
         } catch (const uno::Exception &) { }
     }
diff --git a/sfx2/source/doc/SfxDocumentMetaData.cxx b/sfx2/source/doc/SfxDocumentMetaData.cxx
index f62bea6e0b3c..4f51051d1492 100644
--- a/sfx2/source/doc/SfxDocumentMetaData.cxx
+++ b/sfx2/source/doc/SfxDocumentMetaData.cxx
@@ -64,7 +64,7 @@
 #include <cppuhelper/basemutex.hxx>
 #include <cppuhelper/interfacecontainer.hxx>
 #include <comphelper/storagehelper.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/sequenceasvector.hxx>
 #include <sot/storage.hxx>
 #include <sfx2/docfile.hxx>
@@ -2028,13 +2028,13 @@ SfxDocumentMetaData::loadFromMedium(const OUString & URL,
            css::lang::WrappedTargetException, css::io::IOException)
 {
     css::uno::Reference<css::io::XInputStream> xIn;
-    ::comphelper::MediaDescriptor md(Medium);
+    utl::MediaDescriptor md(Medium);
     // if we have an URL parameter, it replaces the one in the media descriptor
     if (!URL.isEmpty()) {
-        md[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= URL;
+        md[ utl::MediaDescriptor::PROP_URL() ] <<= URL;
     }
     if (sal_True == md.addInputStream()) {
-        md[ ::comphelper::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
+        md[ utl::MediaDescriptor::PROP_INPUTSTREAM() ] >>= xIn;
     }
     css::uno::Reference<css::embed::XStorage> xStorage;
     try {
@@ -2069,9 +2069,9 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL,
     throw (css::uno::RuntimeException,
            css::lang::WrappedTargetException, css::io::IOException)
 {
-    ::comphelper::MediaDescriptor md(Medium);
+    utl::MediaDescriptor md(Medium);
     if (!URL.isEmpty()) {
-        md[ ::comphelper::MediaDescriptor::PROP_URL() ] <<= URL;
+        md[ utl::MediaDescriptor::PROP_URL() ] <<= URL;
     }
     SfxMedium aMedium(md.getAsConstPropertyValueList());
     css::uno::Reference<css::embed::XStorage> xStorage
@@ -2084,13 +2084,13 @@ SfxDocumentMetaData::storeToMedium(const OUString & URL,
                 *this);
     }
     // set MIME type of the storage
-    ::comphelper::MediaDescriptor::const_iterator iter
-        = md.find(::comphelper::MediaDescriptor::PROP_MEDIATYPE());
+    utl::MediaDescriptor::const_iterator iter
+        = md.find(utl::MediaDescriptor::PROP_MEDIATYPE());
     if (iter != md.end()) {
         css::uno::Reference< css::beans::XPropertySet > xProps(xStorage,
             css::uno::UNO_QUERY_THROW);
         xProps->setPropertyValue(
-            ::comphelper::MediaDescriptor::PROP_MEDIATYPE(),
+            utl::MediaDescriptor::PROP_MEDIATYPE(),
             iter->second);
     }
     storeToStorage(xStorage, md.getAsConstPropertyValueList());
diff --git a/sfx2/source/doc/docfile.cxx b/sfx2/source/doc/docfile.cxx
index 1aacb92e1018..0dd46584b46b 100644
--- a/sfx2/source/doc/docfile.cxx
+++ b/sfx2/source/doc/docfile.cxx
@@ -87,7 +87,7 @@
 #include <osl/file.hxx>
 
 #include <comphelper/storagehelper.hxx>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/docpasswordhelper.hxx>
 #include <tools/inetmime.hxx>
 #include <unotools/ucblockbytes.hxx>
@@ -2250,13 +2250,13 @@ void SfxMedium::GetLockingStream_Impl()
             // open the original document
             uno::Sequence< beans::PropertyValue > xProps;
             TransformItems( SID_OPENDOC, *GetItemSet(), xProps );
-            comphelper::MediaDescriptor aMedium( xProps );
+            utl::MediaDescriptor aMedium( xProps );
 
             aMedium.addInputStreamOwnLock();
 
             uno::Reference< io::XInputStream > xInputStream;
-            aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->m_xLockingStream;
-            aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
+            aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= pImp->m_xLockingStream;
+            aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= xInputStream;
 
             if ( !pImp->pTempFile && pImp->m_aName.isEmpty() )
             {
@@ -2336,7 +2336,7 @@ void SfxMedium::GetMedium_Impl()
             else
             {
                 TransformItems( SID_OPENDOC, *GetItemSet(), xProps );
-                comphelper::MediaDescriptor aMedium( xProps );
+                utl::MediaDescriptor aMedium( xProps );
 
                 if ( pImp->m_xLockingStream.is() && !bFromTempFile )
                 {
@@ -2347,8 +2347,8 @@ void SfxMedium::GetMedium_Impl()
                 {
                     if ( bFromTempFile )
                     {
-                        aMedium[comphelper::MediaDescriptor::PROP_URL()] <<= OUString( aFileName );
-                        aMedium.erase( comphelper::MediaDescriptor::PROP_READONLY() );
+                        aMedium[utl::MediaDescriptor::PROP_URL()] <<= OUString( aFileName );
+                        aMedium.erase( utl::MediaDescriptor::PROP_READONLY() );
                         aMedium.addInputStream();
                     }
                     else if ( ::utl::LocalFileHelper::IsLocalFile( GetURLObject().GetMainURL( INetURLObject::NO_DECODE ) ) )
@@ -2363,8 +2363,8 @@ void SfxMedium::GetMedium_Impl()
                     // the check is done in LockOrigFileOnDemand() for file and non-file URLs
 
                     //TODO/MBA: what happens if property is not there?!
-                    aMedium[comphelper::MediaDescriptor::PROP_STREAM()] >>= pImp->xStream;
-                    aMedium[comphelper::MediaDescriptor::PROP_INPUTSTREAM()] >>= pImp->xInputStream;
+                    aMedium[utl::MediaDescriptor::PROP_STREAM()] >>= pImp->xStream;
+                    aMedium[utl::MediaDescriptor::PROP_INPUTSTREAM()] >>= pImp->xInputStream;
                 }
 
                 GetContent();