--- Merging r15353 into '.':

U    rtl/objpas/classes/classesh.inc
--- Merging r15387 into '.':
U    packages/chm/src/chmfilewriter.pas

# revisions: 15353,15387
------------------------------------------------------------------------
r15353 | michael | 2010-05-31 11:53:18 +0200 (Mon, 31 May 2010) | 1 line
Changed paths:
   M /trunk/rtl/objpas/classes/classesh.inc

* Added TDataModuleClass class pointer
------------------------------------------------------------------------
------------------------------------------------------------------------
r15387 | marco | 2010-06-05 15:33:33 +0200 (Sat, 05 Jun 2010) | 2 lines
Changed paths:
   M /trunk/packages/chm/src/chmfilewriter.pas

 * fix for mantis 16643, chmproject.savetofile filename doesn't propagate properly

------------------------------------------------------------------------

git-svn-id: branches/fixes_2_4@15428 -

packages/chm/src/chmfilewriter.pas

@@ -234,7 +234,7 @@ var
 begin
   Cfg := TXMLConfig.Create(nil);
   Cfg.StartEmpty := True;
-  Cfg.Filename := FileName;
+  Cfg.Filename := AFileName;
   Cfg.Clear;
   Cfg.SetValue('Files/Count/Value', Files.Count);
   for I := 0 to Files.Count-1 do

rtl/objpas/classes/classesh.inc

@@ -1847,6 +1847,7 @@ type
     property OnDestroy: TNotifyEvent read FOnDestroy write FOnDestroy;
     property OldCreateOrder: Boolean read FOldOrder write FOldOrder;
   end;
+  TDataModuleClass = Class of TDataModule;
 
 var
   // IDE hooks for TDatamodule support.