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/inc/pch/precompiled_fwk.hxx   |  2 +-
 framework/inc/services/autorecovery.hxx | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'framework/inc')

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);
 
         //---------------------------------------
-- 
cgit