and also correctly draw selected multicolumn cells while we're at it...

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@33765 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index c323e9f007f90f1b4738ee337808108a55b7687a..137e8812dd9f2d68b6778ebb20b296ece9c414a7 100644 (file)
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3260,8 +3260,10 @@ bool InsetTabular::isCellSelected(Cursor & cur, row_type row, col_type col)
                        getSelection(cur, rs, re, cs, ce);
                        
                        idx_type const cell = tabular.cellIndex(row, col);
-                       row_type const span = tabular.rowSpan(cell);
-                       if (col >= cs && col <= ce && row + span - 1 >= rs && row <= re)
+                       col_type const cspan = tabular.columnSpan(cell);
+                       row_type const rspan = tabular.rowSpan(cell);
+                       if (col + cspan - 1 >= cs && col <= ce 
+                               && row + rspan - 1 >= rs && row <= re)
                                return true;
                } else 
                        if (col == tabular.cellColumn(cur.idx())