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

[Michael Stahl]

 sw/source/filter/ww8/wrtw8nds.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit 255376bae1a1459ec975b49c3295abe3b9b719c6
Author: Michael Stahl <mstahl at redhat.com>
Date:   Wed Dec 13 15:36:14 2017 +0100

    sw: fix crash exporting ooo72077-2.odt to DOCX
    
    There is an assertion about empty lastOpenCell vector in
    DocxAttributeOutput::SyncNodelessCells(); since i don't know
    if this splitting should be done at all for paragraphs in a table,
    let's disable it for now.
    
    (regression from c1d58c46eec5081576979f584151c7e9a4f67fe0)
    
    Change-Id: Ied67b6047b48689cba3c41b9d0f68b7c2a257ba0

diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index 54466b48f5d0..a9cf06d2974a 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2274,7 +2274,8 @@ void MSWordExportBase::OutputTextNode( SwTextNode& rNode )
 
     SwSoftPageBreakList softBreakList;
     // Let's decide if we need to split the paragraph because of a section break
-    bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList );
+    bool bNeedParaSplit = NeedTextNodeSplit( rNode, softBreakList )
+                        && !IsInTable();
 
     auto aBreakIt = softBreakList.begin();
     // iterate through portions on different pages