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

fpspreadsheet: Use '?' as common broken-utf8-replacement character.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8578 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2022-10-21 14:20:06 +00:00
parent 506dbe52b7
commit 68ec591390
4 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
components/fpspreadsheet/source/common/fpsutils.pas
View File

@@ -241,8 +241,8 @@ function GetFontAsString(AFont: TsFont): String;
function ISO8601StrToDateTime(s: String): TDateTime;
function UTF8CodePoints(AText: string; out sa: TStringArray; AReplacement: String = #$E2#$8E#$95): Boolean;
function ValidUTF8Text(var AText: String; AReplacement: String = #$E2#$8E#$95): Boolean;
function UTF8CodePoints(AText: string; out sa: TStringArray): Boolean;
function ValidUTF8Text(var AText: String): Boolean;
procedure AppendToStream(AStream: TStream; const AString: String); inline; overload;
procedure AppendToStream(AStream: TStream; const AString1, AString2: String); inline; overload;
@@ -3222,8 +3222,7 @@ end;
returns them as an array of string (sa). The result of the function is
false if at least one codepoint is broken UTF8.
-------------------------------------------------------------------------------}
function UTF8CodePoints(AText: String; out sa: TStringArray;
AReplacement: string = #$E2#$8E#$95): Boolean;
function UTF8CodePoints(AText: String; out sa: TStringArray): Boolean;
var
n: Integer;
ch: String;
@@ -3245,7 +3244,7 @@ begin
chLen := UTF8CodePointSize(P);
if (chLen = 1) and (P^ > #127) then
begin
ch := AReplacement;
ch := FPS_REPLACEMENT_CHAR;
Result := false;
end else
begin
@@ -3259,7 +3258,7 @@ begin
SetLength(sa, n);
end;
function ValidUTF8Text(var AText: string; AReplacement: String = #$E2#$8E#$95): Boolean;
function ValidUTF8Text(var AText: string): Boolean;
var
i: Integer;
P: PChar;
@@ -3271,7 +3270,7 @@ begin
if i >= 0 then
begin
Delete(AText, i+1, 1);
Insert(AReplacement, AText, i+1);
Insert(FPS_REPLACEMENT_CHAR, AText, i+1);
Result := false;
end;
until (i < 0);