Fixed crash when deleting column and having the inset locked.

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

diff --git a/ChangeLog b/ChangeLog
index de9e8606d9872630938516672a470367eef5124a..f60fe5e31d97378256caf62262eb045674481f2f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,7 @@
 
        * src/insets/insettabular.C (resetPos): an extra scroll, but we
        really should redo all this scrolling code!
+       (TabularFeatures): unlock the_locking_inset before add/del rows/colums.
 
        * src/text.C (GetVisibleRow): check that y/h values are good otherwise
        change them.

diff --git a/src/insets/insettabular.C b/src/insets/insettabular.C
index 33e15752363f3269120219d846890f6e964da969..faa031e06aaee8129cbb1ac64d4763693e96886e 100644 (file)
--- a/src/insets/insettabular.C
+++ b/src/insets/insettabular.C
@@ -1556,11 +1556,13 @@ void InsetTabular::TabularFeatures(BufferView * bv,
        break;
     case LyXTabular::APPEND_COLUMN:
        // append the column into the tabular
+       UnlockInsetInInset(bv, the_locking_inset);
        tabular->AppendColumn(actcell);
        actcell = tabular->GetCellNumber(row, column);
        UpdateLocal(bv, INIT, true);
        break;
     case LyXTabular::DELETE_ROW:
+       UnlockInsetInInset(bv, the_locking_inset);
        tabular->DeleteRow(tabular->row_of_cell(actcell));
        if ((row+1) > tabular->rows())
            --row;
@@ -1569,6 +1571,7 @@ void InsetTabular::TabularFeatures(BufferView * bv,
        UpdateLocal(bv, INIT, true);
        break;
     case LyXTabular::DELETE_COLUMN:
+       UnlockInsetInInset(bv, the_locking_inset);
        tabular->DeleteColumn(tabular->column_of_cell(actcell));
        if ((column+1) > tabular->columns())
            --column;