From e687e39a1b548990586289ae59724fc2c68ceec5 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sun, 17 Jan 2010 18:06:55 +0000 Subject: [PATCH] Better Errorhandling in ReportWizard if SqlParameters (DateTime)for StoredProcedures has wrong values ReportViewer show correct pages during rendering git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5410 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/ReportWizard/WizardPanels/ResultPanel.cs | 3 +++ .../ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs | 1 - .../Project/Exporter/FormPageBuilder.cs | 4 +--- .../Project/ReportViewer/ReportViewer.cs | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs index 8a91a75000..9f7a5367d2 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportWizard/WizardPanels/ResultPanel.cs @@ -167,8 +167,11 @@ namespace ICSharpCode.Reports.Addin.ReportWizard try { SqlDataAccessStrategy.BuildQueryParameters(command,sqlParamsCollection); adapter.SelectCommand = (DbCommand)command; + adapter.Fill (dataSet); return dataSet; + } catch (Exception e) { + MessageService.ShowError(e.Message); } finally { if (adapter.SelectCommand.Connection.State == ConnectionState.Open) { adapter.SelectCommand.Connection.Close(); diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs index ca8ccc6a5c..fbc9513f8d 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs @@ -74,7 +74,6 @@ namespace ICSharpCode.Reports.Core.Exporter } SectionBounds sectionBounds = new SectionBounds (this.reportModel.ReportSettings,firstPage); ExporterPage sp = ExporterPage.CreateInstance(sectionBounds,this.pages.Count + 1); - return sp; } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs index f678ad785e..1f19ab1107 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/FormPageBuilder.cs @@ -54,9 +54,7 @@ namespace ICSharpCode.Reports.Core.Exporter base.BuildReportHeader(); if (base.Pages.Count == 0) { this.ReportModel.ReportHeader.SectionOffset = base.SinglePage.SectionBounds.ReportHeaderRectangle.Top; - base.ConvertSection(this.ReportModel.ReportHeader, -// base.SinglePage.SectionBounds.ReportHeaderRectangle.Top, - 1 ); + base.ConvertSection(this.ReportModel.ReportHeader,1); } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs index 79014aa730..8a281a7ca9 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs @@ -194,6 +194,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer private void BackgroundWorker_ProgressChanged(object sender, ProgressChangedEventArgs e) { + this.pageNumber = e.ProgressPercentage; this.ShowSelectedPage(); }