fix homogeneous grid spanning row/col handling

Change-Id: I26ca29f2b02a1587cfe94d5342809f51a207a194

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;
                 }
             }
         }