Explorar o código

* fix for Mantis #38023: the code to convert LF to CRLF when converting to UTF-8 is disabled anyway, so disable unnecessary, duplicate if-branches as well

git-svn-id: trunk@47284 -
(cherry picked from commit c2454d5386b90c99bee22aa293284c07f5f66893)
svenbarth %!s(int64=4) %!d(string=hai) anos
pai
achega
0de9940d01
Modificáronse 1 ficheiros con 4 adicións e 0 borrados
  1. 4 0
      rtl/inc/ustrings.inc

+ 4 - 0
rtl/inc/ustrings.inc

@@ -1842,6 +1842,7 @@ end;
             if (IBYTE and $80) = 0 then
             if (IBYTE and $80) = 0 then
               begin
               begin
                 //One character US-ASCII, convert it to unicode
                 //One character US-ASCII, convert it to unicode
+(*
                 if IBYTE = 10 then
                 if IBYTE = 10 then
                   begin
                   begin
                     If (PreChar<>13) and FALSE then
                     If (PreChar<>13) and FALSE then
@@ -1871,6 +1872,7 @@ end;
                       end;
                       end;
                   end
                   end
                 else
                 else
+*)
                   begin
                   begin
                     Dest[OutputUnicode]:=WideChar(IBYTE);
                     Dest[OutputUnicode]:=WideChar(IBYTE);
                     inc(OutputUnicode);
                     inc(OutputUnicode);
@@ -1985,6 +1987,7 @@ end;
             if (IBYTE and $80) = 0 then
             if (IBYTE and $80) = 0 then
               begin
               begin
                 //One character US-ASCII, convert it to unicode
                 //One character US-ASCII, convert it to unicode
+(*
                 if IBYTE = 10 then
                 if IBYTE = 10 then
                   begin
                   begin
                     if (PreChar<>13) and FALSE then
                     if (PreChar<>13) and FALSE then
@@ -2002,6 +2005,7 @@ end;
                       end;
                       end;
                   end
                   end
                 else
                 else
+*)
                   begin
                   begin
                     inc(OutputUnicode);
                     inc(OutputUnicode);
                     PreChar:=IBYTE;
                     PreChar:=IBYTE;