[Libreoffice-commits] .: Branch 'libreoffice-3-4' - unoxml/qa unoxml/source

[Bjoern Michaelsen]

 unoxml/qa/complex/unoxml/DOMTest.java |    3 +--
 unoxml/source/dom/documentbuilder.cxx |    1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 5d71b5082bdf17abbbb84bd02750a83741579f9a
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Mon May 16 01:40:30 2011 +0200

    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

diff --git a/unoxml/qa/complex/unoxml/DOMTest.java b/unoxml/qa/complex/unoxml/DOMTest.java
index ba276e0..d4b9a5f 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 f950964..0f24039 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;
     }