summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-10-01 23:57:06 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-10-02 00:05:57 +0100
commitb966a09c2da9441961c93c44be556399575db849 (patch)
tree434b5fe7bba06b4ab6304b7ff18bc127e63f1a4b
parentd67dff5719b32c17f4bf02990de5d7a772db484c (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
-rw-r--r--sw/source/filter/ww8/ww8par2.cxx1
1 files changed, 0 insertions, 1 deletions
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index a4336b9f5a18..83db83e8b71e 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2752,7 +2752,6 @@ void WW8TabDesc::FinishSwTable()
nRowSpan :
((-1) * (nRowSpan - n));
pCurrentBox->setRowSpan( nRowSpanSet );
- ++n;
}
}
}