From 66b919c8674066871a06e7cdf5595dc6951524e0 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Thu, 3 Jan 2019 11:41:53 +0100 Subject: svm xml dumper: move this from test to vcl This is very useful functionality, this way it can be invoked from the debugger and/or nested into an outer xml dump (sw/sd doc model dump) more easily. Change-Id: If6c83b11d0f3e65fcce71e8d820c6bc354f64d68 Reviewed-on: https://gerrit.libreoffice.org/65834 Reviewed-by: Miklos Vajna Tested-by: Jenkins --- emfio/qa/cppunit/wmf/wmfimporttest.cxx | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'emfio') diff --git a/emfio/qa/cppunit/wmf/wmfimporttest.cxx b/emfio/qa/cppunit/wmf/wmfimporttest.cxx index 318f6a70826a..5f9de170c595 100644 --- a/emfio/qa/cppunit/wmf/wmfimporttest.cxx +++ b/emfio/qa/cppunit/wmf/wmfimporttest.cxx @@ -18,7 +18,6 @@ */ #include -#include #include #include #include @@ -74,7 +73,7 @@ void WmfTest::testNonPlaceableWmf() MetafileXmlDump dumper; dumper.filterAllActionTypes(); dumper.filterActionType(MetaActionType::POLYLINE, false); - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -103,7 +102,7 @@ void WmfTest::testSine() MetafileXmlDump dumper; dumper.filterAllActionTypes(); dumper.filterActionType(MetaActionType::ISECTRECTCLIPREGION, false); - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -119,7 +118,7 @@ void WmfTest::testEmfProblem() MetafileXmlDump dumper; dumper.filterAllActionTypes(); dumper.filterActionType(MetaActionType::ISECTRECTCLIPREGION, false); - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -139,7 +138,7 @@ void WmfTest::testEmfLineStyles() dumper.filterAllActionTypes(); dumper.filterActionType(MetaActionType::LINE, false); dumper.filterActionType(MetaActionType::LINECOLOR, false); - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -198,7 +197,7 @@ void WmfTest::testWorldTransformFontSize() MetafileXmlDump dumper; dumper.filterAllActionTypes(); dumper.filterActionType(MetaActionType::FONT, false); - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -226,7 +225,7 @@ void WmfTest::testTdf93750() ReadWindowMetafile(aFileStream, aGDIMetaFile); MetafileXmlDump dumper; - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT (pDoc); @@ -265,7 +264,7 @@ void WmfTest::testTdf39894() ReadWindowMetafile(aFileStream, aGDIMetaFile); MetafileXmlDump dumper; - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT(pDoc); @@ -286,7 +285,7 @@ void WmfTest::testETO_PDY() ReadWindowMetafile(aFileStream, aGDIMetaFile); MetafileXmlDump dumper; - xmlDocPtr pDoc = dumper.dumpAndParse(aGDIMetaFile); + xmlDocPtr pDoc = dumpAndParse(dumper, aGDIMetaFile); CPPUNIT_ASSERT(pDoc); -- cgit