Bugfix for improper function call, column count was compared with row count

Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Reviewed-on: https://gerrit.libreoffice.org/1562Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>

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!");
     }