paweld/fpc
1
0
Fork 0
mirror of https://gitlab.com/freepascal.org/fpc/source.git synced 2025-09-12 09:49:11 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Merging revisions r43454 from trunk:

Browse Source 
------------------------------------------------------------------------
    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 -
This commit is contained in:
michael 2019-12-23 13:42:07 +00:00
parent cbaf231b47
commit 385d0ab62f
1 changed files with 3 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
rtl/objpas/classes/stringl.inc
View File

@ -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;