diff options
author | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-05-16 01:40:30 +0200 |
---|---|---|
committer | Bjoern Michaelsen <bjoern.michaelsen@canonical.com> | 2011-05-16 19:15:41 +0200 |
commit | 5d71b5082bdf17abbbb84bd02750a83741579f9a (patch) | |
tree | 8b1f2fafa1d522164c0ccc065f1f8434506fa4b3 | |
parent | 29eece847b948d25abde0b602f28378d74d567fb (diff) |
fdo#35668: do not manually free parser context
* reenable complex.unoxml.DOMTest testXDocumentBuilder()
* do not manually free parser context, there is a shared_ptr for that
-rw-r--r-- | unoxml/qa/complex/unoxml/DOMTest.java | 3 | ||||
-rw-r--r-- | unoxml/source/dom/documentbuilder.cxx | 1 |
2 files changed, 1 insertions, 3 deletions
diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java index ba276e0fc..d4b9a5fcf 100644 --- a/unoxml/qa/complex/unoxml/DOMTest.java +++ b/unoxml/qa/complex/unoxml/DOMTest.java @@ -98,8 +98,7 @@ public class DOMTest //FIXME TODO } - // fd#35668 disabled, this crashes LibreOffice - //@Test + @Test public void testXDocumentBuilder() throws Exception { XDocumentBuilder xBuilder = diff --git a/unoxml/source/dom/documentbuilder.cxx b/unoxml/source/dom/documentbuilder.cxx index f95096432..0f240399b 100644 --- a/unoxml/source/dom/documentbuilder.cxx +++ b/unoxml/source/dom/documentbuilder.cxx @@ -316,7 +316,6 @@ namespace DOM saxex.Message = make_error_message(ctxt); saxex.LineNumber = static_cast<sal_Int32>(ctxt->lastError.line); saxex.ColumnNumber = static_cast<sal_Int32>(ctxt->lastError.int2); - xmlFreeParserCtxt(ctxt); throw saxex; } |