summaryrefslogtreecommitdiff
path: root/sw/source/filter
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2017-12-13 15:36:14 +0100
committerThorsten Behrens <Thorsten.Behrens@CIB.de>2017-12-15 11:54:01 +0100
commit66466f4bec9e3b3d2fcb6698b564279eca81c3bb (patch)
treea5410f857380f36ded9bd026abfdd0274e747fce /sw/source/filter
parent6c36901e94b5dd21604d63b48b091cf9d32fa2ad (diff)
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 Reviewed-on: https://gerrit.libreoffice.org/46522 Reviewed-by: Thorsten Behrens <Thorsten.Behrens@CIB.de> Tested-by: Thorsten Behrens <Thorsten.Behrens@CIB.de>
Diffstat (limited to 'sw/source/filter')
-rw-r--r--sw/source/filter/ww8/wrtw8nds.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/wrtw8nds.cxx b/sw/source/filter/ww8/wrtw8nds.cxx
index c9ecf63e7d06..3064f505d4ac 100644
--- a/sw/source/filter/ww8/wrtw8nds.cxx
+++ b/sw/source/filter/ww8/wrtw8nds.cxx
@@ -2240,7 +2240,8 @@ void MSWordExportBase::OutputTextNode( const 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