From 2fa3aed1cb779b15773d98af23a3f705dc949f05 Mon Sep 17 00:00:00 2001
From: Tomaž Vajngerl <tomaz.vajngerl@collabora.com>
Date: Thu, 28 Aug 2014 12:54:35 +0200
Subject: parseXml should return xmlDocPtr instead of htmlDocPtr

Change-Id: Ia9fb79ea40ca840d7328a078e747ad64a63d18f1
---
 include/test/xmltesttools.hxx  |  2 +-
 sd/qa/unit/sdmodeltestbase.hxx | 12 +++++++++---
 test/source/xmltesttools.cxx   |  2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/include/test/xmltesttools.hxx b/include/test/xmltesttools.hxx
index 058bbc251743..6709c1ca3ce2 100644
--- a/include/test/xmltesttools.hxx
+++ b/include/test/xmltesttools.hxx
@@ -35,7 +35,7 @@ protected:
     XmlTestTools();
     virtual ~XmlTestTools();
 
-    htmlDocPtr parseXml(utl::TempFile& aTempFile);
+    xmlDocPtr parseXml(utl::TempFile& aTempFile);
 
     virtual void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx);
 
diff --git a/sd/qa/unit/sdmodeltestbase.hxx b/sd/qa/unit/sdmodeltestbase.hxx
index 20cdacce95b1..a5d1133b61dd 100644
--- a/sd/qa/unit/sdmodeltestbase.hxx
+++ b/sd/qa/unit/sdmodeltestbase.hxx
@@ -29,8 +29,13 @@
 
 using namespace ::com::sun::star;
 
-struct FileFormat {
-    const char* pName; const char* pFilterName; const char* pTypeName; const char* pUserData; sal_uLong nFormatType;
+struct FileFormat
+{
+    const char* pName;
+    const char* pFilterName;
+    const char* pTypeName;
+    const char* pUserData;
+    sal_uLong nFormatType;
 };
 
 // These values are taken from "Flags" in filter/source/config/fragments/filters/*
@@ -47,7 +52,8 @@ pFilterName: <node oor:Name="...">
 pTypeName: <prop oor:Name="UIName">...</prop>
 nFormatType: <prop oor:name="Flags">...</prop>
 */
-FileFormat aFileFormats[] = {
+FileFormat aFileFormats[] =
+{
     { "odp",  "impress8", "impress8", "", ODP_FORMAT_TYPE },
     { "ppt",  "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", "sdfilt", PPT_FORMAT_TYPE },
     { "pptx", "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", "", PPTX_FORMAT_TYPE },
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 129e286f4a53..d70ee86a245c 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -17,7 +17,7 @@ XmlTestTools::XmlTestTools()
 XmlTestTools::~XmlTestTools()
 {}
 
-htmlDocPtr XmlTestTools::parseXml(utl::TempFile& aTempFile)
+xmlDocPtr XmlTestTools::parseXml(utl::TempFile& aTempFile)
 {
     SvFileStream aFileStream(aTempFile.GetURL(), STREAM_READ);
     return parseXmlStream(&aFileStream);
-- 
cgit