[PATCH] Bugfix for improper function call, column count was compared...

[Karthikeyan Krishnamurthi (via Code Review)]

Hi,

I have submitted a patch for review:

    https://gerrit.libreoffice.org/1562

To pull it, you can do:

    git pull ssh://gerrit.libreoffice.org:29418/core refs/changes/62/1562/1

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

Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
---
M svx/source/table/tablemodel.cxx
1 file changed, 1 insertion(+), 1 deletion(-)



diff --git a/svx/source/table/tablemodel.cxx b/svx/source/table/tablemodel.cxx
index 34778d3..172f784 100644
--- a/svx/source/table/tablemodel.cxx
+++ b/svx/source/table/tablemodel.cxx
@@ -1118,7 +1118,7 @@
     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!");
     }

-- 
To view, visit https://gerrit.libreoffice.org/1562
To unsubscribe, visit https://gerrit.libreoffice.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iacf59548209d2be8b36839ae12bed9cedb7bdded
Gerrit-PatchSet: 1
Gerrit-Project: core
Gerrit-Branch: master
Gerrit-Owner: Karthikeyan Krishnamurthi <karthikeyan at kacst.edu.sa>