2
0
Эх сурвалжийг харах

rtl: fix fpc_AnsiStr_To_AnsiStr source codepage check (less conversions should be done now from AnsiString type to the same codepage strings)

git-svn-id: trunk@19544 -
paul 14 жил өмнө
parent
commit
ef0c4a1e5c

+ 2 - 0
rtl/inc/astrings.inc

@@ -411,6 +411,8 @@ begin
       if (cp=CP_ACP) then
       if (cp=CP_ACP) then
         cp:=DefaultSystemCodePage;
         cp:=DefaultSystemCodePage;
       orgcp:=StringCodePage(S);
       orgcp:=StringCodePage(S);
+      if (orgcp=CP_ACP) then
+        orgcp:=DefaultSystemCodePage;
       if (orgcp=cp) or (orgcp=CP_NONE) then
       if (orgcp=cp) or (orgcp=CP_NONE) then
         begin
         begin
           SetLength(result,Size);
           SetLength(result,Size);