summaryrefslogtreecommitdiff
path: root/sd/qa/unit/misc-tests.cxx
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2020-05-05 19:10:16 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2020-05-07 09:52:27 +0200
commitec6eaa58addf0d8823f8c56d4ec168ff389da8c5 (patch)
treeadb44639fc6bdecad5f576aa5e1aa90f3c9d64b3 /sd/qa/unit/misc-tests.cxx
parentc437948f6c0d602bb200fc92e80cb73ae8ae5109 (diff)
fix memory leak of xmlDoc objects
in unit tests Change-Id: Id16731bbbe2f1b0e3642722d77aba04fc98db4cc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93508 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'sd/qa/unit/misc-tests.cxx')
-rw-r--r--sd/qa/unit/misc-tests.cxx20
1 files changed, 10 insertions, 10 deletions
diff --git a/sd/qa/unit/misc-tests.cxx b/sd/qa/unit/misc-tests.cxx
index 53707a5676a2..216bdb7d08b0 100644
--- a/sd/qa/unit/misc-tests.cxx
+++ b/sd/qa/unit/misc-tests.cxx
@@ -517,7 +517,7 @@ void SdMiscTest::testTdf101242_ODF_add_settings()
save(xDocShRef.get(), getFormat(ODG), aTempFile );
// Verify, that the saved document still has the ODF attributes
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "styles.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "styles.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'styles.xml'", pXmlDoc);
const OString sPathStart("/office:document-styles/office:master-styles/draw:layer-set/draw:layer");
assertXPath(pXmlDoc, sPathStart + "[@draw:name='backgroundobjects' and @draw:protected='true']");
@@ -525,7 +525,7 @@ void SdMiscTest::testTdf101242_ODF_add_settings()
assertXPath(pXmlDoc, sPathStart + "[@draw:name='measurelines' and @draw:display='printer']");
// Verify, that the saved document has got the items in settings.xml
- xmlDocPtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
+ xmlDocUniquePtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'settings.xml'", pXmlDoc2);
const OString sPathStart2("/office:document-settings/office:settings/config:config-item-set[@config:name='ooo:view-settings']/config:config-item-map-indexed[@config:name='Views']/config:config-item-map-entry");
// Value is a bitfield with first Byte in order '* * * measurelines controls backgroundobjects background layout'
@@ -567,7 +567,7 @@ void SdMiscTest::testTdf101242_ODF_no_settings()
save(xDocShRef.get(), getFormat(ODG), aTempFile );
// Verify, that the saved document still has the ODF attributes
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "styles.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "styles.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'styles.xml'", pXmlDoc);
const OString sPathStart("/office:document-styles/office:master-styles/draw:layer-set/draw:layer");
assertXPath(pXmlDoc, sPathStart + "[@draw:name='backgroundobjects' and @draw:protected='true']");
@@ -575,7 +575,7 @@ void SdMiscTest::testTdf101242_ODF_no_settings()
assertXPath(pXmlDoc, sPathStart + "[@draw:name='measurelines' and @draw:display='printer']");
// Verify, that the saved document has no layer items in settings.xml
- xmlDocPtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
+ xmlDocUniquePtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'settings.xml'", pXmlDoc2);
const OString sPathStart2("/office:document-settings/office:settings/config:config-item-set[@config:name='ooo:view-settings']/config:config-item-map-indexed[@config:name='Views']/config:config-item-map-entry");
xmlXPathObjectPtr pXmlObj=getXPathNode(pXmlDoc2, sPathStart2 + "/config:config-item[@config:name='VisibleLayers']");
@@ -609,7 +609,7 @@ void SdMiscTest::testTdf101242_settings_keep()
save(xDocShRef.get(), getFormat(ODG), aTempFile );
// Verify, that the saved document has the ODF attributes
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "styles.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "styles.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'styles.xml'", pXmlDoc);
const OString sPathStart("/office:document-styles/office:master-styles/draw:layer-set/draw:layer");
assertXPath(pXmlDoc, sPathStart + "[@draw:name='backgroundobjects' and @draw:protected='true']");
@@ -617,7 +617,7 @@ void SdMiscTest::testTdf101242_settings_keep()
assertXPath(pXmlDoc, sPathStart + "[@draw:name='measurelines' and @draw:display='printer']");
// Verify, that the saved document still has the items in settings.xml
- xmlDocPtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
+ xmlDocUniquePtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'settings.xml'", pXmlDoc2);
const OString sPathStart2("/office:document-settings/office:settings/config:config-item-set[@config:name='ooo:view-settings']/config:config-item-map-indexed[@config:name='Views']/config:config-item-map-entry");
// Value is a bitfield with first Byte in order '* * * measurelines controls backgroundobjects background layout'
@@ -660,7 +660,7 @@ void SdMiscTest::testTdf101242_settings_remove()
save(xDocShRef.get(), getFormat(ODG), aTempFile );
// Verify, that the saved document has the ODF attributes
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "styles.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "styles.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'styles.xml'", pXmlDoc);
const OString sPathStart("/office:document-styles/office:master-styles/draw:layer-set/draw:layer");
assertXPath(pXmlDoc, sPathStart + "[@draw:name='backgroundobjects' and @draw:protected='true']");
@@ -668,7 +668,7 @@ void SdMiscTest::testTdf101242_settings_remove()
assertXPath(pXmlDoc, sPathStart + "[@draw:name='measurelines' and @draw:display='printer']");
// Verify, that the saved document has no layer items in settings.xml
- xmlDocPtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
+ xmlDocUniquePtr pXmlDoc2 = parseExport(aTempFile, "settings.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'settings.xml'", pXmlDoc2);
const OString sPathStart2("/office:document-settings/office:settings/config:config-item-set[@config:name='ooo:view-settings']/config:config-item-map-indexed[@config:name='Views']/config:config-item-map-entry");
xmlXPathObjectPtr pXmlObj=getXPathNode(pXmlDoc2, sPathStart2 + "/config:config-item[@config:name='VisibleLayers']");
@@ -707,7 +707,7 @@ void SdMiscTest::testTdf119392()
save(xDocShRef.get(), getFormat(ODG), aTempFile );
// Verify correct bit order in bitfield in the config items in settings.xml
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "settings.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "settings.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'settings.xml'", pXmlDoc);
const OString sPathStart("/office:document-settings/office:settings/config:config-item-set[@config:name='ooo:view-settings']/config:config-item-map-indexed[@config:name='Views']/config:config-item-map-entry");
// First Byte is in order 'V-L -P- V-- measurelines controls backgroundobjects background layout'
@@ -798,7 +798,7 @@ void SdMiscTest::testTdf98839_ShearVFlipH()
utl::TempFile aTempFile;
aTempFile.EnableKillingFile();
save(xDocShRef.get(), getFormat(ODG), aTempFile);
- xmlDocPtr pXmlDoc = parseExport(aTempFile, "content.xml");
+ xmlDocUniquePtr pXmlDoc = parseExport(aTempFile, "content.xml");
CPPUNIT_ASSERT_MESSAGE("Failed to get 'content.xml'", pXmlDoc);
const OString sPathStart("/office:document-content/office:body/office:drawing/draw:page");
assertXPath(pXmlDoc, sPathStart);