summaryrefslogtreecommitdiff
path: root/xmloff
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2013-11-13 08:52:41 +0100
committerStephan Bergmann <sbergman@redhat.com>2013-11-14 11:13:24 +0100
commit24cad6a6490b245bd88ec3e3c87195628914f6a2 (patch)
tree12d9e7ec629054f5ad0a6990783d3e639449afeb /xmloff
parent8061c8c70b7ffcd8f472d2f5b909911f2095fec7 (diff)
Move MediaDescriptor from comphelper to unotools
...so it will be able to use SvtSecurityOptions internally. Change-Id: Id7433247e8fc53651935578510bedbcca5aa2ac9
Diffstat (limited to 'xmloff')
-rw-r--r--xmloff/inc/pch/precompiled_xo.hxx2
-rw-r--r--xmloff/source/chart/SchXMLChartContext.cxx6
2 files changed, 4 insertions, 4 deletions
diff --git a/xmloff/inc/pch/precompiled_xo.hxx b/xmloff/inc/pch/precompiled_xo.hxx
index c61203d8c67f..6eaff6c2ffb3 100644
--- a/xmloff/inc/pch/precompiled_xo.hxx
+++ b/xmloff/inc/pch/precompiled_xo.hxx
@@ -489,7 +489,6 @@
#include <comphelper/documentconstants.hxx>
#include <comphelper/extract.hxx>
#include <comphelper/genericpropertyset.hxx>
-#include <comphelper/mediadescriptor.hxx>
#include <comphelper/namecontainer.hxx>
#include <comphelper/namedvaluecollection.hxx>
#include <comphelper/processfactory.hxx>
@@ -563,6 +562,7 @@
#include <unotools/datetime.hxx>
#include <unotools/docinfohelper.hxx>
#include <unotools/fontcvt.hxx>
+#include <unotools/mediadescriptor.hxx>
#include <unotools/saveopt.hxx>
#include <unotools/streamwrap.hxx>
#include <unotools/syslocale.hxx>
diff --git a/xmloff/source/chart/SchXMLChartContext.cxx b/xmloff/source/chart/SchXMLChartContext.cxx
index b8b7851a1c5c..18cd1bc27390 100644
--- a/xmloff/source/chart/SchXMLChartContext.cxx
+++ b/xmloff/source/chart/SchXMLChartContext.cxx
@@ -25,7 +25,7 @@
#include "SchXMLTableContext.hxx"
#include "SchXMLSeries2Context.hxx"
#include "SchXMLTools.hxx"
-#include <comphelper/mediadescriptor.hxx>
+#include <unotools/mediadescriptor.hxx>
#include <tools/debug.hxx>
#include <xmloff/xmlnmspe.hxx>
#include <xmloff/xmlement.hxx>
@@ -636,9 +636,9 @@ static void lcl_ApplyDataFromRectangularRangeToDiagram(
uno::Reference< frame::XModel > xModel(xNewDoc, uno::UNO_QUERY );
if( xModel.is() )
{
- comphelper::MediaDescriptor aMediaDescriptor( xModel->getArgs() );
+ utl::MediaDescriptor aMediaDescriptor( xModel->getArgs() );
- comphelper::MediaDescriptor::const_iterator aIt(
+ utl::MediaDescriptor::const_iterator aIt(
aMediaDescriptor.find( OUString( "HierarchicalDocumentName" )));
if( aIt != aMediaDescriptor.end() )
{