paweld/lazarus
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/lazarus/lazarus.git synced 2025-04-10 04:48:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

LazUtf8: In UTF8CompareStrCollated only call AnsiCompareStr is ACP_RTL is defined, since in all other cases

Browse Source 
AnsiCompareStr = widestringmanager.CompareStrAnsiStringProc = UTF8CompareStr.
If ACP_RTL is not defined call Utf8CompareStr, since this is now does proper collation and is faster than
converting to WideString.

git-svn-id: trunk@51978 -
This commit is contained in:
bart 2016-03-17 12:07:57 +00:00
parent 77e5428b3f
commit 7c9fc905a6
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/lazutils/lazutf8.pas
View File

@ -151,7 +151,7 @@ function UTF8CompareStr(const S1, S2: string): PtrInt; inline;
function UTF8CompareStrP(S1, S2: PChar): PtrInt;
function UTF8CompareStr(S1: PChar; Count1: SizeInt; S2: PChar; Count2: SizeInt): PtrInt;
function UTF8CompareText(const S1, S2: string): PtrInt;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt; {$IFnDEF ACP_RTL}inline;{$endif}
function CompareStrListUTF8LowerCase(List: TStringList; Index1, Index2: Integer): Integer;
type
@ -3196,12 +3196,13 @@ end;
Result := WideCompareText(Utf8ToUtf16(S1),Utf8ToUtf16(S2));
end;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt;
function UTF8CompareStrCollated(const S1, S2: string): PtrInt; {$IFnDEF ACP_RTL}inline;{$endif}
begin
{$IFDEF MSWINDOWS}
{$IFDEF ACP_RTL}
//Only with this define AnsiCompareStr does not point to Utf8CompareStr
Result := AnsiCompareStr(UTF8ToSys(S1), UTF8ToSys(S2));
{$ELSE}
Result := WideCompareStr(WideString(S1),WideString(S2));
Result := Utf8CompareStr(S1,S2);
{$ENDIF}
end;