LazReport: fix potential AV on execute script for dialog pages

Increased speed of report template import from a spreadsheet
fix compile with latest Lazarus
fix AV after destroy report designer
fix create CrossTab report on multiple pages
fix editing prepared report

from Aleksey Lagunov, issue #31457

git-svn-id: trunk@54576 -

components/lazreport/source/addons/DialogControls/lrdialogcontrols.pas

@@ -1490,21 +1490,26 @@ var
   FSaveView:TfrView;
   FSavePage:TfrPage;
   CmdList, ErrorList:TStringList;
+  FSaveBand: TfrBand;
 begin
   if (DocMode = dmPrinting) and (Script.Count>0) and (Trim(Script.Text)<>'') and (Assigned(CurReport))then
   begin
     FSaveView:=CurView;
     FSavePage:=CurPage;
+    FSaveBand:=CurBand;
+
     CmdList:=TStringList.Create;
     ErrorList:=TStringList.Create;
     try
       CurView := Self;
       CurPage:=OwnerPage;
+      CurBand:=nil;
       frInterpretator.PrepareScript(Script, CmdList, ErrorList);
       frInterpretator.DoScript(CmdList);
     finally
       CurPage:=FSavePage;
       CurView := FSaveView;
+      CurBand:=FSaveBand;
       FreeAndNil(CmdList);
       FreeAndNil(ErrorList);
     end;

components/lazreport/source/addons/lrFclPDFExport/lr_e_fclpdf.pas

@@ -147,7 +147,7 @@ type
   end;
 
 implementation
-uses Forms, LR_Utils, LazUTF8, Printers, FPReadBMP, FPReadPNG, FPReadJPEG;
+uses LazFileUtils, Forms, LR_Utils, LazUTF8, Printers, FPReadBMP, FPReadPNG, FPReadJPEG;
 
 const
   cInchToMM = 25.4;

components/lazreport/source/addons/lrOfficeImport/lrspreadsheetimportunit.lfm

@@ -1,19 +1,19 @@
 object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
   Left = 699
-  Height = 200
+  Height = 201
   Top = 384
   Width = 520
   Caption = 'Import from spreadsheet'
-  ClientHeight = 200
+  ClientHeight = 201
   ClientWidth = 520
   OnClose = FormClose
   Position = poScreenCenter
-  LCLVersion = '1.3'
+  LCLVersion = '1.7'
   object Label1: TLabel
     AnchorSideLeft.Control = Owner
     AnchorSideTop.Control = Owner
     Left = 6
-    Height = 21
+    Height = 20
     Top = 6
     Width = 62
     BorderSpacing.Around = 6
@@ -22,8 +22,8 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
   end
   object ButtonPanel1: TButtonPanel
     Left = 6
-    Height = 41
+    Height = 46
-    Top = 153
+    Top = 149
     Width = 508
     OKButton.Name = 'OKButton'
     OKButton.DefaultCaption = True
@@ -43,8 +43,8 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideRight.Control = Owner
     AnchorSideRight.Side = asrBottom
     Left = 12
-    Height = 31
+    Height = 37
-    Top = 33
+    Top = 32
     Width = 502
     FilterIndex = 0
     HideDirectories = False
@@ -60,9 +60,9 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideBottom.Control = Edit1
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 21
+    Height = 20
-    Top = 80
+    Top = 122
-    Width = 46
+    Width = 45
     Anchors = [akLeft, akBottom]
     BorderSpacing.Left = 6
     Caption = 'Left up'
@@ -72,12 +72,12 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
   object Edit1: TEdit
     AnchorSideLeft.Control = Label3
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = FileNameEdit1
+    AnchorSideTop.Control = CheckBox1
     AnchorSideTop.Side = asrBottom
-    Left = 86
+    Left = 85
-    Height = 31
+    Height = 37
-    Top = 70
+    Top = 105
-    Width = 80
+    Width = 82
     BorderSpacing.Around = 6
     TabOrder = 2
     Visible = False
@@ -85,12 +85,12 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
   object Edit2: TEdit
     AnchorSideLeft.Control = Edit1
     AnchorSideLeft.Side = asrBottom
-    AnchorSideTop.Control = FileNameEdit1
+    AnchorSideTop.Control = CheckBox1
     AnchorSideTop.Side = asrBottom
-    Left = 172
+    Left = 173
-    Height = 31
+    Height = 37
-    Top = 70
+    Top = 105
-    Width = 80
+    Width = 82
     BorderSpacing.Around = 6
     TabOrder = 3
     Visible = False
