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

Oliver Specht oliver.specht at cib.de
Tue Oct 6 09:20:11 PDT 2015


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

New commits:
commit 3eff65e78a3a90b07c7a01ff26736fd25996e476
Author: Oliver Specht <oliver.specht at cib.de>
Date:   Tue Oct 6 14:51:16 2015 +0200

    tdf#90810: skip all elements outside of the requested footnote
    
    the footnote stream is parsed completely at each footnote insertion
    all elements outside of the requested footnote need to be skipped
    
    Change-Id: I8909145411003ce6f924e712c2da00a4dc03a974
    Reviewed-on: https://gerrit.libreoffice.org/19192
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Oliver Specht <oliver.specht at cib.de>

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


More information about the Libreoffice-commits mailing list