Changeset 9307 for branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

Timestamp:

03/12/13 09:26:49 (11 years ago)

Author:

sforsten

Message:

#2018: restored original behaviour of StringConvertibleMatrixView

File:

• branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs (modified) (2 diffs)

branches/ImprovingStringConvertibleMatrix/HeuristicLab.Data.Views/3.3/StringConvertibleMatrixView.cs

@@ -130 +130 @@
       virtualRowIndices = Enumerable.Range(0, Content.Rows).ToArray();
 
-      //dataGridView.RowCount = 0;
-
       if (Content.Columns == 0) {
         Content.Columns = 1;
@@ -262 +260 @@
     #region DataGridView Events
     private void dataGridView_CellValidating(object sender, DataGridViewCellValidatingEventArgs e) {
-      if (!dataGridView.ReadOnly) {
+      // RowIndex and ColumnIndex have to be checked, if they are in bounds, otherwise Cancel might be set, which can lead to exceptions
+      if (!dataGridView.ReadOnly && e.RowIndex < Content.Rows && e.ColumnIndex < Content.Columns) {
         string errorMessage;
         if (Content != null && !Content.Validate(e.FormattedValue.ToString(), out errorMessage)) {
-          //e.Cancel = true;
+          e.Cancel = true;
           dataGridView.Rows[e.RowIndex].ErrorText = errorMessage;
         }