diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2013-11-13 08:52:41 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2013-11-14 11:13:24 +0100 |
| commit | 24cad6a6490b245bd88ec3e3c87195628914f6a2 (patch) | |
| tree | 12d9e7ec629054f5ad0a6990783d3e639449afeb /framework/source/inc | |
| parent | 8061c8c70b7ffcd8f472d2f5b909911f2095fec7 (diff) | |
Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally.
Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
Diffstat (limited to 'framework/source/inc')
| -rw-r--r-- | framework/source/inc/loadenv/loadenv.hxx | 6 |
1 files changed, 3 insertions, 3 deletions
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 ); |