LazReport, Implement ability to filter by band type in fpspreadsheet export, modified patch from Luiz Americo, issue #29690

git-svn-id: trunk@52073 -

components/lazreport/source/addons/lrspreadsheetexport/languages/le_e_spreadsheet_consts.de.po

@@ -48,6 +48,14 @@ msgstr ""
 "Seitennummern und/oder Seitenbereiche eingeben,\n"
 "durch Kommas getrennt. Zum Beispiel, 1,3,5-12\n"
 
+#: le_e_spreadsheet_consts.sexportpagefooter
+msgid "Export page footer"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportpageheader
+msgid "Export page header"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportpictures
 msgid "Export pictures"
 msgstr "Bilder exportieren"
@@ -56,6 +64,14 @@ msgstr "Bilder exportieren"
 msgid "Export print range"
 msgstr ""
 
+#: le_e_spreadsheet_consts.sexportreportsummary
+msgid "Export report summary"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportreporttitle
+msgid "Export report title"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportsettings
 msgid "Export settings"
 msgstr "Exporteinstellungen"

components/lazreport/source/addons/lrspreadsheetexport/languages/le_e_spreadsheet_consts.fr.po

@@ -47,6 +47,14 @@ msgstr ""
 "Saisir les numéros de pages et/ou les intervalles de pages,\n"
 "séparés par des virgules. Par exemple : 1,3,5-12\n"
 
+#: le_e_spreadsheet_consts.sexportpagefooter
+msgid "Export page footer"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportpageheader
+msgid "Export page header"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportpictures
 msgid "Export pictures"
 msgstr "Exporter les images"
@@ -55,6 +63,14 @@ msgstr "Exporter les images"
 msgid "Export print range"
 msgstr ""
 
+#: le_e_spreadsheet_consts.sexportreportsummary
+msgid "Export report summary"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportreporttitle
+msgid "Export report title"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportsettings
 msgid "Export settings"
 msgstr "Exporter les paramètres"

components/lazreport/source/addons/lrspreadsheetexport/languages/le_e_spreadsheet_consts.hu.po

@@ -47,6 +47,14 @@ msgstr ""
 "Oldalszámok és/vagy tartományok megadása\n"
 "vesszővel elválasztva. Például: 1,3,5-12\n"
 
+#: le_e_spreadsheet_consts.sexportpagefooter
+msgid "Export page footer"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportpageheader
+msgid "Export page header"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportpictures
 msgid "Export pictures"
 msgstr "Képek exportálása"
@@ -55,6 +63,14 @@ msgstr "Képek exportálása"
 msgid "Export print range"
 msgstr ""
 
+#: le_e_spreadsheet_consts.sexportreportsummary
+msgid "Export report summary"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportreporttitle
+msgid "Export report title"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportsettings
 msgid "Export settings"
 msgstr "Exportálás beállításai"

components/lazreport/source/addons/lrspreadsheetexport/languages/le_e_spreadsheet_consts.po

@@ -35,6 +35,14 @@ msgid ""
 "separated by commas. For example, 1,3,5-12\n"
 msgstr ""
 
+#: le_e_spreadsheet_consts.sexportpagefooter
+msgid "Export page footer"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportpageheader
+msgid "Export page header"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportpictures
 msgid "Export pictures"
 msgstr ""
@@ -43,6 +51,14 @@ msgstr ""
 msgid "Export print range"
 msgstr ""
 
+#: le_e_spreadsheet_consts.sexportreportsummary
+msgid "Export report summary"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportreporttitle
+msgid "Export report title"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportsettings
 msgid "Export settings"
 msgstr ""

components/lazreport/source/addons/lrspreadsheetexport/languages/le_e_spreadsheet_consts.ru.po

@@ -47,6 +47,14 @@ msgstr ""
 "Введите номера и/или диапазоны страниц,\n"
 "разделённые запятыми. Например, 1,3,5-12\n"
 
+#: le_e_spreadsheet_consts.sexportpagefooter
+msgid "Export page footer"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportpageheader
+msgid "Export page header"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportpictures
 msgid "Export pictures"
 msgstr "Экспортировать изображения"
@@ -55,6 +63,14 @@ msgstr "Экспортировать изображения"
 msgid "Export print range"
 msgstr "Экспортировать диапазон печати"
 
