summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2014-02-13 10:30:06 +0000
committerCaolán McNamara <caolanm@redhat.com>2014-02-13 11:04:31 +0000
commit02ef234b77b6c5f4c0d6634881168313e97288d1 (patch)
treed5b714778a02207a12832df4d7af44a07e36f867 /vcl
parentcfa4f622caa155dd8ab1215a324dd409cd447cd6 (diff)
fix homogeneous grid spanning row/col handling
Change-Id: I26ca29f2b02a1587cfe94d5342809f51a207a194
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/window/layout.cxx4
1 files changed, 2 insertions, 2 deletions
diff --git a/vcl/source/window/layout.cxx b/vcl/source/window/layout.cxx
index e22114746f02..4cfdc80ace0c 100644
--- a/vcl/source/window/layout.cxx
+++ b/vcl/source/window/layout.cxx
@@ -801,13 +801,13 @@ VclGrid::array_type VclGrid::assembleGrid() const
if (get_column_homogeneous())
{
for (sal_Int32 nSpanX = 1; nSpanX < rEntry.nSpanWidth; ++nSpanX)
- aNonEmptyCols[x+1] = true;
+ aNonEmptyCols[x+nSpanX] = true;
}
aNonEmptyRows[y] = true;
if (get_row_homogeneous())
{
for (sal_Int32 nSpanY = 1; nSpanY < rEntry.nSpanHeight; ++nSpanY)
- aNonEmptyRows[x+1] = true;
+ aNonEmptyRows[y+nSpanY] = true;
}
}
}