mirror of
https://gitlab.com/freepascal.org/lazarus/lazarus.git
synced 2025-04-09 04:07:57 +02:00
LCL: fixed ConvertEncoding fpr empty strings
git-svn-id: trunk@31599 -
This commit is contained in:
parent
880fd18517
commit
f6ca7c7d1b
@ -6330,12 +6330,19 @@ begin
|
||||
AFrom:=NormalizeEncoding(FromEncoding);
|
||||
ATo:=NormalizeEncoding(ToEncoding);
|
||||
SysEnc:=NormalizeEncoding(GetDefaultTextEncoding);
|
||||
if AFrom=EncodingAnsi then AFrom:=SysEnc;
|
||||
if ATo=EncodingAnsi then ATo:=SysEnc;
|
||||
if AFrom=EncodingAnsi then AFrom:=SysEnc
|
||||
else if AFrom='' then AFrom:=EncodingUTF8;
|
||||
if ATo=EncodingAnsi then ATo:=SysEnc
|
||||
else if ATo='' then ATo:=EncodingUTF8;
|
||||
if AFrom=ATo then begin
|
||||
Result:=s;
|
||||
exit;
|
||||
end;
|
||||
if s='' then begin
|
||||
if ATo=EncodingUTF8BOM then
|
||||
Result:=UTF8BOM;
|
||||
exit;
|
||||
end;
|
||||
//DebugLn(['ConvertEncoding ',AFrom,' ',ATo]);
|
||||
|
||||
if (AFrom=EncodingUTF8) then begin
|
||||
|
Loading…
Reference in New Issue
Block a user