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

fpspreadsheet: Check compilation back to Laz 1.4.4/fpc 2.6.4. Update conditional defines in fps.inc.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@8734 8e941d3f-bd1b-0410-a28a-d453659cc2b4
This commit is contained in:
wp_xxyyzz
2023-02-23 11:42:24 +00:00
parent 5c20fe1ecc
commit 3a2cfd397f
12 changed files with 168 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,12 +13,13 @@ unit fpsUtils;
// when this same modification is in LazUtils of Laz stable
{$mode objfpc}{$H+}
{$include fps.inc}
interface
uses
Classes, SysUtils, TypInfo,
fpstypes;
fpsTypes;
// Exported types
type
@@ -3243,7 +3244,11 @@ begin
PEnd := P + Length(AText);
while P < PEnd do
begin
{$IFDEF FPS_NO_NEW_UTF8_ROUTINES}
chLen := UTF8CharacterLength(P);
{$ELSE}
chLen := UTF8CodePointSize(P);
{$ENDIF}
if (chLen = 1) and (P^ > #127) then
begin
ch := FPS_REPLACEMENT_CHAR;
@@ -3268,7 +3273,11 @@ begin
Result := true;
repeat
P := PChar(AText);
{$IFDEF FPS_NO_NEW_UTF8_ROUTINES}
i := FindInvalidUTF8Character(P, Length(AText), true);
{$ELSE}
i := FindInvalidUTF8CodePoint(P, Length(AText), true);
{$ENDIF}
if i >= 0 then
begin
Delete(AText, i+1, 1);