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

fpspreadsheet: Fix interchanged col/row indexes in relation to multiline cell editor.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@5852 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2017-05-13 11:23:08 +00:00
parent d8be456aec
commit 9a2bef119c
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1946,7 +1946,7 @@ var
Rct: TRect;
delta: Integer;
begin
FOldEditorText := GetCellText(Row, Col);
FOldEditorText := GetCellText(Col, Row);
inherited;
if (Worksheet <> nil) and (Editor is TStringCellEditor) then
begin
@ -3039,13 +3039,16 @@ end;
-------------------------------------------------------------------------------}
procedure TsCustomWorksheetGrid.EditingDone;
var
oldText: String;
//oldText: String;
cell: PCell;
begin
if (not EditorShowing) and FEditing then
begin
{
oldText := GetCellText(Col, Row);
if oldText <> FEditText then
}
if FOldEditorText <> FEditText then
begin
cell := Worksheet.GetCell(GetWorksheetRow(Row), GetWorksheetCol(Col));
if Worksheet.IsMerged(cell) then
@ -3055,6 +3058,7 @@ begin
else
Worksheet.WriteCellValueAsString(cell, FEditText);
FEditText := '';
FOldEditorText := '';
end;
inherited EditingDone;
end;