svx/source/table/tablemodel.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit aaaa5350075ad5f589c242ec40f9f6ab7fe822a5
Author: K_Karthikeyan <karthike...@kacst.edu.sa>
Date: Mon Jan 7 13:56:08 2013 +0300
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 <mst...@redhat.com>
Tested-by: Michael Stahl <mst...@redhat.com>
diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 5387babf..59358e3 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!");
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
