[Libreoffice-commits] .: Branch 'libreoffice-3-5-7' - writerfilter/source

[Libreoffice Gerrit user]

 writerfilter/source/dmapper/DomainMapper_Impl.hxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 414599ada2fa2288f98495000069b75fba39ed83
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Wed Oct 3 09:57:12 2012 +0200

    rhbz#861680 fix crash on tables in substreams
    
    Background: the old RTF filter in 3.4 supported tables in substreams
    (headers, footers, etc), while 3.5.5 did not, so even if this is
    technically a new feature, it got backported to -3-5. As the bugreport
    states, this caused problems in the docx import. Instead of trying to
    find out where was the problem (it's already fixed in -3-6 and master,
    and I forgot how it happened), just disable this feature for DOCX, where
    this never worked, so doing so does not cause any regression.
    
    Change-Id: I39d486e3c69546519e232943f50675402b7bb595
    Reviewed-by: Fridrich Strba <fridrich at documentfoundation.org>
    Reviewed-on: https://gerrit.libreoffice.org/756
    Reviewed-by: Michael Meeks <michael.meeks at suse.com>
    Tested-by: Michael Meeks <michael.meeks at suse.com>
    Reviewed-by: Norbert Thiebaud <nthiebaud at gmail.com>

diff --git a/writerfilter/source/dmapper/DomainMapper_Impl.hxx b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
index d533cad..fbb986a 100644
--- a/writerfilter/source/dmapper/DomainMapper_Impl.hxx
+++ b/writerfilter/source/dmapper/DomainMapper_Impl.hxx
@@ -554,7 +554,8 @@ public:
 
     void appendTableHandler( )
     {
-        if (m_pTableHandler.get())
+        // For -3-5, support tables in substreams only for RTF
+        if (m_pTableHandler.get() && IsRTFImport())
             m_aTableManagers.top()->setHandler(m_pTableHandler);
     }