From 26fb374730a7b141c83b3514575221013ef1626b Mon Sep 17 00:00:00 2001 From: marco Date: Mon, 23 May 2016 18:23:38 +0000 Subject: [PATCH] # revisions: 33099 git-svn-id: branches/fixes_3_0@33764 - --- rtl/objpas/classes/stringl.inc | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/rtl/objpas/classes/stringl.inc b/rtl/objpas/classes/stringl.inc index edca41ac9c..5c50c0b3c0 100644 --- a/rtl/objpas/classes/stringl.inc +++ b/rtl/objpas/classes/stringl.inc @@ -723,15 +723,13 @@ end; Procedure TStrings.AddStrings(TheStrings: TStrings; ClearFirst : Boolean); -Var Runner : longint; begin beginupdate; try if ClearFirst then Clear; - For Runner:=0 to TheStrings.Count-1 do - self.AddObject (Thestrings[Runner],TheStrings.Objects[Runner]); + AddStrings(TheStrings); finally EndUpdate; end; @@ -739,29 +737,31 @@ end; Procedure TStrings.AddStrings(TheStrings: TStrings); +Var Runner : longint; begin - AddStrings(TheStrings,False); + For Runner:=0 to TheStrings.Count-1 do + self.AddObject (Thestrings[Runner],TheStrings.Objects[Runner]); end; Procedure TStrings.AddStrings(const TheStrings: array of string); +Var Runner : longint; begin - AddStrings(TheStrings,False); + if Count + High(TheStrings)+1 > Capacity then + Capacity := Count + High(TheStrings)+1; + For Runner:=Low(TheStrings) to High(TheStrings) do + self.Add(Thestrings[Runner]); end; Procedure TStrings.AddStrings(const TheStrings: array of string; ClearFirst : Boolean); -Var Runner : longint; begin beginupdate; try if ClearFirst then Clear; - if Count + High(TheStrings)+1 > Capacity then - Capacity := Count + High(TheStrings)+1; - For Runner:=Low(TheStrings) to High(TheStrings) do - self.Add(Thestrings[Runner]); + AddStrings(TheStrings); finally EndUpdate; end;