diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-10-01 23:57:06 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2012-10-02 12:51:51 +0200 |
| commit | 55fe92fb396ebcfffe30831ebb460bfb3e6274aa (patch) | |
| tree | c6b4fa29d0449af3cfee0b5c409b98f37e80eeaf /sw | |
| parent | 29bd9606cf7c915a61f31418cf187de8f5aa84e9 (diff) | |
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@redhat.com>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/filter/ww8/ww8par2.cxx | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx index 1b5bd7588a0b..679f1161df60 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; } } } |