Move MediaDescriptor from comphelper to unotools

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

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9

3 files changed, 11 insertions, 9 deletions

diff --git a/include/oox/core/filterbase.hxx b/include/oox/core/filterbase.hxx
index 8d1836f9ce6f..6280f9d0001c 100644
--- a/include/oox/core/filterbase.hxx
+++ b/include/oox/core/filterbase.hxx
@@ -55,6 +55,8 @@ namespace com { namespace sun { namespace star {
 
 namespace comphelper {
     class IDocPasswordVerifier;
+}
+namespace utl {
     class MediaDescriptor;
 }
 
@@ -141,7 +143,7 @@ public:
     ::comphelper::SequenceAsHashMap& getFilterData() const;
 
     /** Returns the media descriptor. */
-    ::comphelper::MediaDescriptor& getMediaDescriptor() const;
+    utl::MediaDescriptor& getMediaDescriptor() const;
 
     /** Returns the URL of the imported or exported file. */
     const OUString& getFileUrl() const;
@@ -253,11 +255,11 @@ public:
     // ------------------------------------------------------------------------
 protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-                        implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+                        implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const;
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
-                        implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+                        implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const;
 
-    virtual bool        implFinalizeExport( ::comphelper::MediaDescriptor& rMediaDescriptor );
+    virtual bool        implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor );
 
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
                         getMainDocumentStream( ) const;
diff --git a/include/oox/core/filterdetect.hxx b/include/oox/core/filterdetect.hxx
index c3379a340c6a..4caaaf7a1316 100644
--- a/include/oox/core/filterdetect.hxx
+++ b/include/oox/core/filterdetect.hxx
@@ -33,7 +33,7 @@ namespace com { namespace sun { namespace star {
     namespace uno { class XComponentContext; }
 } } }
 
-namespace comphelper { class MediaDescriptor; }
+namespace utl { class MediaDescriptor; }
 
 namespace oox { class AttributeList; }
 
@@ -118,7 +118,7 @@ public:
         its input stream is returned.
      */
     ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-                        extractUnencryptedPackage( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+                        extractUnencryptedPackage( utl::MediaDescriptor& rMediaDesc ) const;
 
     // com.sun.star.lang.XServiceInfo interface -------------------------------
 
diff --git a/include/oox/core/xmlfilterbase.hxx b/include/oox/core/xmlfilterbase.hxx
index 648b50da97aa..87234fb22328 100644
--- a/include/oox/core/xmlfilterbase.hxx
+++ b/include/oox/core/xmlfilterbase.hxx
@@ -233,12 +233,12 @@ public:
 
 protected:
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream >
-        implGetInputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+        implGetInputStream( utl::MediaDescriptor& rMediaDesc ) const;
 
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream >
-        implGetOutputStream( ::comphelper::MediaDescriptor& rMediaDesc ) const;
+        implGetOutputStream( utl::MediaDescriptor& rMediaDesc ) const;
 
-    virtual bool implFinalizeExport(  ::comphelper::MediaDescriptor& rMediaDescriptor );
+    virtual bool implFinalizeExport( utl::MediaDescriptor& rMediaDescriptor );
 
 private:
     virtual StorageRef  implCreateStorage(