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/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/inc')
| -rw-r--r-- | framework/inc/pch/precompiled_fwk.hxx | 2 | ||||
| -rw-r--r-- | framework/inc/services/autorecovery.hxx | 10 |
2 files changed, 6 insertions, 6 deletions
diff --git a/framework/inc/pch/precompiled_fwk.hxx b/framework/inc/pch/precompiled_fwk.hxx index 8796f37a2539..4095d2a2c629 100644 --- a/framework/inc/pch/precompiled_fwk.hxx +++ b/framework/inc/pch/precompiled_fwk.hxx @@ -250,7 +250,6 @@ #include <comphelper/enumhelper.hxx> #include <comphelper/extract.hxx> #include <comphelper/interaction.hxx> -#include <comphelper/mediadescriptor.hxx> #include <comphelper/namedvaluecollection.hxx> #include <comphelper/processfactory.hxx> #include <comphelper/sequence.hxx> @@ -337,6 +336,7 @@ #include <unotools/configpaths.hxx> #include <unotools/historyoptions.hxx> #include <unotools/localfilehelper.hxx> +#include <unotools/mediadescriptor.hxx> #include <unotools/moduleoptions.hxx> #include <unotools/pathoptions.hxx> #include <unotools/streamwrap.hxx> diff --git a/framework/inc/services/autorecovery.hxx b/framework/inc/services/autorecovery.hxx index d960b2e4efeb..65d769151a98 100644 --- a/framework/inc/services/autorecovery.hxx +++ b/framework/inc/services/autorecovery.hxx @@ -41,7 +41,7 @@ #include <com/sun/star/task/XStatusIndicator.hpp> #include <com/sun/star/util/XModifyListener.hpp> -#include <comphelper/mediadescriptor.hxx> +#include <unotools/mediadescriptor.hxx> #include <vcl/timer.hxx> #include <vcl/evntpost.hxx> #include <cppuhelper/implbase5.hxx> @@ -800,13 +800,13 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri //--------------------------------------- // TODO document me void implts_openOneDoc(const OUString& sURL , - ::comphelper::MediaDescriptor& lDescriptor, + utl::MediaDescriptor& lDescriptor, AutoRecovery::TDocumentInfo& rInfo ); //--------------------------------------- // TODO document me void implts_generateNewTempURL(const OUString& sBackupPath , - ::comphelper::MediaDescriptor& rMediaDescriptor, + utl::MediaDescriptor& rMediaDescriptor, AutoRecovery::TDocumentInfo& rInfo ); //--------------------------------------- @@ -1006,11 +1006,11 @@ class AutoRecovery : // attention! Must be the first base class to guarentee ri is used to set the new created progress as parameter on these set. */ void impl_establishProgress(const AutoRecovery::TDocumentInfo& rInfo , - ::comphelper::MediaDescriptor& rArgs , + utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); void impl_forgetProgress(const AutoRecovery::TDocumentInfo& rInfo , - ::comphelper::MediaDescriptor& rArgs , + utl::MediaDescriptor& rArgs , const css::uno::Reference< css::frame::XFrame >& xNewFrame); //--------------------------------------- |