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

fpspreadsheet: Fix infinite loop in Worksheeet sorting when the sorted range contains an empty cell. Make Worksheetgrid.Sort public.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6928 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2019-05-20 10:13:39 +00:00
parent 0bce9628fc
commit dfa57b80e9
2 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
components/fpspreadsheet/source/common/fpspreadsheet.pas
View File

@ -4339,6 +4339,11 @@ begin
if (ACell1 = nil) and (ACell2 = nil) then if (ACell1 = nil) and (ACell2 = nil) then
Result := 0 Result := 0
else else
if (ACell1 <> nil) and (ACell1^.ContentType = cctEmpty) and
(ACell2 <> nil) and (ACell2^.ContentType = cctEmpty)
then
Result := 0
else
if (ACell1 = nil) or (ACell1^.ContentType = cctEmpty) then if (ACell1 = nil) or (ACell1^.ContentType = cctEmpty) then
begin begin
Result := +1; // Empty cells go to the end Result := +1; // Empty cells go to the end
@ -4349,9 +4354,11 @@ begin
Result := -1; // Empty cells go to the end Result := -1; // Empty cells go to the end
exit; // Avoid SortOrder to bring the empty cell to the top! exit; // Avoid SortOrder to bring the empty cell to the top!
end else end else
{
if (ACell1^.ContentType = cctEmpty) and (ACell2^.ContentType = cctEmpty) then if (ACell1^.ContentType = cctEmpty) and (ACell2^.ContentType = cctEmpty) then
Result := 0 Result := 0
else else
}
if (ACell1^.ContentType = cctUTF8String) and (ACell2^.ContentType = cctUTF8String) then if (ACell1^.ContentType = cctUTF8String) and (ACell2^.ContentType = cctUTF8String) then
begin begin
if ssoCaseInsensitive in ASortOptions then if ssoCaseInsensitive in ASortOptions then

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

@ -324,7 +324,6 @@ type
function SelectCell(ACol, ARow: Integer): Boolean; override; function SelectCell(ACol, ARow: Integer): Boolean; override;
procedure SetEditText(ACol, ARow: Longint; const AValue: string); override; procedure SetEditText(ACol, ARow: Longint; const AValue: string); override;
procedure Setup; procedure Setup;
procedure Sort(AColSorting: Boolean; AIndex, AIndxFrom, AIndxTo:Integer); override;
function ToPixels(AValue: Double): Integer; function ToPixels(AValue: Double): Integer;
procedure TopLeftChanged; override; procedure TopLeftChanged; override;
function TrimToCell(ACell: PCell): String; function TrimToCell(ACell: PCell): String;
@ -435,6 +434,8 @@ type
const ALeftOuterStyle, ATopOuterStyle, ARightOuterStyle, ABottomOuterStyle, const ALeftOuterStyle, ATopOuterStyle, ARightOuterStyle, ABottomOuterStyle,
AHorInnerStyle, AVertInnerStyle: TsCellBorderStyle); AHorInnerStyle, AVertInnerStyle: TsCellBorderStyle);
procedure Sort(AColSorting: Boolean; AIndex, AIndxFrom, AIndxTo:Integer); override;
{ Row height / col width calculation } { Row height / col width calculation }
procedure UpdateColWidth(ACol: Integer); procedure UpdateColWidth(ACol: Integer);
procedure UpdateColWidths(AStartIndex: Integer = 0); procedure UpdateColWidths(AStartIndex: Integer = 0);
@ -5569,6 +5570,7 @@ begin
); );
end; end;
{@@ ---------------------------------------------------------------------------- {@@ ----------------------------------------------------------------------------
Converts a coordinate given in workbook units to pixels using the current Converts a coordinate given in workbook units to pixels using the current
screen resolution screen resolution