diff options
author | Miklos Vajna <vmiklos@suse.cz> | 2012-05-11 16:29:19 +0200 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2012-06-01 15:27:51 +0100 |
commit | 82b89ae452de7c373d00a5caede2a551c89805d2 (patch) | |
tree | dbb45c3fd8a05c1361cc0c1b386edf6c6904109d | |
parent | c3aa0136b977d3885d4dc983254372c9a6cee27c (diff) |
fdo#45522 fix crash on RTF export of sub-tables during copy&paste
Change-Id: I71b0794c597344723dd53e114b5ad03605b8c859
(cherry picked from commit f506ca0fee6114210d41c9c4a5f7eff5f5666d02)
Signed-off-by: Caolán McNamara <caolanm@redhat.com>
-rw-r--r-- | sw/source/filter/ww8/rtfattributeoutput.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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 ); |