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

* Add ClearFirst parameter to AddStrings (bug ID 29630)

Browse Source 
git-svn-id: trunk@33092 -
This commit is contained in:
michael 2016-02-13 11:03:51 +00:00
parent 6afda909d4
commit db19d73ec0
2 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rtl/objpas/classes/classesh.inc
View File

@ -664,7 +664,9 @@ type
function AddObject(const Fmt: string; Args : Array of const; AObject: TObject): Integer; overload; function AddObject(const Fmt: string; Args : Array of const; AObject: TObject): Integer; overload;
procedure Append(const S: string); procedure Append(const S: string);
procedure AddStrings(TheStrings: TStrings); overload; virtual; procedure AddStrings(TheStrings: TStrings); overload; virtual;
procedure AddStrings(TheStrings: TStrings; ClearFirst : Boolean); overload;
procedure AddStrings(const TheStrings: array of string); overload; virtual; procedure AddStrings(const TheStrings: array of string); overload; virtual;
procedure AddStrings(const TheStrings: array of string; ClearFirst : Boolean); overload;
Procedure AddText(Const S : String); virtual; Procedure AddText(Const S : String); virtual;
procedure Assign(Source: TPersistent); override; procedure Assign(Source: TPersistent); override;
procedure BeginUpdate; procedure BeginUpdate;

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

@ -720,13 +720,15 @@ end;
Procedure TStrings.AddStrings(TheStrings: TStrings); Procedure TStrings.AddStrings(TheStrings: TStrings; ClearFirst : Boolean);
Var Runner : longint; Var Runner : longint;
begin begin
beginupdate; beginupdate;
try try
if ClearFirst then
Clear;
For Runner:=0 to TheStrings.Count-1 do For Runner:=0 to TheStrings.Count-1 do
self.AddObject (Thestrings[Runner],TheStrings.Objects[Runner]); self.AddObject (Thestrings[Runner],TheStrings.Objects[Runner]);
finally finally
@ -734,13 +736,27 @@ begin
end; end;
end; end;
Procedure TStrings.AddStrings(TheStrings: TStrings);
begin
AddStrings(TheStrings,False);
end;
Procedure TStrings.AddStrings(const TheStrings: array of string); Procedure TStrings.AddStrings(const TheStrings: array of string);
begin
AddStrings(TheStrings,False);
end;
Procedure TStrings.AddStrings(const TheStrings: array of string; ClearFirst : Boolean);
Var Runner : longint; Var Runner : longint;
begin begin
try
beginupdate; beginupdate;
try
if ClearFirst then
Clear;
if Count + High(TheStrings)+1 > Capacity then if Count + High(TheStrings)+1 > Capacity then
Capacity := Count + High(TheStrings)+1; Capacity := Count + High(TheStrings)+1;
For Runner:=Low(TheStrings) to High(TheStrings) do For Runner:=Low(TheStrings) to High(TheStrings) do