summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@suse.cz>2012-05-11 16:29:19 +0200
committerMiklos Vajna <vmiklos@suse.cz>2012-05-11 16:29:44 +0200
commitf506ca0fee6114210d41c9c4a5f7eff5f5666d02 (patch)
tree5cab66f64816f6ed66b74432f120b9437ac1073f
parentf0a520421247de3345e2039ed6bc0e642aa52a8e (diff)
fdo#45522 fix crash on RTF export of sub-tables during copy&paste
Change-Id: I71b0794c597344723dd53e114b5ad03605b8c859
-rw-r--r--sw/source/filter/ww8/rtfattributeoutput.cxx2
1 files changed, 1 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index e5ebc52525fc..c8efc8270c2a 100644
--- a/sw/source/filter/ww8/rtfattributeoutput.cxx
+++ b/sw/source/filter/ww8/rtfattributeoutput.cxx
@@ -257,7 +257,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 );