--- Merging r32629 into '.':

U    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32629 into '.':
 U   .
--- Merging r32630 into '.':
G    rtl/objpas/classes/stringl.inc
--- Recording mergeinfo for merge of r32630 into '.':
 G   .
--- Merging r32668 into '.':
U    packages/chm/src/chmreader.pas
--- Recording mergeinfo for merge of r32668 into '.':
 G   .

# revisions: 32629,32630,32668

git-svn-id: branches/fixes_3_0@33674 -

packages/chm/src/chmreader.pas

@@ -1198,6 +1198,7 @@ begin
       {$endif}
       inc(head,4); // zero based index (13 higher than last
     end;
+  ItemStack.Free;
 end;
 
 var TryTextual : boolean;

rtl/objpas/classes/stringl.inc

@@ -709,8 +709,8 @@ Procedure TStrings.AddStrings(TheStrings: TStrings);
 Var Runner : longint;
 
 begin
+  beginupdate;
   try
-    beginupdate;
     For Runner:=0 to TheStrings.Count-1 do
       self.AddObject (Thestrings[Runner],TheStrings.Objects[Runner]);
   finally
@@ -816,8 +816,8 @@ Var
   Str : String;
 
 begin
+  beginUpdate;
   Try
-    beginUpdate;
     Obj:=Objects[Index1];
     Str:=Strings[Index1];
     Objects[Index1]:=Objects[Index2];
@@ -924,8 +924,8 @@ Var
   I,BufDelta     : Longint;
 begin
   // reread into a buffer
+  beginupdate;
   try
-    beginupdate;
     Buffer:='';
     BufLen:=0;
     I:=1;
@@ -952,12 +952,15 @@ Var
   Str : String;
 begin
   BeginUpdate;
-  Obj:=Objects[CurIndex];
-  Str:=Strings[CurIndex];
-  Objects[CurIndex]:=Nil; // Prevent Delete from freeing.
-  Delete(Curindex);
-  InsertObject(NewIndex,Str,Obj);
-  EndUpdate;
+  Try
+    Obj:=Objects[CurIndex];
+    Str:=Strings[CurIndex];
+    Objects[CurIndex]:=Nil; // Prevent Delete from freeing.
+    Delete(Curindex);
+    InsertObject(NewIndex,Str,Obj);
+  finally
+    EndUpdate;
+    end;
 end;