From f6bbb193bacbc75f83b40f954408063cba68c615 Mon Sep 17 00:00:00 2001 From: cxl Date: Wed, 4 Nov 2015 09:54:19 +0000 Subject: [PATCH] Report: QtfReport variant with pagesize git-svn-id: svn://ultimatepp.org/upp/trunk@9144 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- uppsrc/Report/Report.h | 1 + uppsrc/Report/ReportDlg.cpp | 15 ++++++++++++++- uppsrc/Report/init | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/uppsrc/Report/Report.h b/uppsrc/Report/Report.h index 764200920..bcd59fa11 100644 --- a/uppsrc/Report/Report.h +++ b/uppsrc/Report/Report.h @@ -156,6 +156,7 @@ bool DefaultPrint(Report& r, int i, const char *_name = t_("Report")); bool Print(Report& r, int i, const char *name = t_("Report")); bool Perform(Report& r, const char *name = t_("Report")); bool QtfReport(const String& qtf, const char *name = "", bool pagenumbers = false); +bool QtfReport(Size pagesize, const String& qtf, const char *name = "", bool pagenumbers = false); END_UPP_NAMESPACE diff --git a/uppsrc/Report/ReportDlg.cpp b/uppsrc/Report/ReportDlg.cpp index 4c625d180..ce4ba3efb 100644 --- a/uppsrc/Report/ReportDlg.cpp +++ b/uppsrc/Report/ReportDlg.cpp @@ -283,9 +283,11 @@ bool Perform(Report& r, const char *caption) return ReportWindow().Perform(r, 100, caption); } -bool QtfReport(const String& qtf, const char *name, bool pagenumbers) +bool QtfReport0(const String& qtf, const char *name, bool pagenumbers, Size pagesize) { Report r; + if(!IsNull(pagesize)) + r.SetPageSize(pagesize); if(pagenumbers) { Report rr; rr.Footer("[1> $$P]"); @@ -296,4 +298,15 @@ bool QtfReport(const String& qtf, const char *name, bool pagenumbers) return Perform(r, name); } +bool QtfReport(const String& qtf, const char *name, bool pagenumbers) +{ + return QtfReport0(qtf, name, pagenumbers, Null); +} + +bool QtfReport(Size pagesize, const String& qtf, const char *name, bool pagenumbers) +{ + return QtfReport0(qtf, name, pagenumbers, pagesize); +} + + END_UPP_NAMESPACE diff --git a/uppsrc/Report/init b/uppsrc/Report/init index 8b72f4985..1d1da9d00 100644 --- a/uppsrc/Report/init +++ b/uppsrc/Report/init @@ -2,7 +2,7 @@ #define _Report_icpp_init_stub #include "CtrlLib/init" #include "RichText/init" -#define BLITZ_INDEX__ Fcae78d106d26dc372cd742d77f7d5d07 +#define BLITZ_INDEX__ F92e20102c48294de23860475d094c3d4 #include "ReportI.icpp" #undef BLITZ_INDEX__ #endif