+#: le_e_spreadsheet_consts.sexportreportsummary
+msgid "Export report summary"
+msgstr ""
+
+#: le_e_spreadsheet_consts.sexportreporttitle
+msgid "Export report title"
+msgstr ""
+
 #: le_e_spreadsheet_consts.sexportsettings
 msgid "Export settings"
 msgstr "Параметры экспорта"
@@ -106,3 +122,4 @@ msgstr "Страницы:"
 #: le_e_spreadsheet_consts.sreportpagename
 msgid "Report"
 msgstr "Отчёт"
+

components/lazreport/source/addons/lrspreadsheetexport/le_e_spreadsheet.pas

@@ -312,40 +312,60 @@ begin
   if Assigned(lrSpreadSheetExportComponent) and not lrSpreadSheetExportComponent.ShowSetupForm then exit;
 
   leSpreadsheetParamsForm:=TleSpreadsheetParamsForm.Create(Application);
-  leSpreadsheetParamsForm.RadioButton4.Checked:=FDataGrouping = ldgLikeReport;
-  leSpreadsheetParamsForm.RadioButton5.Checked:=FDataGrouping = ldgAllInOnePage;
-  leSpreadsheetParamsForm.RadioButton6.Checked:=FDataGrouping = ldgChunks;
-  leSpreadsheetParamsForm.SpinEdit1.Value:=FDataGroupingChunks;
-  leSpreadsheetParamsForm.CheckBox1.Checked:=FExportImages;
-  leSpreadsheetParamsForm.CheckBox4.Checked:=FOpenAfterExport;
-  leSpreadsheetParamsForm.CheckBox2.Checked:=FMergeCell;
-  leSpreadsheetParamsForm.CheckBox6.Checked:=FDeleteEmptyRow;
-  leSpreadsheetParamsForm.CheckBox7.Checked:=FExportURL;
-  leSpreadsheetParamsForm.CheckBox8.Checked:=FExportPrintRange;
-
+  leSpreadsheetParamsForm.LikeReportRadioButton.Checked:=FDataGrouping = ldgLikeReport;
+  leSpreadsheetParamsForm.AllInOnePageRadioButton.Checked:=FDataGrouping = ldgAllInOnePage;
+  leSpreadsheetParamsForm.RowsPerChunkRadioButton.Checked:=FDataGrouping = ldgChunks;
+  leSpreadsheetParamsForm.RowsPerChunkEdit.Value:=FDataGroupingChunks;
+  leSpreadsheetParamsForm.OpenAfterExportCheckBox.Checked:=FOpenAfterExport;
+  leSpreadsheetParamsForm.MergeCellsCheckBox.Checked:=FMergeCell;
+  leSpreadsheetParamsForm.DeleteEmptyRowsCheckBox.Checked:=FDeleteEmptyRow;
+  leSpreadsheetParamsForm.ExportPicturesCheckBox.Checked:=FExportImages;
+  leSpreadsheetParamsForm.ExportURLCheckBox.Checked:=FExportURL;
+  leSpreadsheetParamsForm.ExportPrintRangeCheckBox.Checked:=FExportPrintRange;
+  leSpreadsheetParamsForm.ExportReportTitleCheckBox.Checked:=btReportTitle in BandTypes;
+  leSpreadsheetParamsForm.ExportReportSummaryCheckBox.Checked:=btReportSummary in BandTypes;
+  leSpreadsheetParamsForm.ExportPageHeaderCheckBox.Checked:=btPageHeader in BandTypes;
+  leSpreadsheetParamsForm.ExportPageFooterCheckBox.Checked:=btPageFooter in BandTypes;
 
   Result:=leSpreadsheetParamsForm.ShowModal = mrOk;
   if Result then
   begin
-    if leSpreadsheetParamsForm.RadioButton4.Checked then
+    if leSpreadsheetParamsForm.LikeReportRadioButton.Checked then
       FDataGrouping:=ldgLikeReport
     else
-    if leSpreadsheetParamsForm.RadioButton5.Checked then
+    if leSpreadsheetParamsForm.AllInOnePageRadioButton.Checked then
       FDataGrouping:=ldgAllInOnePage
     else
     begin
       FDataGrouping:=ldgChunks;
