summaryrefslogtreecommitdiff
path: root/sw
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 /sw
parentf0a520421247de3345e2039ed6bc0e642aa52a8e (diff)
fdo#45522 fix crash on RTF export of sub-tables during copy&paste
Change-Id: I71b0794c597344723dd53e114b5ad03605b8c859
Diffstat (limited to 'sw')
-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 );
85f5c59ff2196f4b6a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117738 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> 2021-06-22uitest: guard load_fileXisco Fauli Mostly done by a script for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac < UITest: introduce guarded context managers > Change-Id: Ia924293dc2a12230fd13f69fd734875ced86be8a Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117593 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> 2021-06-21uitest: guard execute_blocking_actionXisco Fauli so even if an assert fails, the dialog is closed afterwards for motivation, see 89aaa17a0a4413f07da2bc5084b0164f15dc01ac < UITest: introduce guarded context managers > Change-Id: I9a3adb52546238d960eeaaaf03b6bdbbd5718cf8 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117392 Tested-by: Jenkins Tested-by: Xisco Fauli <xiscofauli@libreoffice.org> Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org> 2021-01-14uitest: sc: factor out common code ( part 2 )Xisco Fauli Change-Id: Ia2a707f1df513e067c8e34b263ad336fed6d14dd Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109235 Tested-by: Jenkins Reviewed-by: Xisco Fauli <xiscofauli@libreoffice.org>