chart2/qa/extras/chart2export.cxx | 8 --------
chart2/qa/extras/chart2export2.cxx | 8 --------
chart2/qa/extras/chart2export3.cxx | 8 --------
chart2/qa/extras/chart2geometry.cxx | 9 ---------
embeddedobj/qa/cppunit/msole.cxx | 7 -------
oox/qa/unit/export.cxx | 7 -------
sc/qa/extras/macros-test.cxx | 8 --------
sc/qa/unit/SparklineImportExportTest.cxx | 6 ------
sc/qa/unit/jumbosheets-test.cxx | 9 ---------
sc/qa/unit/pivottable_filters_test.cxx | 8 --------
sc/qa/unit/subsequent_export_test.cxx | 8 --------
sc/qa/unit/subsequent_export_test2.cxx | 9 ---------
sc/qa/unit/subsequent_export_test3.cxx | 9 ---------
sc/qa/unit/subsequent_export_test4.cxx | 9 ---------
sd/qa/filter/eppt/eppt.cxx | 6 ------
sd/qa/unit/ShapeImportExportTest.cxx | 6 ------
sd/qa/unit/export-tests-ooxml1.cxx | 5 -----
sd/qa/unit/export-tests-ooxml2.cxx | 5 -----
sd/qa/unit/export-tests-ooxml3.cxx | 6 ------
sd/qa/unit/export-tests.cxx | 5 -----
sd/qa/unit/misc-tests.cxx | 5 -----
sdext/qa/unit/pdfimport.cxx | 5 -----
sw/qa/inc/swmodeltestbase.hxx | 5 -----
sw/qa/unit/swmodeltestbase.cxx | 11 -----------
test/source/xmltesttools.cxx | 8 +++++++-
xmloff/qa/unit/draw.cxx | 6 ------
xmloff/qa/unit/style.cxx | 6 ------
xmloff/qa/unit/text.cxx | 6 ------
28 files changed, 7 insertions(+), 191 deletions(-)
New commits:
commit d2867ac604937abf88c553341fcdd7e7abb7698c
Author: Xisco Fauli <xiscofa...@libreoffice.org>
AuthorDate: Wed Mar 15 17:32:26 2023 +0100
Commit: Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Thu Mar 16 07:21:08 2023 +0000
XmlTestTools: factor out common code
Change-Id: Ie212c86c6c0ac20878be88d88ade5eb1c989942d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/148935
Tested-by: Jenkins
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
diff --git a/chart2/qa/extras/chart2export.cxx
b/chart2/qa/extras/chart2export.cxx
index f89c391124bb..6e9a18efeed5 100644
--- a/chart2/qa/extras/chart2export.cxx
+++ b/chart2/qa/extras/chart2export.cxx
@@ -24,18 +24,10 @@ using beans::XPropertySet;
class Chart2ExportTest : public ChartTest
{
-protected:
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
public:
Chart2ExportTest() : ChartTest("/chart2/qa/extras/data/") {}
};
-void Chart2ExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
-}
-
namespace {
void testErrorBar( Reference< XPropertySet > const & xErrorBar )
diff --git a/chart2/qa/extras/chart2export2.cxx
b/chart2/qa/extras/chart2export2.cxx
index 06e1333f5164..c565ad03c538 100644
--- a/chart2/qa/extras/chart2export2.cxx
+++ b/chart2/qa/extras/chart2export2.cxx
@@ -22,9 +22,6 @@ using beans::XPropertySet;
class Chart2ExportTest2 : public ChartTest
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
Chart2ExportTest2()
: ChartTest("/chart2/qa/extras/data/")
@@ -32,11 +29,6 @@ public:
}
};
-void Chart2ExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(Chart2ExportTest2, testSetSeriesToSecondaryAxisXLSX)
{
loadFromURL(u"xlsx/add_series_secondary_axis.xlsx");
diff --git a/chart2/qa/extras/chart2export3.cxx
b/chart2/qa/extras/chart2export3.cxx
index 05dbdc48c41b..dfb7f330d582 100644
--- a/chart2/qa/extras/chart2export3.cxx
+++ b/chart2/qa/extras/chart2export3.cxx
@@ -24,18 +24,10 @@ using beans::XPropertySet;
class Chart2ExportTest3 : public ChartTest
{
-protected:
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
public:
Chart2ExportTest3() : ChartTest("/chart2/qa/extras/data/") {}
};
-void Chart2ExportTest3::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(Chart2ExportTest3, testTdf108107)
{
loadFromURL(u"xlsx/tdf108107.xlsx");
diff --git a/chart2/qa/extras/chart2geometry.cxx
b/chart2/qa/extras/chart2geometry.cxx
index 4dcdfa0f3125..9a69b81e593a 100644
--- a/chart2/qa/extras/chart2geometry.cxx
+++ b/chart2/qa/extras/chart2geometry.cxx
@@ -25,9 +25,6 @@ using beans::XPropertySet;
class Chart2GeometryTest : public ChartTest
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
Chart2GeometryTest()
: ChartTest("/chart2/qa/extras/data/")
@@ -68,12 +65,6 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void Chart2GeometryTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
static OString OU2O(std::u16string_view sOUSource)
{
return rtl::OUStringToOString(sOUSource, RTL_TEXTENCODING_UTF8);
diff --git a/embeddedobj/qa/cppunit/msole.cxx b/embeddedobj/qa/cppunit/msole.cxx
index ef2027d958dc..493b5c6a2ca6 100644
--- a/embeddedobj/qa/cppunit/msole.cxx
+++ b/embeddedobj/qa/cppunit/msole.cxx
@@ -38,16 +38,9 @@ public:
: UnoApiXmlTest("/embeddedobj/qa/cppunit/data/")
{
}
-
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
};
}
-void Test::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
-}
-
namespace
{
class OdtExportThread : public osl::Thread
diff --git a/oox/qa/unit/export.cxx b/oox/qa/unit/export.cxx
index a98eaa5ce93f..36859548f5f6 100644
--- a/oox/qa/unit/export.cxx
+++ b/oox/qa/unit/export.cxx
@@ -21,15 +21,8 @@ public:
: UnoApiXmlTest("/oox/qa/unit/data/")
{
}
-
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
};
-void Test::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXpathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(Test, testPolylineConnectorPosition)
{
// Given a document with a group shape and therein a polyline and a
connector.
diff --git a/sc/qa/extras/macros-test.cxx b/sc/qa/extras/macros-test.cxx
index 24379362bed5..b8dc5824bebd 100644
--- a/sc/qa/extras/macros-test.cxx
+++ b/sc/qa/extras/macros-test.cxx
@@ -35,8 +35,6 @@ using namespace ::com::sun::star::uno;
class ScMacrosTest : public UnoApiXmlTest
{
-protected:
- void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
public:
ScMacrosTest();
@@ -111,12 +109,6 @@ public:
CPPUNIT_TEST_SUITE_END();
};
-void ScMacrosTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
// I suppose you could say this test doesn't really belong here, OTOH
// we need a full document to run the test ( it related originally to an
// imported Excel VBA macro ) It's convenient and fast to unit test
diff --git a/sc/qa/unit/SparklineImportExportTest.cxx
b/sc/qa/unit/SparklineImportExportTest.cxx
index 681cbd35ec79..46e5bda43377 100644
--- a/sc/qa/unit/SparklineImportExportTest.cxx
+++ b/sc/qa/unit/SparklineImportExportTest.cxx
@@ -26,12 +26,6 @@ public:
{
}
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathContextPtr)
override
- {
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathContextPtr);
- XmlTestTools::registerODFNamespaces(pXmlXPathContextPtr);
- }
-
void testSparklinesRoundtripXLSX();
void testSparklinesExportODS();
void testSparklinesRoundtripODS();
diff --git a/sc/qa/unit/jumbosheets-test.cxx b/sc/qa/unit/jumbosheets-test.cxx
index 23cb0cb3919f..468b479deb3d 100644
--- a/sc/qa/unit/jumbosheets-test.cxx
+++ b/sc/qa/unit/jumbosheets-test.cxx
@@ -69,9 +69,6 @@ public:
CPPUNIT_TEST_SUITE_END();
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
private:
void testRoundtripColumn2000(std::u16string_view name, const char* format);
void testRoundtripNamedRanges(std::u16string_view name, const char*
format);
@@ -380,12 +377,6 @@ void ScJumboSheetsTest::tearDown()
UnoApiXmlTest::tearDown();
}
-void ScJumboSheetsTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_SUITE_REGISTRATION(ScJumboSheetsTest);
CPPUNIT_PLUGIN_IMPLEMENT();
diff --git a/sc/qa/unit/pivottable_filters_test.cxx
b/sc/qa/unit/pivottable_filters_test.cxx
index 6d006bfc4431..8e47c10dbf54 100644
--- a/sc/qa/unit/pivottable_filters_test.cxx
+++ b/sc/qa/unit/pivottable_filters_test.cxx
@@ -37,9 +37,6 @@ using namespace ::com::sun::star::uno;
class ScPivotTableFiltersTest : public ScModelTestBase
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
ScPivotTableFiltersTest();
@@ -159,11 +156,6 @@ ScPivotTableFiltersTest::ScPivotTableFiltersTest()
{
}
-void ScPivotTableFiltersTest::registerNamespaces(xmlXPathContextPtr&
pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
-}
-
namespace
{
class FindDimByName
diff --git a/sc/qa/unit/subsequent_export_test.cxx
b/sc/qa/unit/subsequent_export_test.cxx
index e335211192f5..fc894f5d9e9f 100644
--- a/sc/qa/unit/subsequent_export_test.cxx
+++ b/sc/qa/unit/subsequent_export_test.cxx
@@ -46,8 +46,6 @@ using namespace ::com::sun::star::uno;
class ScExportTest : public ScModelTestBase
{
protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
void testExcelCellBorders(const OUString& sFormatType);
public:
@@ -57,12 +55,6 @@ public:
}
};
-void ScExportTest::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(ScExportTest, testExport)
{
createScDoc();
diff --git a/sc/qa/unit/subsequent_export_test2.cxx
b/sc/qa/unit/subsequent_export_test2.cxx
index c228f973098c..7a9579f3dfa0 100644
--- a/sc/qa/unit/subsequent_export_test2.cxx
+++ b/sc/qa/unit/subsequent_export_test2.cxx
@@ -30,9 +30,6 @@ using namespace ::com::sun::star::uno;
class ScExportTest2 : public ScModelTestBase
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
ScExportTest2();
};
@@ -42,12 +39,6 @@ ScExportTest2::ScExportTest2()
{
}
-void ScExportTest2::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(ScExportTest2, testGroupShape)
{
createScDoc("xlsx/groupShape.xlsx");
diff --git a/sc/qa/unit/subsequent_export_test3.cxx
b/sc/qa/unit/subsequent_export_test3.cxx
index aa45c55e4bdf..f07f25b2e3a7 100644
--- a/sc/qa/unit/subsequent_export_test3.cxx
+++ b/sc/qa/unit/subsequent_export_test3.cxx
@@ -40,9 +40,6 @@ using namespace ::com::sun::star::uno;
class ScExportTest3 : public ScModelTestBase
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
ScExportTest3()
: ScModelTestBase("sc/qa/unit/data")
@@ -54,12 +51,6 @@ protected:
void testFunctionsExcel2010(const OUString& sFormatType);
};
-void ScExportTest3::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(ScExportTest3, testBordersExchangeXLSX)
{
// Document: sc/qa/unit/data/README.cellborders
diff --git a/sc/qa/unit/subsequent_export_test4.cxx
b/sc/qa/unit/subsequent_export_test4.cxx
index 463876f53966..024019e89c1e 100644
--- a/sc/qa/unit/subsequent_export_test4.cxx
+++ b/sc/qa/unit/subsequent_export_test4.cxx
@@ -46,9 +46,6 @@ using namespace ::com::sun::star::uno;
class ScExportTest4 : public ScModelTestBase
{
-protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override;
-
public:
ScExportTest4();
};
@@ -58,12 +55,6 @@ ScExportTest4::ScExportTest4()
{
}
-void ScExportTest4::registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(ScExportTest4, testTdf126177XLSX)
{
createScDoc("xlsx/hyperlink_export.xlsx");
diff --git a/sd/qa/filter/eppt/eppt.cxx b/sd/qa/filter/eppt/eppt.cxx
index fe8151a67638..738539c5eff7 100644
--- a/sd/qa/filter/eppt/eppt.cxx
+++ b/sd/qa/filter/eppt/eppt.cxx
@@ -26,14 +26,8 @@ class Test : public UnoApiXmlTest
{
public:
Test();
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
};
-void Test::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerOOXMLNamespaces(pXmlXpathCtx);
-}
-
Test::Test()
: UnoApiXmlTest("/sd/qa/filter/eppt/data/")
{
diff --git a/sd/qa/unit/ShapeImportExportTest.cxx
b/sd/qa/unit/ShapeImportExportTest.cxx
index 4810cb2ab134..b1008702ad22 100644
--- a/sd/qa/unit/ShapeImportExportTest.cxx
+++ b/sd/qa/unit/ShapeImportExportTest.cxx
@@ -38,12 +38,6 @@ public:
CPPUNIT_TEST(testTextDistancesOOXML_Export);
CPPUNIT_TEST(testTextDistancesODP_OOXML_Export);
CPPUNIT_TEST_SUITE_END();
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- }
};
namespace
diff --git a/sd/qa/unit/export-tests-ooxml1.cxx
b/sd/qa/unit/export-tests-ooxml1.cxx
index 98aa9c79eec7..9bbcab21cbaa 100644
--- a/sd/qa/unit/export-tests-ooxml1.cxx
+++ b/sd/qa/unit/export-tests-ooxml1.cxx
@@ -50,11 +50,6 @@ public:
: SdModelTestBase("/sd/qa/unit/data/")
{
}
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- }
};
namespace
diff --git a/sd/qa/unit/export-tests-ooxml2.cxx
b/sd/qa/unit/export-tests-ooxml2.cxx
index 429f26d5fe52..b4d993a3c0c9 100644
--- a/sd/qa/unit/export-tests-ooxml2.cxx
+++ b/sd/qa/unit/export-tests-ooxml2.cxx
@@ -75,11 +75,6 @@ public:
: SdModelTestBase("/sd/qa/unit/data/")
{
}
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- }
};
CPPUNIT_TEST_FIXTURE(SdOOXMLExportTest2, testRepeatBitmapMode)
diff --git a/sd/qa/unit/export-tests-ooxml3.cxx
b/sd/qa/unit/export-tests-ooxml3.cxx
index 3bec0e59d348..997dd15009fd 100644
--- a/sd/qa/unit/export-tests-ooxml3.cxx
+++ b/sd/qa/unit/export-tests-ooxml3.cxx
@@ -40,12 +40,6 @@ public:
{
}
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
- XmlTestTools::registerOOXMLNamespaces(pXmlXPathCtx);
- }
-
int testTdf115005_FallBack_Images(bool bAddReplacementImages);
};
diff --git a/sd/qa/unit/export-tests.cxx b/sd/qa/unit/export-tests.cxx
index 370f08564b22..fbf371895338 100644
--- a/sd/qa/unit/export-tests.cxx
+++ b/sd/qa/unit/export-tests.cxx
@@ -53,11 +53,6 @@ public:
{
}
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
- }
-
protected:
uno::Reference<awt::XBitmap> getBitmapFromTable(OUString const& rName);
};
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 844037924bb1..3f2b299160d1 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -105,11 +105,6 @@ public:
CPPUNIT_TEST(testTdf136956);
CPPUNIT_TEST(testEncodedTableStyles);
CPPUNIT_TEST_SUITE_END();
-
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx) override
- {
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
- }
};
void SdMiscTest::testTdf99396()
diff --git a/sdext/qa/unit/pdfimport.cxx b/sdext/qa/unit/pdfimport.cxx
index 0df6baae7e99..c344394ab1c3 100644
--- a/sdext/qa/unit/pdfimport.cxx
+++ b/sdext/qa/unit/pdfimport.cxx
@@ -452,11 +452,6 @@ namespace
class PDFITest : public test::BootstrapFixture, public XmlTestTools
{
- protected:
- virtual void registerNamespaces(xmlXPathContextPtr& pXmlXPathCtx)
override
- {
- XmlTestTools::registerODFNamespaces(pXmlXPathCtx);
- };
public:
void testXPDFParser()
{
diff --git a/sw/qa/inc/swmodeltestbase.hxx b/sw/qa/inc/swmodeltestbase.hxx
index bb9791e81315..6ef965723fd4 100644
--- a/sw/qa/inc/swmodeltestbase.hxx
+++ b/sw/qa/inc/swmodeltestbase.hxx
@@ -303,11 +303,6 @@ protected:
*/
xmlDocUniquePtr parseExportedFile();
- /**
- * Helper method to return nodes represented by rXPath.
- */
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
-
/**
* Creates a new document to be used with the internal sw/ API.
*
diff --git a/sw/qa/unit/swmodeltestbase.cxx b/sw/qa/unit/swmodeltestbase.cxx
index 29867b0d8103..035866b68838 100644
--- a/sw/qa/unit/swmodeltestbase.cxx
+++ b/sw/qa/unit/swmodeltestbase.cxx
@@ -559,17 +559,6 @@ xmlDocUniquePtr SwModelTestBase::parseExportedFile()
return parseXmlStream(&stream);
}
-void SwModelTestBase::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- // docx
- XmlTestTools::registerOOXMLNamespaces(pXmlXpathCtx);
- // odt
- XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
- // reqif-xhtml
- xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("reqif-xhtml"),
- BAD_CAST("http://www.w3.org/1999/xhtml";));
-}
-
void SwModelTestBase::createSwDoc(const char* pName, const char* pPassword)
{
if (!pName)
diff --git a/test/source/xmltesttools.cxx b/test/source/xmltesttools.cxx
index 7cf4bb53c6d9..db743e5688aa 100644
--- a/test/source/xmltesttools.cxx
+++ b/test/source/xmltesttools.cxx
@@ -76,8 +76,14 @@ xmlXPathObjectPtr XmlTestTools::getXPathNode(const
xmlDocUniquePtr& pXmlDoc, con
return pXmlXpathObj;
}
-void XmlTestTools::registerNamespaces(xmlXPathContextPtr& /*pXmlXpathCtx*/)
+void XmlTestTools::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
{
+ // ooxml
+ XmlTestTools::registerOOXMLNamespaces(pXmlXpathCtx);
+ // odf
+ XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
+ // reqif-xhtml
+ xmlXPathRegisterNs(pXmlXpathCtx, BAD_CAST("reqif-xhtml"),
BAD_CAST("http://www.w3.org/1999/xhtml";));
}
OUString XmlTestTools::getXPath(const xmlDocUniquePtr& pXmlDoc, const OString&
rXPath, const OString& rAttribute)
diff --git a/xmloff/qa/unit/draw.cxx b/xmloff/qa/unit/draw.cxx
index c4671d95859b..74a62edbd35f 100644
--- a/xmloff/qa/unit/draw.cxx
+++ b/xmloff/qa/unit/draw.cxx
@@ -39,7 +39,6 @@ class XmloffDrawTest : public UnoApiXmlTest
{
public:
XmloffDrawTest();
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
uno::Reference<drawing::XShape> getShape(sal_uInt8 nShapeIndex);
uno::Reference<beans::XPropertySet>
@@ -75,11 +74,6 @@ XmloffDrawTest::XmloffDrawTest()
{
}
-void XmloffDrawTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
-}
-
uno::Reference<drawing::XShape> XmloffDrawTest::getShape(sal_uInt8 nShapeIndex)
{
uno::Reference<drawing::XDrawPagesSupplier> xDrawPagesSupplier(mxComponent,
diff --git a/xmloff/qa/unit/style.cxx b/xmloff/qa/unit/style.cxx
index 91879e66a818..88e7177f3b91 100644
--- a/xmloff/qa/unit/style.cxx
+++ b/xmloff/qa/unit/style.cxx
@@ -25,7 +25,6 @@ class XmloffStyleTest : public UnoApiXmlTest
{
public:
XmloffStyleTest();
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
};
XmloffStyleTest::XmloffStyleTest()
@@ -33,11 +32,6 @@ XmloffStyleTest::XmloffStyleTest()
{
}
-void XmloffStyleTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testFillImageBase64)
{
// Load a flat ODG that has base64-encoded bitmap as a fill style.
diff --git a/xmloff/qa/unit/text.cxx b/xmloff/qa/unit/text.cxx
index 3b47ce11a397..7fe762580ac1 100644
--- a/xmloff/qa/unit/text.cxx
+++ b/xmloff/qa/unit/text.cxx
@@ -32,7 +32,6 @@ class XmloffStyleTest : public UnoApiXmlTest
{
public:
XmloffStyleTest();
- void registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx) override;
};
XmloffStyleTest::XmloffStyleTest()
@@ -40,11 +39,6 @@ XmloffStyleTest::XmloffStyleTest()
{
}
-void XmloffStyleTest::registerNamespaces(xmlXPathContextPtr& pXmlXpathCtx)
-{
- XmlTestTools::registerODFNamespaces(pXmlXpathCtx);
-}
-
CPPUNIT_TEST_FIXTURE(XmloffStyleTest, testMailMergeInEditeng)
{
// Without the accompanying fix in place, this test would have failed, as
unexpected
