paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-17 21:59:16 +02:00
Code Issues Packages Projects Releases Wiki Activity

TValueListEditor: fix DeleteRow (Issue #0034208)

Browse Source 
git-svn-id: trunk@59030 -
This commit is contained in:
bart 2018-09-16 11:11:07 +00:00
parent c814ad8b50
commit 2ddfb4072a
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lcl/valedit.pas
View File

@ -151,6 +151,7 @@ type
procedure ShowColumnTitles; procedure ShowColumnTitles;
procedure AdjustRowCount; virtual; procedure AdjustRowCount; virtual;
procedure ColRowExchanged(IsColumn: Boolean; index, WithIndex: Integer); override; procedure ColRowExchanged(IsColumn: Boolean; index, WithIndex: Integer); override;
procedure ColRowDeleted(IsColumn: Boolean; index: Integer); override;
procedure DefineCellsProperty(Filer: TFiler); override; procedure DefineCellsProperty(Filer: TFiler); override;
procedure InvalidateCachedRow; procedure InvalidateCachedRow;
procedure GetAutoFillColumnInfo(const Index: Integer; var aMin,aMax,aPriority: Integer); override; procedure GetAutoFillColumnInfo(const Index: Integer; var aMin,aMax,aPriority: Integer); override;
@ -770,9 +771,8 @@ end;
procedure TValueListEditor.DeleteRow(Index: Integer); procedure TValueListEditor.DeleteRow(Index: Integer);
begin begin
Index := Index - FixedRows;
//If we have only one row, it may be empty and we cannot remove //If we have only one row, it may be empty and we cannot remove
if not ((Index = 0) and (Strings.Count = 0)) then Strings.Delete(Index); if not ((Index - FixedRows = 0) and (Strings.Count = 0)) then inherited DeleteRow(Index) ;
end; end;
procedure TValueListEditor.DeleteCol(Index: Integer); procedure TValueListEditor.DeleteCol(Index: Integer);
@ -1122,6 +1122,13 @@ begin
inherited ColRowExchanged(IsColumn, index, WithIndex); inherited ColRowExchanged(IsColumn, index, WithIndex);
end; end;
procedure TValueListEditor.ColRowDeleted(IsColumn: Boolean; index: Integer);
begin
EditorMode := False;
Strings.Delete(Index-FixedRows);
inherited ColRowDeleted(IsColumn, index);
end;
procedure TValueListEditor.DefineCellsProperty(Filer: TFiler); procedure TValueListEditor.DefineCellsProperty(Filer: TFiler);
begin begin
end; end;