From 24cad6a6490b245bd88ec3e3c87195628914f6a2 Mon Sep 17 00:00:00 2001
From: Stephan Bergmann <sbergman@redhat.com>
Date: Wed, 13 Nov 2013 08:52:41 +0100
Subject: Move MediaDescriptor from comphelper to unotools

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

Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
---
 framework/source/inc/loadenv/loadenv.hxx | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'framework/source/inc')

diff --git a/framework/source/inc/loadenv/loadenv.hxx b/framework/source/inc/loadenv/loadenv.hxx
index dee4f0b435de..a2f258ec9b2a 100644
--- a/framework/source/inc/loadenv/loadenv.hxx
+++ b/framework/source/inc/loadenv/loadenv.hxx
@@ -35,7 +35,7 @@
 #include <com/sun/star/uno/XComponentContext.hpp>
 #include <com/sun/star/util/URL.hpp>
 
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <comphelper/sequenceashashmap.hxx>
 #include <cppuhelper/implbase2.hxx>
 
@@ -148,7 +148,7 @@ private:
         @descr  Inside this struct e.g. the URL, its type and filter name,
                 the stream or a model directly are saved.
      */
-    ::comphelper::MediaDescriptor m_lMediaDescriptor;
+    utl::MediaDescriptor m_lMediaDescriptor;
 
     /** @short  because the mediadescriptor contains the complete URL ... but
                 some functionality need the structured version, we hold it twice :-(.
@@ -370,7 +370,7 @@ public:
     /** TODO document me ... */
     static  void initializeUIDefaults(
                 const css::uno::Reference< css::uno::XComponentContext >& i_rxContext,
-                ::comphelper::MediaDescriptor& io_lMediaDescriptor,
+                utl::MediaDescriptor& io_lMediaDescriptor,
                 const bool _bUIMode,
                 QuietInteraction** o_ppQuiteInteraction
             );
-- 
cgit