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

fpspreadsheet: clean up

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7643 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-09-04 09:05:50 +00:00
parent 872c04e07a
commit 96dc6b9939
1 changed files with 0 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
View File

@ -409,7 +409,6 @@ type
procedure DeleteCol(AGridCol: Integer); reintroduce; procedure DeleteCol(AGridCol: Integer); reintroduce;
procedure DeleteRow(AGridRow: Integer); reintroduce; procedure DeleteRow(AGridRow: Integer); reintroduce;
procedure DragDrop(Source: TObject; X, Y: Integer); override; procedure DragDrop(Source: TObject; X, Y: Integer); override;
procedure EditingDone; override;
function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override; function EditorByStyle(Style: TColumnButtonStyle): TWinControl; override;
procedure EndUpdate(ARefresh: Boolean = true); procedure EndUpdate(ARefresh: Boolean = true);
function GetGridCol(ASheetCol: Cardinal): Integer; inline; function GetGridCol(ASheetCol: Cardinal): Integer; inline;
@ -3362,46 +3361,6 @@ begin
fntIndex, numfmtColor, lCell^.RichTextParams, RTL); fntIndex, numfmtColor, lCell^.RichTextParams, RTL);
end; end;
{@@ ----------------------------------------------------------------------------
This procedure is called when editing of a cell is completed. It determines
the worksheet cell and writes the text into the worksheet. Tries to keep the
format of the cell, but if it is a new cell, or the content type has changed,
tries to figure out the content type (number, date/time, text).
-------------------------------------------------------------------------------}
procedure TsCustomWorksheetGrid.EditingDone;
var
cell: PCell;
msg: String;
begin
{
if (not EditorShowing) and FEditing then
begin
if not ValidFormula(FEditText, msg) then
begin
FEditing := false;
exit;
end;
if FOldEditorText <> FEditText then
begin
cell := Worksheet.GetCell(GetWorksheetRow(Row), GetWorksheetCol(Col));
if Worksheet.IsMerged(cell) then
cell := Worksheet.FindMergeBase(cell);
if (FEditText <> '') and (FEditText[1] = '=') then
Worksheet.WriteFormula(cell, Copy(FEditText, 2, Length(FEditText)), true)
else
Worksheet.WriteCellValueAsString(cell, FEditText);
FEditText := '';
FOldEditorText := '';
end;
inherited EditingDone;
end;
FEditing := false;
FEnhEditMode := false;
}
inherited;
end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Is called when editing is complete; checks whether input is valid already Is called when editing is complete; checks whether input is valid already
have been done. have been done.