mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

parseXml should return xmlDocPtr instead of htmlDocPtr

Browse Source 
Change-Id: Ia9fb79ea40ca840d7328a078e747ad64a63d18f1
This commit is contained in:
Tomaž Vajngerl
2014-08-28 12:54:35 +02:00
parent c75bddd73b
commit 2fa3aed1cb
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/test/xmltesttools.hxx
View File

@@ -35,7 +35,7 @@ protected:
XmlTestTools(); XmlTestTools();
virtual ~XmlTestTools(); virtual ~XmlTestTools();
htmlDocPtr parseXml(utl::TempFile& aTempFile); xmlDocPtr parseXml(utl::TempFile& aTempFile);
virtual void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx); virtual void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx);

12
sd/qa/unit/sdmodeltestbase.hxx
View File

@@ -29,8 +29,13 @@
using namespace ::com::sun::star; using namespace ::com::sun::star;
struct FileFormat { struct FileFormat
const char* pName; const char* pFilterName; const char* pTypeName; const char* pUserData; sal_uLong nFormatType; {
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/* // 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> pTypeName: <prop oor:Name="UIName">...</prop>
nFormatType: <prop oor:name="Flags">...</prop> nFormatType: <prop oor:name="Flags">...</prop>
*/ */
FileFormat aFileFormats[] = { FileFormat aFileFormats[] =
{
{ "odp", "impress8", "impress8", "", ODP_FORMAT_TYPE }, { "odp", "impress8", "impress8", "", ODP_FORMAT_TYPE },
{ "ppt", "MS PowerPoint 97", "Microsoft PowerPoint 97/2000/XP/2003", "sdfilt", PPT_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 }, { "pptx", "Impress MS PowerPoint 2007 XML", "MS PowerPoint 2007 XML", "", PPTX_FORMAT_TYPE },

2
test/source/xmltesttools.cxx
View File

@@ -17,7 +17,7 @@ XmlTestTools::XmlTestTools()
XmlTestTools::~XmlTestTools() XmlTestTools::~XmlTestTools()
{} {}
htmlDocPtr XmlTestTools::parseXml(utl::TempFile& aTempFile) xmlDocPtr XmlTestTools::parseXml(utl::TempFile& aTempFile)
{ {
SvFileStream aFileStream(aTempFile.GetURL(), STREAM_READ); SvFileStream aFileStream(aTempFile.GetURL(), STREAM_READ);
return parseXmlStream(&aFileStream); return parseXmlStream(&aFileStream);