@@ -100,9 +100,9 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideBottom.Control = Edit3
     AnchorSideBottom.Side = asrBottom
     Left = 6
-    Height = 21
+    Height = 20
-    Top = 117
+    Top = 165
-    Width = 74
+    Width = 73
     Anchors = [akLeft, akBottom]
     BorderSpacing.Left = 6
     Caption = 'Right down'
@@ -114,10 +114,10 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Edit1
     AnchorSideTop.Side = asrBottom
-    Left = 86
+    Left = 85
-    Height = 31
+    Height = 37
-    Top = 107
+    Top = 148
-    Width = 80
+    Width = 82
     BorderSpacing.Around = 6
     TabOrder = 4
     Visible = False
@@ -127,10 +127,10 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Edit2
     AnchorSideTop.Side = asrBottom
-    Left = 172
+    Left = 173
-    Height = 31
+    Height = 37
-    Top = 107
+    Top = 148
-    Width = 80
+    Width = 82
     BorderSpacing.Around = 6
     TabOrder = 5
     Visible = False
@@ -140,9 +140,9 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideLeft.Side = asrBottom
     AnchorSideBottom.Control = Edit5
     AnchorSideBottom.Side = asrBottom
-    Left = 258
+    Left = 261
-    Height = 21
+    Height = 20
-    Top = 117
+    Top = 165
     Width = 31
     Anchors = [akLeft, akBottom]
     BorderSpacing.Left = 6
@@ -155,12 +155,24 @@ object lrSpreadSheetImportForm: TlrSpreadSheetImportForm
     AnchorSideLeft.Side = asrBottom
     AnchorSideTop.Control = Edit2
     AnchorSideTop.Side = asrBottom
-    Left = 295
+    Left = 298
-    Height = 31
+    Height = 37
-    Top = 107
+    Top = 148
-    Width = 80
+    Width = 82
     BorderSpacing.Around = 6
     TabOrder = 6
     Visible = False
   end
+  object CheckBox1: TCheckBox
+    AnchorSideLeft.Control = Owner
+    AnchorSideTop.Control = FileNameEdit1
+    AnchorSideTop.Side = asrBottom
+    Left = 6
+    Height = 24
+    Top = 75
+    Width = 374
+    BorderSpacing.Around = 6
+    Caption = 'Use not standart object names (improve import speed)'
+    TabOrder = 7
+  end
 end

components/lazreport/source/addons/lrOfficeImport/lrspreadsheetimportunit.pas

@@ -44,6 +44,7 @@ type
 
   TlrSpreadSheetImportForm = class(TForm)
     ButtonPanel1: TButtonPanel;
+    CheckBox1: TCheckBox;
     Edit1: TEdit;
     Edit2: TEdit;
     Edit3: TEdit;
@@ -127,8 +128,9 @@ var
   Cell:PCell;
   X, Y, DX, DY: Integer;
   Row: Integer;
-  Col: Integer;
+  Col, DY1, DX1: Integer;
   T:TfrMemoView;
+  AR1, AC1, AR2, AC2, i: Cardinal;
 begin
   // Create the spreadsheet
   FWorkbook := TsWorkbook.Create;
@@ -145,29 +147,58 @@ begin
     for Col:=0 to FWorksheet.GetLastColIndex do
     begin
       Cell := FWorksheet.FindCell(Row, Col);
+
       if Assigned(Cell) then
       begin
+        if FWorksheet.IsMerged(Cell) then
+        begin
+          if not FWorksheet.IsMergeBase(Cell) then
+          begin
+            Inc(X, CalcColWidth(FWorksheet.GetColWidth(Col)));
+            Continue;
+          end;
+
+          FWorksheet.FindMergedRange(Cell, AR1, AC1, AR2, AC2);
+          DX1:=0;
+          DY1:=0;
+
+          for i:=AC1 to AC2 do
+            DX1:=DX1 +CalcColWidth(FWorksheet.GetColWidth(I));
+          for i:=AR1 to AR2 do
+            DY1:=DY1 +CalcRowHeight(FWorksheet.GetRowHeight(I));
+        end
+        else
+        begin
+          DX1:=CalcColWidth(FWorksheet.GetColWidth(Col));
+          DY1:=DY;
+        end;
+
         T := frCreateObject(gtMemo, '', frDesigner.Page) as TfrMemoView;
-        T.CreateUniqueName;
+
+        if not CheckBox1.Checked then
+          T.CreateUniqueName
+        else
+          T.Name:=Format('Memo_Imp_%d_%d', [Col, Row]);
+
         T.x := x;
         T.y := y;
