diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs index 545841e6a5..02c719e44b 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/BasePageBuilder.cs @@ -13,6 +13,8 @@ using System.Drawing; using System.Linq; using ICSharpCode.Reporting.BaseClasses; +using ICSharpCode.Reporting.Exporter; +using ICSharpCode.Reporting.Expressions; using ICSharpCode.Reporting.Globals; using ICSharpCode.Reporting.Interfaces; using ICSharpCode.Reporting.Interfaces.Export; @@ -204,6 +206,21 @@ namespace ICSharpCode.Reporting.PageBuilder CurrentLocation = DetailStart; } + + protected void RunExpressions() + { + var er = new ExpressionRunner(Pages); + er.Run(); + } + + + protected void RunDebugVisitor() + { + var d = new DebugExporter(Pages); + d.Run(); + } + + protected IReportModel ReportModel {get; private set;} protected Point CurrentLocation {get; set;} diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs index 05e45807ba..78f9b2283c 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs @@ -39,8 +39,7 @@ namespace ICSharpCode.Reporting.PageBuilder BuildDetail(); base.BuildReportFooter(); base.AddPage(CurrentPage); - var er = new ExpressionRunner(Pages); - er.Run(); +// RunExpressions(); } void BuildDetail() diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs index 8eb6f2befe..26a8209115 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/FormPageBuilder.cs @@ -30,12 +30,12 @@ namespace ICSharpCode.Reporting.PageBuilder base.BuildExportList(); BuildDetail(); base.AddPage(CurrentPage); - var d = new DebugExporter(Pages); - d.Run(); - var er = new ExpressionRunner(Pages); - er.Run(); + + RunDebugVisitor(); + +// RunExpressions(); } - + void BuildDetail() {