-      FDataGroupingChunks:=leSpreadsheetParamsForm.SpinEdit1.Value;
+      FDataGroupingChunks:=leSpreadsheetParamsForm.RowsPerChunkEdit.Value;
     end;
-    FExportImages   := leSpreadsheetParamsForm.CheckBox1.Checked;
-    FOpenAfterExport:= leSpreadsheetParamsForm.CheckBox4.Checked;
-    FMergeCell      := leSpreadsheetParamsForm.CheckBox2.Checked;
-    FDeleteEmptyRow := leSpreadsheetParamsForm.CheckBox6.Checked;
-    FExportURL      := leSpreadsheetParamsForm.CheckBox7.Checked;
-    FExportPrintRange:=leSpreadsheetParamsForm.CheckBox8.Checked;
+    FExportImages   := leSpreadsheetParamsForm.ExportPicturesCheckBox.Checked;
+    FOpenAfterExport:= leSpreadsheetParamsForm.OpenAfterExportCheckBox.Checked;
+    FMergeCell      := leSpreadsheetParamsForm.MergeCellsCheckBox.Checked;
+    FDeleteEmptyRow := leSpreadsheetParamsForm.DeleteEmptyRowsCheckBox.Checked;
+    FExportURL      := leSpreadsheetParamsForm.ExportURLCheckBox.Checked;
+    FExportPrintRange:=leSpreadsheetParamsForm.ExportPrintRangeCheckBox.Checked;
 
     FExportMatrix.MergeCell:=FMergeCell;
     FExportMatrix.DeleteEmptyRow:=FDeleteEmptyRow;
+
+    if leSpreadsheetParamsForm.ExportReportTitleCheckBox.Checked then
+      BandTypes := BandTypes + [btReportTitle]
+    else
+      BandTypes := BandTypes - [btReportTitle];
+    if leSpreadsheetParamsForm.ExportReportSummaryCheckBox.Checked then
+      BandTypes := BandTypes + [btReportSummary]
+    else
+      BandTypes := BandTypes - [btReportSummary];
+    if leSpreadsheetParamsForm.ExportPageHeaderCheckBox.Checked then
+      BandTypes := BandTypes + [btPageHeader]
+    else
+      BandTypes := BandTypes - [btPageHeader];
+    if leSpreadsheetParamsForm.ExportPageFooterCheckBox.Checked then
+      BandTypes := BandTypes + [btPageFooter]
+    else
+      BandTypes := BandTypes - [btPageFooter];
   end;
   leSpreadsheetParamsForm.Free;
 end;
@@ -371,6 +391,7 @@ begin
     FExportURL:=lrSpreadSheetExportComponent.ExportURL;
     FExportPrintRange:=lrSpreadSheetExportComponent.ExportPrintRange;
     FExportImages:=lrSpreadSheetExportComponent.ExportImages;
+    BandTypes:=lrSpreadSheetExportComponent.BandTypes;
   end
   else
   begin
@@ -472,7 +493,7 @@ end;
 
 procedure TlrSpreadSheetExportFilter.OnExported(x, y: Integer; View: TfrView);
 begin
-  if not Assigned(View) then exit;
+  if not Assigned(View) or not (View.ParentBandType in BandTypes) then exit;  
   FExportMatrix.ExportObject(View);
 end;
 

components/lazreport/source/addons/lrspreadsheetexport/le_e_spreadsheet_consts.pas

@@ -61,6 +61,10 @@ resourcestring
   sExportPictures      = 'Export pictures';
   sExportURL           = 'Export URL';
   sExportPrintRange    = 'Export print range';
+  sExportReportTitle   = 'Export report title';
+  sExportReportSummary = 'Export report summary';
+  sExportPageHeader    = 'Export page header';
+  sExportPageFooter    = 'Export page footer';
   sMergeCells          = 'Merge cells';
   sPageBreaks          = 'Page breaks';
   sDeleteEmptyRows     = 'Delete empty rows';

components/lazreport/source/addons/lrspreadsheetexport/le_e_spreadsheet_params.lfm

@@ -53,7 +53,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         ClientWidth = 396
         TabOrder = 0
         Visible = False
-        object RadioButton1: TRadioButton
+        object AllPagesRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox1
           AnchorSideTop.Control = GroupBox1
           Left = 6
