Browse Source

* Fix bug #36284: small refactoring

git-svn-id: trunk@43454 -
michael 5 years ago
parent
commit
23ef6459bd
1 changed files with 3 additions and 24 deletions
  1. 3 24
      rtl/objpas/classes/stringl.inc

+ 3 - 24
rtl/objpas/classes/stringl.inc

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