From 210d65be086fcc97a019b3aba39cd783ea6f1166 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sat, 28 Jan 2006 12:59:34 +0000 Subject: [PATCH] Change delegates to EventHandler git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/trunk@1042 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../SharpReport/Designer/Report.cs | 6 ++---- .../SharpReportAddin/SharpReportView.cs | 1 + .../SharpReportCore/BaseSettings.cs | 2 +- .../Factories/BaseItemFactory.cs | 3 +++ .../Factories/GenericFactory.cs | 7 ++++++- .../Printing/RenderDataReport.cs | 5 +++-- .../Printing/RenderFormSheetReport.cs | 21 ++++++++++--------- 7 files changed, 27 insertions(+), 18 deletions(-) diff --git a/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs b/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs index 8cca8169b8..0d558d5fbd 100644 --- a/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs +++ b/src/AddIns/Misc/SharpReport/SharpReport/Designer/Report.cs @@ -53,6 +53,7 @@ namespace SharpReport.Designer{ [EditorBrowsable(EditorBrowsableState.Always), Browsable(true)] public event SelectedEventHandler ObjectSelected; + public event EventHandler SectionChanged; public event ItemDragDropEventHandler DesignViewChanged; @@ -281,11 +282,8 @@ namespace SharpReport.Designer{ /// /// this /// SharpReport.Designer.SectionChangedEventArgs - void SectionSizeChanged(object sender, SharpReport.Designer.SectionChangedEventArgs e) - { + void SectionSizeChanged(object sender, SharpReport.Designer.SectionChangedEventArgs e){ if (SectionChanged != null) { - //ToDo Better Idea??????? - //Fill Array of Section rectangles Rectangle [] rects = new Rectangle[5]; rects[0] = SectionClientArea (this.visualReportHeader); rects[1] = SectionClientArea (this.visualPageHeader); diff --git a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs index d1d08024cf..6bebbc4064 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportAddin/SharpReportView.cs @@ -192,6 +192,7 @@ namespace SharpReportAddin{ ctrl.Dock = DockStyle.Fill; ctrl.ReportControl.ObjectSelected += new SelectedEventHandler (OnObjectSelected); + ctrl.ReportControl.DesignViewChanged += new ItemDragDropEventHandler (OnItemDragDrop); ctrl.DesignerDirty += new System.ComponentModel.PropertyChangedEventHandler (OnPropertyChanged); return ctrl; diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseSettings.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseSettings.cs index cbf59f3ab4..b6f28b06ab 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/BaseSettings.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/BaseSettings.cs @@ -60,7 +60,7 @@ namespace SharpReportCore { public BaseSettings(PageSettings pageSettings , string reportName,string fileName){ if (pageSettings == null) { - throw new ArgumentException("BaseSettings:PageSettings"); + throw new ArgumentNullException("pageSettings"); } if (String.IsNullOrEmpty(reportName)) { diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/BaseItemFactory.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/BaseItemFactory.cs index 8cd1c12d2e..0dfe4661e5 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/BaseItemFactory.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/BaseItemFactory.cs @@ -32,6 +32,9 @@ namespace SharpReportCore { typeof(BaseReportItem)){ } public new BaseReportItem Create (string name){ + if (String.IsNullOrEmpty(name)) { + throw new ArgumentNullException("name"); + } if (name.LastIndexOf('.') > 0) { StringBuilder b = new StringBuilder (name); b.Remove (0,name.LastIndexOf('.') +1); diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/GenericFactory.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/GenericFactory.cs index dbc083a0c6..947b3a1055 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/GenericFactory.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Factories/GenericFactory.cs @@ -41,7 +41,12 @@ namespace SharpReportCore { } public GenericFactory(Assembly ass, Type assignableType, string nameSpace){ - Type at = typeof(object); + if (ass == null) { + throw new ArgumentNullException("ass"); + } + if (assignableType == null) { + throw new ArgumentNullException("assignableType"); + } foreach (Type t in ass.GetTypes()) { if (t.IsAbstract) diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs index 9b886ca31f..53a09e2697 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderDataReport.cs @@ -47,7 +47,7 @@ namespace SharpReportCore { } public RenderDataReport(ReportModel model,DataManager dataManager):base (model){ - System.Console.WriteLine("RenderDataReport".ToUpper()); +// System.Console.WriteLine("RenderDataReport".ToUpper()); this.dataManager = dataManager; } @@ -171,7 +171,8 @@ namespace SharpReportCore { protected override void PrintPageEnd(object sender, ReportPageEventArgs e) { - base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageFooter); + base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageFooter, + CultureInfo.InvariantCulture); base.PrintPageEnd (sender,e); base.DetailEnds = new Point (0,base.CurrentSection.SectionOffset); } diff --git a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs index e7073cde4f..8101295157 100644 --- a/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs +++ b/src/AddIns/Misc/SharpReport/SharpReportCore/Printing/RenderFormSheetReport.cs @@ -22,13 +22,13 @@ using System; using System.Data; using System.Drawing; +using System.Globalization; using System.Drawing.Printing; using System.Windows.Forms; using System.Xml; using SharpReportCore; -// using SharpReport.Printing; -//using SharpReport.ReportItems; + /// /// Runs the Report /// @@ -41,17 +41,15 @@ namespace SharpReportCore { public class RenderFormSheetReport : AbstractRenderer { private PointF currentPoint = new PointF (0,0); - private PointF pageFooterStart = new PointF (0,0); - - + public RenderFormSheetReport (ReportModel model):base( model){ } #region event's - protected override void ReportQueryPage (object sender,QueryPageSettingsEventArgs qpe) { - base.ReportQueryPage (sender,qpe); + protected override void ReportQueryPage (object sender,QueryPageSettingsEventArgs e) { + base.ReportQueryPage (sender,e); } @@ -90,7 +88,8 @@ namespace SharpReportCore { protected override void PrintBodyStart (object sender,ReportPageEventArgs e) { base.PrintBodyStart (sender,e); - base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail); + base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportDetail, + CultureInfo.InvariantCulture); BaseSection section = base.CurrentSection; section.SectionOffset = (int)this.currentPoint.Y + base.Gap; @@ -114,7 +113,8 @@ namespace SharpReportCore { protected override void PrintPageEnd (object sender,ReportPageEventArgs e) { //PageFooter - base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageFooter); + base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportPageFooter, + CultureInfo.InvariantCulture); base.PrintPageEnd (sender,e); @@ -126,7 +126,8 @@ namespace SharpReportCore { int off = base.CurrentSection.SectionOffset + base.CurrentSection.Size.Height + base.Gap; //ReportFooter - base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportFooter); + base.SectionInUse = Convert.ToInt16(GlobalEnums.enmSection.ReportFooter, + CultureInfo.InvariantCulture); BaseSection section = base.CurrentSection; section.SectionOffset = off;