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 01:50:30 +0200 |
| commit | 883e8dbbe6f54a3002ce04d4d03a2d727ee4e2fa (patch) | |
| tree | 2cd099a86adeef1b360f79e2b72ddf798c706877 | |
| parent | fe583c187b0ebf82b650bba4f760dff25103caba (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 8b38fd36f..b5c19d0a5 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; } |