|
@@ -441,23 +441,18 @@ namespace FastReport.Engine
|
|
|
|
|
|
internal bool Run(bool runDialogs, bool append, bool resetDataState, ReportPage page)
|
|
|
{
|
|
|
- report.DoLog(false,"Engine.Run -> RunPhase1(resetDataState)");
|
|
|
RunPhase1(resetDataState);
|
|
|
|
|
|
try
|
|
|
{
|
|
|
- report.DoLog(false, "Engine.Run -> runDialogs && !RunDialogs()");
|
|
|
if (runDialogs && !RunDialogs())
|
|
|
return false;
|
|
|
- report.DoLog(false, "Engine.Run -> RunPhase2(append, page)");
|
|
|
RunPhase2(append, page);
|
|
|
}
|
|
|
finally
|
|
|
{
|
|
|
- report.DoLog(false, "Engine.Run -> RunFinished");
|
|
|
RunFinished();
|
|
|
}
|
|
|
- report.DoLog(false, "Engine.Run -> Returning true");
|
|
|
return true;
|
|
|
}
|
|
|
|
|
@@ -478,22 +473,16 @@ namespace FastReport.Engine
|
|
|
|
|
|
internal void RunPhase2(bool append, ReportPage page)
|
|
|
{
|
|
|
- report.DoLog(false, "OnStartProgress");
|
|
|
Config.ReportSettings.OnStartProgress(Report);
|
|
|
- report.DoLog(false, "PrepareToFirstPass");
|
|
|
PrepareToFirstPass(append);
|
|
|
- report.DoLog(false, "RunReportPages(firstpass)");
|
|
|
RunReportPages(page);
|
|
|
-
|
|
|
- report.DoLog(false, "ResetLogicalPageNumber");
|
|
|
+
|
|
|
ResetLogicalPageNumber();
|
|
|
|
|
|
if (Report.DoublePass && !Report.Aborted)
|
|
|
{
|
|
|
finalPass = true;
|
|
|
- report.DoLog(false, "PrepareToSecondPass");
|
|
|
PrepareToSecondPass();
|
|
|
- report.DoLog(false, "RunReportPages(secondpass)");
|
|
|
RunReportPages(page);
|
|
|
}
|
|
|
}
|