[Libreoffice-commits] core.git: writerfilter/source

[Stephan Bergmann]

 writerfilter/source/ooxml/OOXMLFastContextHandler.cxx |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 955c8f4c7b6038aa802e33074623b8eab0494d0c
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Wed Oct 7 09:54:40 2015 +0200

    Revert "tdf#90810: skip all elements outside of the requested footnote"
    
    This reverts commit 3eff65e78a3a90b07c7a01ff26736fd25996e476, causes assert at
    writerfilter/source/dmapper/DomainMapper_Impl.cxx:5330 to fire during
    CppunitTest_sw_ooxmlexport2

diff --git a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
index 43feb41..898dacd 100644
--- a/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
+++ b/writerfilter/source/ooxml/OOXMLFastContextHandler.cxx
@@ -189,9 +189,8 @@ throw (uno::RuntimeException, xml::sax::SAXException, std::exception)
         m_bDiscardChildren = aState.m_bDiscardChildren;
         m_bTookChoice = aState.m_bTookChoice;
     }
-    else if (!m_bDiscardChildren && isForwardEvents())
+    else if (!m_bDiscardChildren)
         lcl_endFastElement(Element);
-
 }
 
 void OOXMLFastContextHandler::lcl_startFastElement