From 49851a1b4e040b231f503fd6df3595f69cd18702 Mon Sep 17 00:00:00 2001 From: jesus Date: Fri, 15 Jul 2016 01:27:37 +0000 Subject: [PATCH] LazReport: report option for printing PageHeader band before ReportTitle band, issue #30345 git-svn-id: trunk@52689 - --- components/lazreport/source/lr_class.pas | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/components/lazreport/source/lr_class.pas b/components/lazreport/source/lr_class.pas index ae17c1035c..e020c947e0 100644 --- a/components/lazreport/source/lr_class.pas +++ b/components/lazreport/source/lr_class.pas @@ -91,8 +91,9 @@ type TfrFrameStyle = (frsSolid,frsDash, frsDot, frsDashDot, frsDashDotDot,frsDouble); TfrPageType = (ptReport, ptDialog); //todo: - remove this TfrReportOption = (roIgnoreFieldNotFound, roIgnoreSymbolNotFound, roHideDefaultFilter, - roDontUpgradePreparedReport, // on saving an old prepared report don't update to current version - roSaveAndRestoreBookmarks // try to save and later restore dataset bookmarks on building report + roDontUpgradePreparedReport, // on saving an old prepared report don't update to current version + roSaveAndRestoreBookmarks, // try to save and later restore dataset bookmarks on building report + roPageHeaderBeforeReportTitle // PageHeader band is printed before ReportTitle band ); TfrReportOptions = set of TfrReportOption; TfrObjectType = (otlReportView, otlUIControl); @@ -8543,12 +8544,15 @@ begin {$IFDEF DebugLR} DebugLn('XAdjust=%d CurY=%d sfPage=%d',[XAdjust,CurY,sfpage]); {$ENDIF} - ShowBand(Bands[btReportTitle]); + if not (roPageHeaderBeforeReportTitle in MasterReport.Options) then + ShowBand(Bands[btReportTitle]); if PageNo = sfPage then // check if new page was formed begin if BandExists(Bands[btPageHeader]) and ((Bands[btPageHeader].Flags and flBandOnFirstPage) <> 0) then ShowBand(Bands[btPageHeader]); + if roPageHeaderBeforeReportTitle in MasterReport.Options then + ShowBand(Bands[btReportTitle]); if not RowsLayout then ShowBand(Bands[btColumnHeader]); end;