Outsource new line replacements into new StripNewLines() function

HeidiSQL · Apr 12, 2024 · 010a46c · 010a46c
1 parent dec0ace
commit 010a46c
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git 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
@@ -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