-        T.dx:=CalcColWidth(FWorksheet.GetColWidth(Col));
+        T.dx:=DX1;
-        T.dy:=DY;
+        T.dy:=DY1;
 
-        T.Alignment:=sHAToA(FWorksheet.ReadHorAlignment(Cell)); // Cell^.HorAlignment);
+        T.Alignment:=sHAToA(FWorksheet.ReadHorAlignment(Cell));
-        T.Layout:=sVAToL(FWorksheet.ReadVertAlignment(Cell)); // Cell^.VertAlignment);
+        T.Layout:=sVAToL(FWorksheet.ReadVertAlignment(Cell));
+
+        T.Frames:=sBorderToBorders(FWorksheet.ReadCellBorders(Cell));
 
-        T.Frames:=sBorderToBorders(FWorksheet.ReadCellBorders(Cell)); //Cell^.Border);
-//        BorderStyles: TsCelLBorderStyles;
 {
         if Cell^.BackgroundColor < FWorkbook.GetPaletteSize then
           T.FillColor:=FWorkbook.GetPaletteColor(Cell^.BackgroundColor);
 }
-        Convert_sFont_to_Font(FWorksheet.ReadCellFont(Cell), T.Font); //Cell^.FontIndex), T.Font);
+        T.FillColor:=FWorksheet.ReadBackgroundColor(Cell);
+        Convert_sFont_to_Font(FWorksheet.ReadCellFont(Cell), T.Font);
 
         T.MonitorFontChanges;
         T.Memo.Text:=FWorksheet.ReadAsUTF8Text(Cell);
-//        frDesigner.Page.Objects.Add(t);
 
       end
       else
@@ -212,7 +243,6 @@ begin
     if fssItalic in sFont.Style then AFont.Style := AFont.Style + [fsItalic];
     if fssUnderline in sFont.Style then AFont.Style := AFont.Style + [fsUnderline];
     if fssStrikeout in sFont.Style then AFont.Style := AFont.Style + [fsStrikeout];
-    //AFont.Color := FWorkbook.GetPaletteColor(sFont.Color);
     AFont.Color := sFont.Color;
   end;
 end;

components/lazreport/source/lr_class.pas

@@ -7406,7 +7406,8 @@ begin
   RTObjects.Free;
   List.Free;
   fMargins.Free;
-  
+  if Assigned(frDesigner) and (frDesigner.Page = Self) then
+    frDesigner.Page:=nil;
   inherited Destroy;
 end;
 

components/lazreport/source/lr_crosstab.pas

@@ -775,6 +775,8 @@ begin
 
   FPage:=TlrCrossPage.Create(nil);
   FPage.ChangePaper(OwnerPage.pgSize, OwnerPage.Width, OwnerPage.Height, OwnerPage.Orientation);
+  FPage.UseMargins:=OwnerPage.UseMargins;
+  FPage.Margins.AsRect:=OwnerPage.Margins.AsRect;
 
   if FShowTotalRHCell then
   begin
@@ -912,12 +914,13 @@ begin
   FPage.PlayFrom := 0;
   while FPage.PlayFrom < FPage.List.Count do
   begin
-    FPage.PlayRecList;
+    if FPage.PlayRecList then
-{    if FPage.List.Count > FPage.PlayFrom  then
+      Inc(FPage.PlayFrom);
-      FPage.NewPage;}
   end;
 
   FPage.DoneReport;
+  if Assigned(FSavePage) then
+    FSavePage.CurY:=FPage.CurY;
   FPage.Free;
 
   CurPage:=FSavePage;

components/lazreport/source/lr_view.pas

@@ -1536,11 +1536,28 @@ begin
 end;
 
 procedure TfrPreviewForm.EditBtnClick(Sender: TObject);
+var
+  R: TfrReport;
 begin
   if (Doc = nil) or not TfrReport(Doc).ModifyPrepared then Exit;
-  ConnectBack;
+{  ConnectBack;
   TfrReport(Doc).EditPreparedReport(CurPage - 1);
-  Connect(Doc);
+  Connect(Doc);}
+
+  R:=TfrReport.Create(nil);
+  R.EMFPages.Free;
+  R.EMFPages := TfrEMFPages(EMFPages);
+  EMFPages := nil;
+  R.EditPreparedReport(CurPage - 1);
+
+  if EMFPages <> nil then
+    TfrEMFPages(EMFPages).Free;
+
+  EMFPages := R.EMFPages;
+  R.EMFPages:=nil;
+//  TfrReport(Doc).EMFPages := TfrEMFPages.Create(TfrReport(Doc));
+
+  R.Free;
   RedrawAll;
 end;