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
---
 sc/source/filter/excel/excel.cxx          | 1 -
 sc/source/filter/excel/excimp8.cxx        | 1 -
 sc/source/filter/excel/xiescher.cxx       | 1 -
 sc/source/filter/oox/viewsettings.cxx     | 2 +-
 sc/source/filter/oox/workbooksettings.cxx | 3 +--
 sc/source/ui/collab/sccollaboration.cxx   | 6 +++---
 sc/source/ui/unoobj/exceldetect.cxx       | 4 ++--
 7 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'sc/source')

diff --git a/sc/source/filter/excel/excel.cxx b/sc/source/filter/excel/excel.cxx
index d3c6ee421cd4..b5e99299eead 100644
--- a/sc/source/filter/excel/excel.cxx
+++ b/sc/source/filter/excel/excel.cxx
@@ -26,7 +26,6 @@
 #include <sot/storage.hxx>
 #include <sot/exchange.hxx>
 #include <tools/globname.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <comphelper/processfactory.hxx>
 #include <com/sun/star/beans/NamedValue.hpp>
 #include <com/sun/star/document/XFilter.hpp>
diff --git a/sc/source/filter/excel/excimp8.cxx b/sc/source/filter/excel/excimp8.cxx
index 5b4ba0d1ed83..32ed8ca116fb 100644
--- a/sc/source/filter/excel/excimp8.cxx
+++ b/sc/source/filter/excel/excimp8.cxx
@@ -23,7 +23,6 @@
 
 #include <scitems.hxx>
 #include <comphelper/processfactory.hxx>
-#include <comphelper/mediadescriptor.hxx>
 #include <unotools/fltrcfg.hxx>
 
 #include <vcl/wmf.hxx>
diff --git a/sc/source/filter/excel/xiescher.cxx b/sc/source/filter/excel/xiescher.cxx
index 95d2bea61207..d22ae6652a91 100644
--- a/sc/source/filter/excel/xiescher.cxx
+++ b/sc/source/filter/excel/xiescher.cxx
@@ -106,7 +106,6 @@
 
 #include "namebuff.hxx"
 #include <boost/shared_ptr.hpp>
-#include <comphelper/mediadescriptor.hxx>
 #include <sfx2/docfile.hxx>
 
 using ::com::sun::star::uno::makeAny;
diff --git a/sc/source/filter/oox/viewsettings.cxx b/sc/source/filter/oox/viewsettings.cxx
index 7df163de334a..9d1fba171b46 100644
--- a/sc/source/filter/oox/viewsettings.cxx
+++ b/sc/source/filter/oox/viewsettings.cxx
@@ -27,7 +27,7 @@
 #include <com/sun/star/document/IndexedPropertyValues.hpp>
 #include <com/sun/star/document/XViewDataSupplier.hpp>
 #include <com/sun/star/document/NamedPropertyValues.hpp>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/containerhelper.hxx"
diff --git a/sc/source/filter/oox/workbooksettings.cxx b/sc/source/filter/oox/workbooksettings.cxx
index 363184799fe9..da2595c680fd 100644
--- a/sc/source/filter/oox/workbooksettings.cxx
+++ b/sc/source/filter/oox/workbooksettings.cxx
@@ -22,7 +22,7 @@
 #include <com/sun/star/sheet/XCalculatable.hpp>
 #include <com/sun/star/util/Date.hpp>
 #include <com/sun/star/util/XNumberFormatsSupplier.hpp>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include "oox/core/filterbase.hxx"
 #include "oox/helper/attributelist.hxx"
 #include "oox/helper/propertyset.hxx"
@@ -41,7 +41,6 @@ using namespace ::com::sun::star::sheet;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::util;
 
-using ::comphelper::MediaDescriptor;
 using ::oox::core::CodecHelper;
 
 // ============================================================================
diff --git a/sc/source/ui/collab/sccollaboration.cxx b/sc/source/ui/collab/sccollaboration.cxx
index 422f50064f56..7dd6ef9eba2e 100644
--- a/sc/source/ui/collab/sccollaboration.cxx
+++ b/sc/source/ui/collab/sccollaboration.cxx
@@ -12,7 +12,7 @@
 #include "docsh.hxx"
 #include "sendfunc.hxx"
 #include <com/sun/star/document/XDocumentRecovery.hpp>
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
 #include <unotools/tempfile.hxx>
 #include <unotools/localfilehelper.hxx>
 
@@ -50,9 +50,9 @@ void ScCollaboration::SaveAndSendFile( TpContact* pContact ) const
     OUString aFileURL;
     ::utl::LocalFileHelper::ConvertPhysicalNameToURL( aTmpPath, aFileURL );
 
-    ::comphelper::MediaDescriptor aDescriptor;
+    utl::MediaDescriptor aDescriptor;
     // some issue with hyperlinks:
-    aDescriptor[::comphelper::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
+    aDescriptor[utl::MediaDescriptor::PROP_DOCUMENTBASEURL()] <<= OUString();
     try {
         css::uno::Reference< css::document::XDocumentRecovery > xDocRecovery(
                     mpScDocShell->GetBaseModel(), css::uno::UNO_QUERY_THROW);
diff --git a/sc/source/ui/unoobj/exceldetect.cxx b/sc/source/ui/unoobj/exceldetect.cxx
index e87d27a7b736..5440c621ebdb 100644
--- a/sc/source/ui/unoobj/exceldetect.cxx
+++ b/sc/source/ui/unoobj/exceldetect.cxx
@@ -17,11 +17,11 @@
 #include "sfx2/app.hxx"
 #include "sfx2/docfile.hxx"
 #include "sfx2/sfxsids.hrc"
-#include "comphelper/mediadescriptor.hxx"
+#include "unotools/mediadescriptor.hxx"
 #include "sot/storage.hxx"
 
 using namespace com::sun::star;
-using comphelper::MediaDescriptor;
+using utl::MediaDescriptor;
 
 ScExcelBiffDetect::ScExcelBiffDetect( const uno::Reference<uno::XComponentContext>& /*xContext*/ ) {}
 ScExcelBiffDetect::~ScExcelBiffDetect() {}
-- 
cgit