@@ -66,9 +66,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           TabOrder = 0
           TabStop = True
         end
-        object RadioButton2: TRadioButton
+        object CurrentPageRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox1
-          AnchorSideTop.Control = RadioButton1
+          AnchorSideTop.Control = AllPagesRadioButton
           AnchorSideTop.Side = asrBottom
           Left = 6
           Height = 24
@@ -78,9 +78,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           Caption = 'Current page'
           TabOrder = 1
         end
-        object RadioButton3: TRadioButton
+        object PagesRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox1
-          AnchorSideTop.Control = RadioButton2
+          AnchorSideTop.Control = CurrentPageRadioButton
           AnchorSideTop.Side = asrBottom
           Left = 6
           Height = 24
@@ -90,10 +90,10 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           Caption = 'Pages:'
           TabOrder = 2
         end
-        object Edit1: TEdit
-          AnchorSideLeft.Control = RadioButton3
+        object PagesEdit: TEdit
+          AnchorSideLeft.Control = PagesRadioButton
           AnchorSideLeft.Side = asrBottom
-          AnchorSideTop.Control = RadioButton2
+          AnchorSideTop.Control = CurrentPageRadioButton
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = GroupBox1
           AnchorSideRight.Side = asrBottom
@@ -107,7 +107,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         end
         object Label1: TLabel
           AnchorSideLeft.Control = GroupBox1
-          AnchorSideTop.Control = Edit1
+          AnchorSideTop.Control = PagesEdit
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = GroupBox1
           AnchorSideRight.Side = asrBottom
@@ -136,7 +136,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         ClientHeight = 102
         ClientWidth = 396
         TabOrder = 1
-        object RadioButton4: TRadioButton
+        object LikeReportRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox2
           AnchorSideTop.Control = GroupBox2
           Left = 6
@@ -149,9 +149,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           TabOrder = 0
           TabStop = True
         end
-        object RadioButton5: TRadioButton
+        object AllInOnePageRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox2
-          AnchorSideTop.Control = RadioButton4
+          AnchorSideTop.Control = LikeReportRadioButton
           AnchorSideTop.Side = asrBottom
           Left = 6
           Height = 24
@@ -161,9 +161,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           Caption = 'All in one page'
           TabOrder = 1
         end
-        object RadioButton6: TRadioButton
+        object RowsPerChunkRadioButton: TRadioButton
           AnchorSideLeft.Control = GroupBox2
-          AnchorSideTop.Control = RadioButton5
+          AnchorSideTop.Control = AllInOnePageRadioButton
           AnchorSideTop.Side = asrBottom
           Left = 6
           Height = 24
@@ -174,10 +174,10 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           TabOrder = 2
           Visible = False
         end
-        object SpinEdit1: TSpinEdit
-          AnchorSideLeft.Control = RadioButton6
+        object RowsPerChunkEdit: TSpinEdit
+          AnchorSideLeft.Control = RowsPerChunkRadioButton
           AnchorSideLeft.Side = asrBottom
-          AnchorSideTop.Control = RadioButton5
+          AnchorSideTop.Control = AllInOnePageRadioButton
           AnchorSideTop.Side = asrBottom
           AnchorSideRight.Control = GroupBox2
           AnchorSideRight.Side = asrBottom
@@ -194,7 +194,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
           Visible = False
         end
       end
-      object CheckBox4: TCheckBox
+      object OpenAfterExportCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet1
         AnchorSideTop.Control = GroupBox2
         AnchorSideTop.Side = asrBottom
@@ -206,9 +206,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         Caption = 'Open after export'
         TabOrder = 2
       end
-      object CheckBox5: TCheckBox
+      object AutoCreateFileCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet1
-        AnchorSideTop.Control = CheckBox4
+        AnchorSideTop.Control = OpenAfterExportCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 24
@@ -224,7 +224,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
       Caption = 'Export settings'
       ClientHeight = 277
       ClientWidth = 400
-      object CheckBox1: TCheckBox
+      object ExportPicturesCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
         AnchorSideTop.Control = TabSheet2
         Left = 6
@@ -237,7 +237,7 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         TabOrder = 0
         Visible = False
       end
-      object CheckBox2: TCheckBox
+      object MergeCellsCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
         AnchorSideTop.Control = TabSheet2
         Left = 6
