diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-16 08:59:00 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2016-11-16 09:20:59 +0000 |
| commit | 72ffa98e892ad1b64ff3a00b1e26a995cba3076f (patch) | |
| tree | 7e3965fc48d5254a5e71dc96bab0f00521c015ee /sd | |
| parent | 7cca2c7fb328e64f1779993b60809eff6974b970 (diff) | |
make the element names in dumpAsXml match the class names
Change-Id: I955facfe3e901fcb76798dab342f96a67d5ac63f
Reviewed-on: https://gerrit.libreoffice.org/30894
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/qa/unit/tiledrendering/tiledrendering.cxx | 14 | ||||
| -rw-r--r-- | sd/source/core/drawdoc.cxx | 2 | ||||
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/sd/qa/unit/tiledrendering/tiledrendering.cxx b/sd/qa/unit/tiledrendering/tiledrendering.cxx index e3e48f778555..2d2cc99ea2a0 100644 --- a/sd/qa/unit/tiledrendering/tiledrendering.cxx +++ b/sd/qa/unit/tiledrendering/tiledrendering.cxx @@ -837,9 +837,9 @@ void SdTiledRenderingTest::testResizeTableColumn() // Remember the original cell widths. xmlDocPtr pXmlDoc = parseXmlDump(); - OString aPrefix = "/sdDrawDocument/sdrModel/sdPage/sdrObjList/sdrTableObj/sdrTableObjImpl/tableLayouter/columns/"; - sal_Int32 nExpectedColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); - sal_Int32 nExpectedColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + OString aPrefix = "/SdDrawDocument/SdrModel/SdPage/SdrObjList/SdrTableObj/SdrTableObjImpl/TableLayouter/columns/"; + sal_Int32 nExpectedColumn1 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[1]", "size").toInt32(); + sal_Int32 nExpectedColumn2 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[2]", "size").toInt32(); xmlFreeDoc(pXmlDoc); pXmlDoc = nullptr; @@ -850,9 +850,9 @@ void SdTiledRenderingTest::testResizeTableColumn() // Remember the resized column widths. pXmlDoc = parseXmlDump(); - sal_Int32 nResizedColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); + sal_Int32 nResizedColumn1 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[1]", "size").toInt32(); CPPUNIT_ASSERT(nResizedColumn1 < nExpectedColumn1); - sal_Int32 nResizedColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + sal_Int32 nResizedColumn2 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[2]", "size").toInt32(); CPPUNIT_ASSERT(nResizedColumn2 > nExpectedColumn2); xmlFreeDoc(pXmlDoc); pXmlDoc = nullptr; @@ -862,10 +862,10 @@ void SdTiledRenderingTest::testResizeTableColumn() // Check the undo result. pXmlDoc = parseXmlDump(); - sal_Int32 nActualColumn1 = getXPath(pXmlDoc, aPrefix + "layout[1]", "size").toInt32(); + sal_Int32 nActualColumn1 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[1]", "size").toInt32(); // Expected was 7049, actual was 6048, i.e. the first column width after undo was 1cm smaller than expected. CPPUNIT_ASSERT_EQUAL(nExpectedColumn1, nActualColumn1); - sal_Int32 nActualColumn2 = getXPath(pXmlDoc, aPrefix + "layout[2]", "size").toInt32(); + sal_Int32 nActualColumn2 = getXPath(pXmlDoc, aPrefix + "TableLayouter_Layout[2]", "size").toInt32(); CPPUNIT_ASSERT_EQUAL(nExpectedColumn2, nActualColumn2); xmlFreeDoc(pXmlDoc); pXmlDoc = nullptr; diff --git a/sd/source/core/drawdoc.cxx b/sd/source/core/drawdoc.cxx index 39a463e38e1b..eda9ce821b10 100644 --- a/sd/source/core/drawdoc.cxx +++ b/sd/source/core/drawdoc.cxx @@ -1101,7 +1101,7 @@ void SdDrawDocument::dumpAsXml(xmlTextWriterPtr pWriter) const xmlTextWriterStartDocument(pWriter, nullptr, nullptr, nullptr); bOwns = true; } - xmlTextWriterStartElement(pWriter, BAD_CAST("sdDrawDocument")); + xmlTextWriterStartElement(pWriter, BAD_CAST("SdDrawDocument")); xmlTextWriterWriteFormatAttribute(pWriter, BAD_CAST("ptr"), "%p", this); if (mpOutliner) diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index 92915812c660..564499979404 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -631,7 +631,7 @@ void SdPage::removeAnnotation( const Reference< XAnnotation >& xAnnotation ) void SdPage::dumpAsXml(xmlTextWriterPtr pWriter) const { - xmlTextWriterStartElement(pWriter, BAD_CAST("sdPage")); + xmlTextWriterStartElement(pWriter, BAD_CAST("SdPage")); const char* pPageKind = nullptr; switch (mePageKind) |