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

fpspreadsheet: Less hints and warnings

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7638 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2020-08-28 11:26:13 +00:00
parent e6b6497d6b
commit 74d1082ccb
4 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/fpspreadsheet/source/visual/fpsactions.pas
View File

@ -116,7 +116,7 @@ type
public
constructor Create(AOwner: TComponent); override;
procedure ExecuteTarget(Target: TObject); override;
procedure UpdateTarget(Target: TObject); override;
procedure UpdateTarget({%H-}Target: TObject); override;
published
property Zoom: Integer read FZoom write SetZoom default 100;
end;

3
components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
View File

@ -1042,7 +1042,7 @@ end; *)
-------------------------------------------------------------------------------}
procedure TsWorkbookSource.ExecutePendingOperation;
var
destSelection: TsCellRangeArray;
destSelection: TsCellRangeArray = nil;
srcCell, destCell: PCell; // Pointers to source and destination cells
i, j, k: Cardinal;
ofsRow, ofsCol: LongInt;
@ -4261,7 +4261,6 @@ var
embObj: TsEmbeddedObj;
so: TsSheetOption;
sp: TsWorksheetProtection;
cf: TsConditionalFormat;
begin
if ASheet = nil then
begin

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

@ -5183,7 +5183,7 @@ end;
-------------------------------------------------------------------------------}
procedure TsCustomWorksheetGrid.MoveSelection;
var
sel: TsCellRangeArray;
sel: TsCellRangeArray = nil;
{$IFNDEF FPS_NO_GRID_MULTISELECT}
i: Integer;
{$ENDIF}

12
components/fpspreadsheet/source/visual/fpsvisualutils.pas
View File

@ -448,7 +448,11 @@ begin
break;
end;
else
{$IF FPC_FullVersion >= 30200}
s := s + UnicodeToUTF8(UTF8CodePointToUnicode(FPtr, charLen));
{$ELSE}
s := s + UnicodeToUTF8(UTF8CharacterToUnicode(FPtr, charLen));
{$IFEND}
if FCharIndex = FCharIndexOfNextFont then begin
DrawText(x, y, s, ALineHeight);
s := '';
@ -585,7 +589,11 @@ begin
P := PChar(s);
while (P^ <> #0) do
begin
{$IF FPC_FullVersion >= 30200}
ch := UnicodeToUTF8(UTF8CodePointToUnicode(P, charLen));
{$ELSE}
ch := UnicodeToUTF8(UTF8CharacterToUnicode(P, charLen));
{$IFEND}
ALineHeight := FCanvas.TextHeight(ch);
Pt := GetTextPt(x, y, ALineHeight);
w := FCanvas.TextWidth(ch);
@ -912,7 +920,11 @@ begin
tmpWidth := 0;
end;
UpdateFont(FCharIndex, FRtpIndex, FCharIndexOfNextFont, FFontHeight, FFontPos);
{$IF FPC_FullVersion >= 30200}
ch := UnicodeToUTF8(UTF8CodepointToUnicode(FPtr, charLen));
{$ELSE}
ch := UnicodeToUTF8(UTF8CharacterToUnicode(FPtr, charLen));
{$IFEND}
part := part + ch;
if FTextRotation = rtStacked then
begin