@@ -248,9 +248,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         Caption = 'Merge cells'
         TabOrder = 1
       end
-      object CheckBox3: TCheckBox
+      object PageBreaksCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
-        AnchorSideTop.Control = CheckBox2
+        AnchorSideTop.Control = MergeCellsCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 24
@@ -262,9 +262,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         TabOrder = 2
         Visible = False
       end
-      object CheckBox6: TCheckBox
+      object DeleteEmptyRowsCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
-        AnchorSideTop.Control = CheckBox2
+        AnchorSideTop.Control = MergeCellsCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 24
@@ -274,9 +274,41 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         Caption = 'Delete empty rows'
         TabOrder = 3
       end
-      object CheckBox7: TCheckBox
+      object ExportReportTitleCheckBox: TCheckBox
+        Left = 6
+        Height = 19
+        Top = 115
+        Width = 111
+        Caption = 'Export report title'
+        TabOrder = 8
+      end
+      object ExportPageFooterCheckBox: TCheckBox
+        Left = 160
+        Height = 19
+        Top = 139
+        Width = 117
+        Caption = 'Export page footer'
+        TabOrder = 9
+      end
+      object ExportPageHeaderCheckBox: TCheckBox
+        Left = 160
+        Height = 19
+        Top = 115
+        Width = 121
+        Caption = 'Export page header'
+        TabOrder = 6
+      end
+      object ExportReportSummaryCheckBox: TCheckBox
+        Left = 6
+        Height = 19
+        Top = 139
+        Width = 141
+        Caption = 'Export report summary'
+        TabOrder = 7
+      end
+      object ExportURLCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
-        AnchorSideTop.Control = CheckBox6
+        AnchorSideTop.Control = DeleteEmptyRowsCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 24
@@ -286,9 +318,9 @@ object leSpreadsheetParamsForm: TleSpreadsheetParamsForm
         Caption = 'URL''s'
         TabOrder = 4
       end
-      object CheckBox8: TCheckBox
+      object ExportPrintRangeCheckBox: TCheckBox
         AnchorSideLeft.Control = TabSheet2
-        AnchorSideTop.Control = CheckBox7
+        AnchorSideTop.Control = ExportURLCheckBox
         AnchorSideTop.Side = asrBottom
         Left = 6
         Height = 24

components/lazreport/source/addons/lrspreadsheetexport/le_e_spreadsheet_params.pas

@@ -48,26 +48,30 @@ type
 
   TleSpreadsheetParamsForm = class(TForm)
     ButtonPanel1: TButtonPanel;
-    CheckBox1: TCheckBox;
-    CheckBox2: TCheckBox;
-    CheckBox3: TCheckBox;
-    CheckBox4: TCheckBox;
-    CheckBox5: TCheckBox;
-    CheckBox6: TCheckBox;
-    CheckBox7: TCheckBox;
-    CheckBox8: TCheckBox;
-    Edit1: TEdit;
+    ExportPageFooterCheckBox: TCheckBox;
+    ExportPageHeaderCheckBox: TCheckBox;
+    ExportReportTitleCheckBox: TCheckBox;
+    ExportPicturesCheckBox: TCheckBox;
+    ExportReportSummaryCheckBox: TCheckBox;
+    MergeCellsCheckBox: TCheckBox;
+    PageBreaksCheckBox: TCheckBox;
+    OpenAfterExportCheckBox: TCheckBox;
+    AutoCreateFileCheckBox: TCheckBox;
+    ExportURLCheckBox: TCheckBox;
+    ExportPrintRangeCheckBox: TCheckBox;
+    DeleteEmptyRowsCheckBox: TCheckBox;
+    PagesEdit: TEdit;
     GroupBox1: TGroupBox;
     GroupBox2: TGroupBox;
     Label1: TLabel;
     PageControl1: TPageControl;
-    RadioButton1: TRadioButton;
-    RadioButton2: TRadioButton;
-    RadioButton3: TRadioButton;
-    RadioButton4: TRadioButton;
-    RadioButton5: TRadioButton;
-    RadioButton6: TRadioButton;
-    SpinEdit1: TSpinEdit;
+    AllPagesRadioButton: TRadioButton;
+    CurrentPageRadioButton: TRadioButton;
+    PagesRadioButton: TRadioButton;
+    LikeReportRadioButton: TRadioButton;
+    AllInOnePageRadioButton: TRadioButton;
+    RowsPerChunkRadioButton: TRadioButton;
+    RowsPerChunkEdit: TSpinEdit;
     TabSheet1: TTabSheet;
     TabSheet2: TTabSheet;
     procedure FormCreate(Sender: TObject);
