paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-08-12 13:50:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

LCL: fix TValueListEditor LoadContent in case of exceptions, issue #36182

Browse Source
This commit is contained in:
Jesus Reyes A 2021-08-24 02:24:27 -05:00
parent f530072937
commit 1eeb23074a
2 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lcl/grids.pas
View File

@ -9898,8 +9898,11 @@ begin
Version:=ACfg.GetValue('grid/version',-1); Version:=ACfg.GetValue('grid/version',-1);
if Version=-1 then raise Exception.Create(rsNotAValidGridFile); if Version=-1 then raise Exception.Create(rsNotAValidGridFile);
BeginUpdate; BeginUpdate;
LoadContent(ACfg, Version); try
EndUpdate; LoadContent(ACfg, Version);
finally
EndUpdate;
end;
end; end;
procedure TCustomGrid.LoadFromFile(FileName: string); procedure TCustomGrid.LoadFromFile(FileName: string);

61
lcl/valedit.pas
View File

@ -1334,45 +1334,61 @@ end;
procedure TValueListEditor.LoadContent(cfg: TXMLConfig; Version: Integer); procedure TValueListEditor.LoadContent(cfg: TXMLConfig; Version: Integer);
var var
ContentSaved, HasColumnTitles, AlwaysShowEditor, HasSaveContent: Boolean; ContentSaved, HasColumnTitles, AlwaysShowEditor: Boolean;
i,j,k, RC: Integer; i,j,k, RC: Integer;
KeyCap, ValCap, S: String; KeyCap, ValCap, S: String;
oldSaveOptions: TSaveOptions;
begin begin
// Check that this file is a valid ValueListEditor grid
RC := cfg.GetValue('grid/content/rowcount', -1);
if (RC = -1) then
raise EStreamError.CreateFmt(rsVLENoRowCountFound,[cfg.Filename]);
if (RC < 1) then RC := 1;
HasColumnTitles := cfg.getValue('grid/content/hascolumntitles', False);
//contrary to other grids we restore the entire saved content,
//so we add/delete rows (not columns of course) as needed.
if HasColumnTitles and (RC = 1) then
RC := 2;
// Check that cell content makes sense
k:=cfg.getValue('grid/content/cells/cellcount', 0);
while k>0 do
begin
i := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/column', -1);
j := cfg.GetValue('grid/content/cells/cell'+IntTostr(k)+'/row',-1);
if (j<0) or (j>RC-1) then
raise EStreamError.CreateFmt(rsVLERowIndexOutOfBounds,[cfg.Filename,j]);
if not IsColumnIndexValid(i) then
raise EStreamError.CreateFmt(rsVLEColIndexOutOfBounds,[cfg.Filename,i]);
Dec(k);
end;
KeyCap := ''; KeyCap := '';
ValCap := ''; ValCap := '';
oldSaveOptions := SaveOptions;
BeginUpdate; BeginUpdate;
try try
AlwaysShowEditor := (goAlwaysShowEditor in Options); AlwaysShowEditor := (goAlwaysShowEditor in Options);
if AlwaysShowEditor then Options := Options - [goAlwaysShowEditor]; if AlwaysShowEditor then Options := Options - [goAlwaysShowEditor];
HasSaveContent := soContent in SaveOptions;
//no need to load content in inherited LoadContent, since we re-implemented that here. SaveOptions := SaveOptions - [soContent];
if HasSaveContent then
SaveOptions := SaveOptions - [soContent];
inherited LoadContent(Cfg, Version); inherited LoadContent(Cfg, Version);
if HasSaveContent then
SaveOptions := SaveOptions + [soContent]; if soContent in oldSaveOptions then
if soContent in SaveOptions then
begin begin
ContentSaved:=Cfg.GetValue('grid/saveoptions/content', false); ContentSaved:=Cfg.GetValue('grid/saveoptions/content', false);
if ContentSaved then if ContentSaved then
begin begin
Clean(0,0,ColCount-1,RowCount-1,[]); //needed if the to be loaded grid has no entries Clean(0,0,ColCount-1,RowCount-1,[]); //needed if the to be loaded grid has no entries
HasColumnTitles := cfg.getValue('grid/content/hascolumntitles', False);
if HasColumnTitles then if HasColumnTitles then
DisplayOptions := DisplayOptions + [doColumnTitles] DisplayOptions := DisplayOptions + [doColumnTitles]
else else
DisplayOptions := DisplayOptions - [doColumnTitles]; DisplayOptions := DisplayOptions - [doColumnTitles];
//contrary to other grids we restore the entire saved content,
//so we add/delete rows (not columns of course) as needed.
RC := cfg.GetValue('grid/content/rowcount', -1);
if (RC = -1) then
begin
raise EStreamError.CreateFmt(rsVLENoRowCountFound,[cfg.Filename]);
end;
if (RC < 1) then RC := 1;
if HasColumnTitles and (RC = 1) then
RC := 2;
RowCount := RC; RowCount := RC;
k:=cfg.getValue('grid/content/cells/cellcount', 0); k:=cfg.getValue('grid/content/cells/cellcount', 0);
@ -1380,10 +1396,6 @@ begin
begin begin
i := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/column', -1); i := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/column', -1);
j := cfg.GetValue('grid/content/cells/cell'+IntTostr(k)+'/row',-1); j := cfg.GetValue('grid/content/cells/cell'+IntTostr(k)+'/row',-1);
if not IsRowIndexValid(j) then
raise EStreamError.CreateFmt(rsVLERowIndexOutOfBounds,[cfg.Filename,j]);
if not IsColumnIndexValid(i) then
raise EStreamError.CreateFmt(rsVLEColIndexOutOfBounds,[cfg.Filename,i]);
S := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/text',''); S := cfg.GetValue('grid/content/cells/cell'+IntToStr(k)+'/text','');
Cells[i,j] := S; Cells[i,j] := S;
if HasColumnTitles and (i = 0) and (j = 0) then if HasColumnTitles and (i = 0) and (j = 0) then
@ -1397,8 +1409,7 @@ begin
end; end;
finally finally
if AlwaysShowEditor then Options := Options + [goAlwaysShowEditor]; if AlwaysShowEditor then Options := Options + [goAlwaysShowEditor];
if HasSaveContent then SaveOptions := oldSaveOptions;
SaveOptions := SaveOptions + [soContent];
EndUpdate(True); EndUpdate(True);
end; end;
end; end;