From 82b89ae452de7c373d00a5caede2a551c89805d2 Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Fri, 11 May 2012 16:29:19 +0200 Subject: fdo#45522 fix crash on RTF export of sub-tables during copy&paste MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: I71b0794c597344723dd53e114b5ad03605b8c859 (cherry picked from commit f506ca0fee6114210d41c9c4a5f7eff5f5666d02) Signed-off-by: Caolán McNamara --- sw/source/filter/ww8/rtfattributeoutput.cxx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx index 4beb0df127df..5019a404f8b0 100644 --- a/sw/source/filter/ww8/rtfattributeoutput.cxx +++ b/sw/source/filter/ww8/rtfattributeoutput.cxx @@ -252,7 +252,7 @@ void RtfAttributeOutput::StartParagraph( ww8::WW8TableNodeInfo::Pointer_t pTextN OSL_ENSURE( pDeepInner, "TableNodeInfoInner not found"); // Make sure we always start a row between ending one and starting a cell. // In case of subtables, we may not get the first cell. - if ((pDeepInner && pDeepInner->getCell() == 0) || m_bTableRowEnded) + if (pDeepInner && (pDeepInner->getCell() == 0 || m_bTableRowEnded)) { m_bTableRowEnded = false; StartTableRow( pDeepInner ); -- cgit v1.2.3