Browse Source

* Do not open dataset twice. Correct Standard elements registration

git-svn-id: trunk@41567 -
michael 6 years ago
parent
commit
629f73c918
1 changed files with 7 additions and 5 deletions
  1. 7 5
      packages/fcl-report/src/fpreport.pp

+ 7 - 5
packages/fcl-report/src/fpreport.pp

@@ -10668,6 +10668,8 @@ end;
 procedure TFPReportData.Open;
 procedure TFPReportData.Open;
 
 
 begin
 begin
+  if IsOpened then
+    exit;
   if Assigned(FOnOpen) then
   if Assigned(FOnOpen) then
     FOnOpen(Self);
     FOnOpen(Self);
   DoOpen;
   DoOpen;
@@ -12456,11 +12458,11 @@ begin
   TFPReportDataFooterBand.RegisterElement;
   TFPReportDataFooterBand.RegisterElement;
   TFPReportColumnHeaderBand.RegisterElement;
   TFPReportColumnHeaderBand.RegisterElement;
   TFPReportColumnFooterBand.RegisterElement;
   TFPReportColumnFooterBand.RegisterElement;
-  TFPReportMemo.RegisterElement;
-  TFPReportImage.RegisterElement;
-  TFPReportCheckbox.RegisterElement;
-  TFPReportShape.RegisterElement;
-  TFPReportPage.RegisterElement;
+  TFPReportMemo.RegisterElement.Standard:=True;
+  TFPReportImage.RegisterElement.Standard:=True;
+  TFPReportCheckbox.RegisterElement.Standard:=True;
+  TFPReportShape.RegisterElement.Standard:=True;
+  TFPReportPage.RegisterElement.Standard:=True;
 end;
 end;
 
 
 initialization
 initialization