[Libreoffice-commits] .: Branch 'libreoffice-3-5' - sw/source

[Caolán McNamara]

 sw/source/filter/ww8/rtfattributeoutput.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 82b89ae452de7c373d00a5caede2a551c89805d2
Author: Miklos Vajna <vmiklos at suse.cz>
Date:   Fri May 11 16:29:19 2012 +0200

    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 at redhat.com>

diff --git a/sw/source/filter/ww8/rtfattributeoutput.cxx b/sw/source/filter/ww8/rtfattributeoutput.cxx
index 4beb0df..5019a40 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 );