[LyX/2.0.x] Fix wrong painting of lines right of multicol

[Vincent van Ravesteijn]

commit a6fce04f394022abffef53a297f132c55313c0db
Author: Vincent van Ravesteijn <v...@lyx.org>
Date:   Wed Feb 5 21:30:04 2014 +0100

    Fix wrong painting of lines right of multicol
    
    We should skip the other cells that are part of the multicolumn before we 
find the cell right to the current one.
    
    Fixes-bug: #8082

diff --git a/src/insets/InsetTabular.cpp b/src/insets/InsetTabular.cpp
index 1e1b294..ac82d35 100644
--- a/src/insets/InsetTabular.cpp
+++ b/src/insets/InsetTabular.cpp
@@ -3788,9 +3788,13 @@ void InsetTabular::drawCellLines(PainterInfo & pi, int 
x, int y,
 
        // Right
        x -= tabular.interColumnSpace(cell);
+       col_type next_cell_col = col + 1;
+       while (next_cell_col < tabular.ncols() 
+               && tabular.isMultiColumn(tabular.cellIndex(row, next_cell_col)))
+               next_cell_col++;
        drawline = tabular.rightLine(cell)
-                  || (col + 1 < tabular.ncols()
-                      && tabular.leftLine(tabular.cellIndex(row, col + 1)));
+                  || (next_cell_col < tabular.ncols()
+                      && tabular.leftLine(tabular.cellIndex(row, 
next_cell_col)));
        pi.pain.line(x + w, y, x + w, y + h,
                drawline ? linecolor : gridcolor,
                drawline ? Painter::line_solid : Painter::line_onoffdash);