From 385d0ab62f2d8b30cf4001186ee49a63a572ce6f Mon Sep 17 00:00:00 2001
From: michael <michael@freepascal.org>
Date: Mon, 23 Dec 2019 13:42:07 +0000
Subject: [PATCH] * Merging revisions r43454 from trunk:    
 ------------------------------------------------------------------------    
 r43454 | michael | 2019-11-12 14:04:07 +0100 (Tue, 12 Nov 2019) | 1 line

    * Fix bug #36284: small refactoring
    ------------------------------------------------------------------------

git-svn-id: branches/fixes_3_2@43747 -
---
 rtl/objpas/classes/stringl.inc | 27 +++------------------------
 1 file changed, 3 insertions(+), 24 deletions(-)

diff --git a/rtl/objpas/classes/stringl.inc b/rtl/objpas/classes/stringl.inc
index 28b91c12ea..2fd3f09e2c 100644
--- a/rtl/objpas/classes/stringl.inc
+++ b/rtl/objpas/classes/stringl.inc
@@ -622,21 +622,9 @@ end;
 
 Procedure TStrings.SetCommaText(const Value: string);
 
-Var
-  C1,C2 : Char;
-
 begin
   CheckSpecialChars;
-  C1:=Delimiter;
-  C2:=QuoteChar;
-  Delimiter:=',';
-  QuoteChar:='"';
-  Try
-    SetDelimitedText(Value);
-  Finally
-    Delimiter:=C1;
-    QuoteChar:=C2;
-  end;
+  DoSetDelimitedText(Value,True,StrictDelimiter,'"',',');
 end;
 
 procedure TStrings.SetMissingNameValueSeparatorAction(AValue: TMissingNameValueSeparatorAction);
@@ -943,16 +931,9 @@ begin
 end;
 
 procedure TStrings.AddCommaText(const S: String);
-var
-  L: TStringList;
+
 begin
-  L := TStringList.Create;
-  try
-    L.CommaText := S;
-    AddStrings(L);
-  finally
-    L.Free;
-  end;
+  DoSetDelimitedText(S,False,StrictDelimiter,'"',',');
 end;
 
 procedure TStrings.AddDelimitedText(const S: String; ADelimiter: Char; AStrictDelimiter: Boolean);
@@ -975,7 +956,6 @@ begin
 end;
 
 
-
 destructor TSTrings.Destroy;
 
 begin
@@ -983,7 +963,6 @@ begin
     FreeAndNil(FEncoding);
   if (FDefaultEncoding<>nil) and not TEncoding.IsStandardEncoding(FDefaultEncoding) then
     FreeAndNil(FDefaultEncoding);
-
   inherited destroy;
 end;