diff options
| author | K_Karthikeyan <karthikeyan@kacst.edu.sa> | 2013-01-07 13:56:08 +0300 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2013-01-07 16:53:11 +0100 |
| commit | 5e13f102b85253d44325f976b3717cae79232875 (patch) | |
| tree | bfc3d30614906445c7fd46d615531b5b84746aff /svx/source | |
| parent | 96b985145b3efbaf4552adbeccf24bfac2fa71b0 (diff) | |
Bugfix for improper function call, column count was compared with row count
Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Reviewed-on: https://gerrit.libreoffice.org/1562
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
(cherry picked from commit aaaa5350075ad5f589c242ec40f9f6ab7fe822a5)
Diffstat (limited to 'svx/source')
| -rw-r--r-- | svx/source/table/tablemodel.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx index 46b1c9a6f462..93ebc58cc664 100644 --- a/svx/source/table/tablemodel.cxx +++ b/svx/source/table/tablemodel.cxx @@ -1116,7 +1116,7 @@ void TableModel::merge( sal_Int32 nCol, sal_Int32 nRow, sal_Int32 nColSpan, sal_ const sal_Int32 nLastRow = nRow + nRowSpan; const sal_Int32 nLastCol = nCol + nColSpan; - if( (nLastRow > getRowCount()) || (nLastCol > getRowCount() ) ) + if( (nLastRow > getRowCount()) || (nLastCol > getColumnCount() ) ) { OSL_FAIL("TableModel::merge(), merge beyound the table!"); } |