From e513970d1cf700ab320b5dbeafb28bd1302b2333 Mon Sep 17 00:00:00 2001
From: wp_xxyyzz <wp_xxyyzz@8e941d3f-bd1b-0410-a28a-d453659cc2b4>
Date: Fri, 31 May 2019 15:16:44 +0000
Subject: [PATCH] jvcllaz: Fix incomplete handling of Windows line ending in
 JvHTControls in Linux.

git-svn-id: https://svn.code.sf.net/p/lazarus-ccr/svn@6986 8e941d3f-bd1b-0410-a28a-d453659cc2b4
---
 components/jvcllaz/examples/JvHTControls/unit1.lfm | 4 ++--
 components/jvcllaz/run/JvCore/jvjvclutils.pas      | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/components/jvcllaz/examples/JvHTControls/unit1.lfm b/components/jvcllaz/examples/JvHTControls/unit1.lfm
index a1018c26c..7ceb2baa4 100644
--- a/components/jvcllaz/examples/JvHTControls/unit1.lfm
+++ b/components/jvcllaz/examples/JvHTControls/unit1.lfm
@@ -24,8 +24,8 @@ object MainForm: TMainForm
       ClientWidth = 567
       object JvHTLabel1: TJvHTLabel
         Left = 8
-        Height = 196
-        Hint = 'HTLabel with:<br />'#13#10'<b>bold</b><br>'#13#10'<i>italic</i><br>'#13#10'<u>underline</u><br>'#13#10'<s>strikeout</s><br>'#13#10'<font color="Red">c</font><font color="blue">o</font><font color="Green">l</font><font color="Fuchsia">o</font><font color="Maroon">r</font><br>'#13#10'<a href="http://www.freepascal.org/">Links</a> and <a href="custom">custom links</a>'
+        Height = 106
+        Hint = 'HTLabel with:<br/>'#13#10'<b>bold</b><br>'#13#10'<i>italic</i><br>'#13#10'<u>underline</u><br>'#13#10'<s>strikeout</s><br>'#13#10'<font color="Red">c</font><font color="blue">o</font><font color="Green">l</font><font color="Fuchsia">o</font><font color="Maroon">r</font><br>'#13#10'<a href="http://www.freepascal.org/">Links</a> and <a href="custom">custom links</a>'
         Top = 8
         Width = 120
         Caption = 'HTLabel with:<br>'#13#10'<b>bold</b><br>'#13#10'<i>italic</i><br>'#13#10'<u>underline</u><br>'#13#10'<s>strikeout</s><br>'#13#10'<font color="Red">c</font><font color="blue">o</font><font color="Green">l</font><font color="Fuchsia">o</font><font color="Maroon">r</font><br>'#13#10'<a href="http://www.freepascal.org/">Links</a> and <a href="custom">custom links</a>'
diff --git a/components/jvcllaz/run/JvCore/jvjvclutils.pas b/components/jvcllaz/run/JvCore/jvjvclutils.pas
index d93ccda0c..b0e52f707 100644
--- a/components/jvcllaz/run/JvCore/jvjvclutils.pas
+++ b/components/jvcllaz/run/JvCore/jvjvclutils.pas
@@ -7121,7 +7121,8 @@ begin
   Result := Text;
   for I := Low(Conversions) to High(Conversions) do
     Result := StringReplace(Result, Conversions[I].Html, Utf8ToAnsi(Conversions[I].Text), [rfReplaceAll, rfIgnoreCase]);
-  Result := StringReplace(Result, sLineBreak, '', [rfReplaceAll, rfIgnoreCase]);        // only <BR> can be new line
+  Result := StringReplace(Result, #13, '', [rfReplaceAll]);        // only <BR> can be new line
+  Result := StringReplace(Result, #10, '', [rfReplaceAll]);        // only <BR> can be new line
   Result := StringReplace(Result, cBR, sLineBreak, [rfReplaceAll, rfIgnoreCase]);
   Result := StringReplace(Result, cBR2, sLineBreak, [rfReplaceAll, rfIgnoreCase]);      // Fixes <BR/>, but not <BR />!
   Result := StringReplace(Result, cHR, cHR + sLineBreak, [rfReplaceAll, rfIgnoreCase]); // fixed <HR><BR>