@@ -99,23 +103,27 @@ begin
   TabSheet1.Caption:=sGeneral;
   TabSheet2.Caption:=sExportSettings;
   GroupBox2.Caption:=sDataGrouping;
-  RadioButton4.Caption:=sLikeTheReport;
-  RadioButton5.Caption:=sAllInOnePage;
-  RadioButton6.Caption:=sChunksEach;
-  CheckBox4.Caption:=sOpenAfterExport;
-  CheckBox5.Caption:=sAutoCreateFile;
+  LikeReportRadioButton.Caption:=sLikeTheReport;
+  AllInOnePageRadioButton.Caption:=sAllInOnePage;
+  RowsPerChunkRadioButton.Caption:=sChunksEach;
+  OpenAfterExportCheckBox.Caption:=sOpenAfterExport;
+  AutoCreateFileCheckBox.Caption:=sAutoCreateFile;
   GroupBox1.Caption:=sPageRange;
-  RadioButton1.Caption:=sAllPages;
-  RadioButton2.Caption:=sCurrentPage;
-  RadioButton3.Caption:=sPages;
+  AllPagesRadioButton.Caption:=sAllPages;
+  CurrentPageRadioButton.Caption:=sCurrentPage;
+  PagesRadioButton.Caption:=sPages;
   Label1.Caption:=sEnterPageNumbers;
 
-  CheckBox1.Caption:=sExportPictures;
-  CheckBox2.Caption:=sMergeCells;
-  CheckBox3.Caption:=sPageBreaks;
-  CheckBox6.Caption:=sDeleteEmptyRows;
-  CheckBox7.Caption:=sExportURL;
-  CheckBox8.Caption:=sExportPrintRange;
+  ExportPicturesCheckBox.Caption:=sExportPictures;
+  MergeCellsCheckBox.Caption:=sMergeCells;
+  PageBreaksCheckBox.Caption:=sPageBreaks;
+  DeleteEmptyRowsCheckBox.Caption:=sDeleteEmptyRows;
+  ExportURLCheckBox.Caption:=sExportURL;
+  ExportPrintRangeCheckBox.Caption:=sExportPrintRange;
+  ExportReportTitleCheckBox.Caption:=sExportReportTitle;
+  ExportReportSummaryCheckBox.Caption:=sExportReportSummary;
+  ExportPageHeaderCheckBox.Caption:=sExportPageHeader;
+  ExportPageFooterCheckBox.Caption:=sExportPageFooter;
 end;
 
 end.

components/lazreport/source/addons/lrspreadsheetexport/lrspreadsheetexp.pas

@@ -39,7 +39,7 @@ unit lrSpreadSheetExp;
 interface
 
 uses
-  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, le_e_spreadsheet_types;
+  Classes, SysUtils, LResources, Forms, Controls, Graphics, Dialogs, le_e_spreadsheet_types, LR_Class;
 
 type
 
@@ -47,6 +47,7 @@ type
 
   TlrSpreadSheetExport = class(TComponent)
   private
+    FBandTypes: TfrBandTypes;
     FDataGrouping: TlreDataGrouping;
     FDataGroupingChunks: integer;
     FDeleteEmptyRow: boolean;
@@ -72,6 +73,7 @@ type
     property ShowSetupForm:boolean read FShowSetupForm write FShowSetupForm;
     property ExportURL:boolean read FExportURL write FExportURL default false;
     property ExportPrintRange:boolean read FExportPrintRange write FExportPrintRange default false;
+    property BandTypes:TfrBandTypes read FBandTypes write FBandTypes;
   end;
 
 procedure Register;
@@ -106,6 +108,7 @@ begin
   FExportURL:=false;
   FExportPrintRange:=false;
   FShowSetupForm:=true;
+  FBandTypes:=[btReportTitle..btNone];
 end;
 
 destructor TlrSpreadSheetExport.Destroy;