From 74d1082ccb0ff19b43fec32ce0d83516dd26abb4 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 28 Aug 2020 11:26:13 +0000
Subject: [PATCH] fpspreadsheet: Less hints and warnings

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@7638 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../fpspreadsheet/source/visual/fpsactions.pas       |  2 +-
 .../source/visual/fpspreadsheetctrls.pas             |  3 +--
 .../source/visual/fpspreadsheetgrid.pas              |  2 +-
 .../fpspreadsheet/source/visual/fpsvisualutils.pas   | 12 ++++++++++++
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/components/fpspreadsheet/source/visual/fpsactions.pas b/components/fpspreadsheet/source/visual/fpsactions.pas
index f7f95ee1e..781905acb 100644
--- a/components/fpspreadsheet/source/visual/fpsactions.pas
+++ b/components/fpspreadsheet/source/visual/fpsactions.pas
@@ -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;
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
index be7f343a5..819793c9b 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetctrls.pas
@@ -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
diff --git a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
index 32bbe4efd..b6c001001 100644
--- a/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
+++ b/components/fpspreadsheet/source/visual/fpspreadsheetgrid.pas
@@ -5183,7 +5183,7 @@ end;
 -------------------------------------------------------------------------------}
 procedure TsCustomWorksheetGrid.MoveSelection;
 var
-  sel: TsCellRangeArray;
+  sel: TsCellRangeArray = nil;
   {$IFNDEF FPS_NO_GRID_MULTISELECT}
   i: Integer;
   {$ENDIF}
diff --git a/components/fpspreadsheet/source/visual/fpsvisualutils.pas b/components/fpspreadsheet/source/visual/fpsvisualutils.pas
index 8ac953cf2..596fdc215 100644
--- a/components/fpspreadsheet/source/visual/fpsvisualutils.pas
+++ b/components/fpspreadsheet/source/visual/fpsvisualutils.pas
@@ -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