From cc6780a8d2443ff01b1422a0a303c3b20628b011 Mon Sep 17 00:00:00 2001
From: michael <michael@lazarus-ide.org>
Date: Fri, 23 Mar 2018 10:57:05 +0000
Subject: [PATCH] * Fix bug #0033489

git-svn-id: trunk@57559 -
---
 .../fpreport/design/fpreportdesignctrl.pp     |  2 +-
 .../design/frmfpreportdesignermain.pp         | 27 ++++++++++++++++---
 2 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/components/fpreport/design/fpreportdesignctrl.pp b/components/fpreport/design/fpreportdesignctrl.pp
index 055f09530e..cb9e80b934 100644
--- a/components/fpreport/design/fpreportdesignctrl.pp
+++ b/components/fpreport/design/fpreportdesignctrl.pp
@@ -384,7 +384,7 @@ begin
     exit;
   if Source is TMemoDragDrop then
     begin
-    E:=TFPReportMemo.Create(ABand);
+    E:=TFPReportMemo.Create(ABand.Report);
     C:=(Source as TMemoDragDrop).Content;
     TFPReportMemo(E).Text:=C;
     R:=Default(TRect);
diff --git a/components/fpreport/design/frmfpreportdesignermain.pp b/components/fpreport/design/frmfpreportdesignermain.pp
index 6e0502818b..9e628b01a0 100644
--- a/components/fpreport/design/frmfpreportdesignermain.pp
+++ b/components/fpreport/design/frmfpreportdesignermain.pp
@@ -310,6 +310,7 @@ type
     procedure SetFileCaption(const AFileName: String);
     procedure SetModified(AValue: Boolean);
     procedure SetModifiedStatus;
+    procedure SetPageCaption(ASheet: TTabSheet);
   Protected
     procedure MRUMenuManager1RecentFile(Sender: TObject; const AFileName: String);
     procedure Notification(AComponent: TComponent; Operation: TOperation); override;
@@ -632,6 +633,24 @@ begin
   SBreport.Panels[2].text:=StateNames[CurrentDesigner.DesignerState];
 end;
 
+Procedure TFPReportDesignerForm.SetPageCaption(ASheet : TTabSheet);
+
+Var
+  TS : TPageTabSheet;
+  PageNo : Integer;
+
+begin
+  if Not (Asheet is TPageTabSheet) then
+    exit;
+  TS:=ASheet as TPageTabSheet;
+  PageNo:=TS.TabIndex+1;
+  if (TS.Page.Name<>'') then
+    TS.Caption:=Format('Page %d (%s)',[PageNo,TS.Page.Name])
+  else
+    TS.Caption:=Format('Page %d',[PageNo]);
+end;
+
+
 function TFPReportDesignerForm.AddPageDesign(aPageNo: Integer;
   APage: TFPReportCustomPage): TTabSheet;
 
@@ -644,8 +663,7 @@ begin
   TS:=TPageTabSheet.Create(Self);
   TS.FPage:=APage;
   TS.Parent:=PCReport;
-  TS.Caption:=Format('Page %d',[aPageNo]);
-
+  SetPageCaption(TS);
   D:=TFPReportDesignerControl.Create(Self);
   SB:=TScrollBox.Create(TS);
   SB.Parent:=TS;
@@ -799,6 +817,7 @@ Var
 begin
   P:=CreateNewPage;
   FReport.AddPage(P);
+  P.Name:='Page'+IntToStr(FReport.PageCount);
   FOI.RefreshReportTree;
   PCReport.ActivePage:=AddPageDesign(FReport.PageCount,P);
   Modified:=True;
@@ -963,7 +982,8 @@ begin
       begin
       CurrentDesigner.UpdatePageParams;
       CurrentDesigner.Reset;
-      CurrentDesigner.Objects.SelectElement(CurrentDesigner.Page)
+      CurrentDesigner.Objects.SelectElement(CurrentDesigner.Page);
+      SetPageCaption(PCReport.ActivePage);
       end
     else
       CurrentDesigner.Invalidate;
@@ -1044,6 +1064,7 @@ begin
     begin
     p:=CreateNewPage;
     FReport.AddPage(P);
+    P.Name:='Page'+IntToStr(FReport.PageCount);
     end;
 end;