From 010a46c48f1b966fb22a25f11d52c35356c4d6e8 Mon Sep 17 00:00:00 2001
From: Ansgar Becker <anse@heidisql.com>
Date: Fri, 12 Apr 2024 06:59:16 +0200
Subject: [PATCH] Outsource new line replacements into new StripNewLines()
 function

---
 source/apphelpers.pas | 7 +++++++
 source/exportgrid.pas | 4 +---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/source/apphelpers.pas b/source/apphelpers.pas
index 8752307e6..5c21c6263 100644
--- a/source/apphelpers.pas
+++ b/source/apphelpers.pas
@@ -334,6 +334,7 @@   TAppSettings = class(TObject)
   function IsFloat(Str: String): Boolean;
   function ScanLineBreaks(Text: String): TLineBreaks;
   function fixNewlines(txt: String): String;
+  procedure StripNewLines(var txt: String; Replacement: String=' ');
   function GetLineBreak(LineBreakIndex: TLineBreaks): String;
   procedure RemoveNullChars(var Text: String; var HasNulls: Boolean);
   function GetShellFolder(FolderId: TGUID): String;
@@ -828,6 +829,12 @@ function fixNewlines(txt: String): String;
   result := txt;
 end;
 
+procedure StripNewLines(var txt: String; Replacement: String=' ');
+begin
+  txt := StringReplace(txt, #13#10, Replacement, [rfReplaceAll]);
+  txt := StringReplace(txt, #13, Replacement, [rfReplaceAll]);
+  txt := StringReplace(txt, #10, Replacement, [rfReplaceAll]);
+end;
 
 function GetLineBreak(LineBreakIndex: TLineBreaks): String;
 begin
diff --git a/source/exportgrid.pas b/source/exportgrid.pas
index 849581911..86d882a4f 100644
--- a/source/exportgrid.pas
+++ b/source/exportgrid.pas
@@ -948,9 +948,7 @@ procedure TfrmExportGrid.btnOKClick(Sender: TObject);
 
           // Remove linebreaks, see #474
           if chkRemoveLinebreaks.Checked then begin
-            Data := StringReplace(Data, #13#10, ' ', [rfReplaceAll]);
-            Data := StringReplace(Data, #13, ' ', [rfReplaceAll]);
-            Data := StringReplace(Data, #10, ' ', [rfReplaceAll]);
+            StripNewLines(Data);
           end;
 
           case ExportFormat of