소스 검색

* Do not open dataset twice. Correct Standard elements registration

git-svn-id: trunk@41567 -
michael 6 년 전
부모
커밋
629f73c918
1개의 변경된 파일7개의 추가작업 그리고 5개의 파일을 삭제
  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;
 
 begin
+  if IsOpened then
+    exit;
   if Assigned(FOnOpen) then
     FOnOpen(Self);
   DoOpen;
@@ -12456,11 +12458,11 @@ begin
   TFPReportDataFooterBand.RegisterElement;
   TFPReportColumnHeaderBand.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;
 
 initialization