From: Jürgen Vigna <jug@sad.it>
Date: Thu, 4 Jan 2001 14:31:10 +0000 (+0000)
Subject: Fixed crash when deleting column and having the inset locked.
X-Git-Tag: 1.6.10~21748
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=4eb5ce69523be51d0defa92b4720d0b4ea037977;p=features.git

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 de9e8606d9..f60fe5e31d 100644
--- 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 33e1575236..faa031e06a 100644
--- 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;