From a2350194b78e03c08eb2a8ffbee5ee3093322697 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Mon, 9 Oct 2023 17:44:35 +0000
Subject: [PATCH] fpspreadsheet: Fix formulas with general UTF8 sheet names in
 xlsx

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8942 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 .../source/common/fpsexprparser.pas           | 29 ++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/components/fpspreadsheet/source/common/fpsexprparser.pas b/components/fpspreadsheet/source/common/fpsexprparser.pas
index ac38889a1..45de282d0 100644
--- a/components/fpspreadsheet/source/common/fpsexprparser.pas
+++ b/components/fpspreadsheet/source/common/fpsexprparser.pas
@@ -654,6 +654,7 @@ type
     function DoDelimiter: TsTokenType;
 //    function DoSquareBracket: TsTokenType;
     function DoString: TsTokenType;
+    function DoTestExcelSheetName(C: Char): TsTokenType;
     function NextPos: Char; // inline;
     procedure SkipWhiteSpace; // inline;
     function IsWordDelim(C: Char): Boolean; // inline;
@@ -1365,6 +1366,32 @@ begin
   NextPos;
 end;
 
+{ The scanner gets into this procedure in case of invalid characters inthe
+  expression or - in case of Excel A1 dialect sheet names containing UTF8
+  codepoints. }
+function TsExpressionScanner.DoTestExcelSheetName(C: Char): TsTokenType;
+var
+  StartChar: Char;
+  StartPos: Integer;
+begin
+  StartChar := C;
+  StartPos := FPos;
+
+  FToken := C;
+  C := NextPos;
+  while not (C in [cNull, '!']) do
+  begin
+    FToken := FToken + C;
+    C := NextPos;
+  end;
+  if C = '!' then
+  begin
+    Result := DoIdentifier;
+    FTokenType := Result;
+  end else
+    ScanError(Format(rsUnknownCharacter, [StartPos, StartChar]));
+end;
+
 function TsExpressionScanner.GetCurrentChar: Char;
 begin
   if FChar <> nil then
@@ -1395,7 +1422,7 @@ begin
   else if IsAlpha(C) or (C = '$') or (C = '''') or (C = '_') then
     Result := DoIdentifier
   else
-    ScanError(Format(rsUnknownCharacter, [FPos, C]));
+    Result := DoTestExcelSheetName(C);
   FTokenType := Result;
 end;