From 0de9940d01ed3262a3c7b6a5b23397794f29cf2a Mon Sep 17 00:00:00 2001
From: svenbarth <pascaldragon@googlemail.com>
Date: Mon, 2 Nov 2020 16:42:32 +0000
Subject: [PATCH] * 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)
---
rtl/inc/ustrings.inc | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/rtl/inc/ustrings.inc b/rtl/inc/ustrings.inc
index 3122ffeac1..a14679e598 100644
--- a/rtl/inc/ustrings.inc
+++ b/rtl/inc/ustrings.inc
@@ -1842,6 +1842,7 @@ end;
if (IBYTE and $80) = 0 then
begin
//One character US-ASCII, convert it to unicode
+(*
if IBYTE = 10 then
begin
If (PreChar<>13) and FALSE then
@@ -1871,6 +1872,7 @@ end;
end;
end
else
+*)
begin
Dest[OutputUnicode]:=WideChar(IBYTE);
inc(OutputUnicode);
@@ -1985,6 +1987,7 @@ end;
if (IBYTE and $80) = 0 then
begin
//One character US-ASCII, convert it to unicode
+(*
if IBYTE = 10 then
begin
if (PreChar<>13) and FALSE then
@@ -2002,6 +2005,7 @@ end;
end;
end
else
+*)
begin
inc(OutputUnicode);
PreChar:=IBYTE;