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

[Libreoffice Gerrit user]

 sw/source/filter/ww8/ww8par2.cxx |    1 -
 1 file changed, 1 deletion(-)

New commits:
commit 55fe92fb396ebcfffe30831ebb460bfb3e6274aa
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Mon Oct 1 23:57:06 2012 +0100

    Resolves: fdo#54862 extra ++n causing merged cells to be skipped
    
    commit 567c1db25bd705faac44203e4a3d01d0f5e1385c reverted a pile
    of other commits, including 858b5b4f36a357fe7192e7c2ed9cc3cdfc81fd8f
    but didn't revert the ++n of that commit, leading to merge groups
    getting skipped
    
    Change-Id: Ie2b46ebc433df636ebe0092f4a992631b7f06a3f
    (cherry picked from commit b966a09c2da9441961c93c44be556399575db849)
    
    Signed-off-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index 1b5bd75..679f116 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2751,7 +2751,6 @@ void WW8TabDesc::FinishSwTable()
                                                nRowSpan :
                                              ((-1) * (nRowSpan - n));
                     pCurrentBox->setRowSpan( nRowSpanSet );
-                    ++n;
                 }
             }
         }