pascal/lazarus-ccr
1
0
Fork 0
Code Issues Releases Activity

fpspreadsheet: Fix WorksheetGrid not calculating formulas in current cell

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@4021 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2015-03-13 14:54:55 +00:00
parent 6a56fc20c9
commit 31bd092955
3 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/examples/visual/shared/ssortparamsform.pas
View File

@ -171,7 +171,7 @@ end;
procedure TSortParamsForm.UpdateColRowList; procedure TSortParamsForm.UpdateColRowList;
var var
L: TStrings; L: TStrings;
r,c: Cardinal; r,c: LongInt;
r1,c1, r2,c2: Cardinal; r1,c1, r2,c2: Cardinal;
begin begin
with FWorksheetGrid do begin with FWorksheetGrid do begin

2
components/fpspreadsheet/examples/visual/spready/spready.lpr
View File

@ -4,7 +4,7 @@ program spready;
uses uses
Interfaces, // this includes the LCL widgetset Interfaces, // this includes the LCL widgetset
Forms, mainform, laz_fpspreadsheet_visual, sCtrls, fpsCurrency, Forms, mainform, sCtrls, fpsCurrency,
scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform; scsvparamsform, sfcurrencyform, sformatsettingsform, ssortparamsform;
{$R *.res} {$R *.res}

5
components/fpspreadsheet/fpspreadsheet.pas
View File

@ -1601,10 +1601,13 @@ end;
@param ACol Column index of the cell which has been changed @param ACol Column index of the cell which has been changed
-------------------------------------------------------------------------------} -------------------------------------------------------------------------------}
procedure TsWorksheet.ChangedCell(ARow, ACol: Cardinal); procedure TsWorksheet.ChangedCell(ARow, ACol: Cardinal);
var
cell: PCell;
begin begin
if (FWorkbook.FCalculationLock = 0) and (boAutoCalc in FWorkbook.Options) then if (FWorkbook.FCalculationLock = 0) and (boAutoCalc in FWorkbook.Options) then
begin begin
if CellUsedInFormula(ARow, ACol) then cell := FindCell(ARow, ACol);
if HasFormula(cell) or CellUsedInFormula(ARow, ACol) then
CalcFormulas; CalcFormulas;
end; end;
if Assigned(FOnChangeCell) then if Assigned(FOnChangeCell) then