From 5309c156273f5000ef1c31fc7c961a4a39779a8d Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Sun, 17 Jan 2010 19:04:54 +0000 Subject: [PATCH] Cleanup git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5411 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61 --- .../Project/Commands/ExplorerCommands.cs | 1 - .../Project/Commands/ViewCommands.cs | 10 +++++----- .../Project/BaseClasses/CurrentItem.cs | 3 ++- .../Project/BaseClasses/Printing/Layouter.cs | 6 +++--- .../Project/DataManager/DataManager.cs | 1 - .../Project/Globals/GlobalValues.cs | 12 ------------ .../Project/ReportSettings.cs | 16 ---------------- .../ReportSettings/ReportSettingsFixture.cs | 2 +- 8 files changed, 11 insertions(+), 40 deletions(-) diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs index a65337b84e..2094a9cfc7 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ExplorerCommands.cs @@ -69,7 +69,6 @@ namespace ICSharpCode.Reports.Addin.Commands foreach (BasicParameter bp in e.Collection as ParameterCollection){ r.ReportModel.ReportSettings.ParameterCollection.Add (bp); } - r.RefreshParameters(); } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs index de0a2f17aa..bafe18558d 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/Commands/ViewCommands.cs @@ -82,7 +82,7 @@ namespace ICSharpCode.Reports.Addin.Commands public class DataSetFromXsdCommand:AbstractCommand{ - System.Data.DataSet ds; + System.Data.DataSet dataSet; public override void Run() { using (OpenFileDialog openFileDialog = new OpenFileDialog()){ @@ -91,16 +91,16 @@ namespace ICSharpCode.Reports.Addin.Commands openFileDialog.AddExtension = true; if(openFileDialog.ShowDialog() == DialogResult.OK){ if (openFileDialog.FileName.Length > 0) { - this.ds = new System.Data.DataSet(); - this.ds.ReadXml (openFileDialog.FileName); - this.ds.Locale = CultureInfo.InvariantCulture; + this.dataSet = new System.Data.DataSet(); + this.dataSet.ReadXml (openFileDialog.FileName); + this.dataSet.Locale = CultureInfo.InvariantCulture; } } } } public System.Data.DataSet DataSet { - get { return ds; } + get { return dataSet; } } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs index 43fc4c8494..1f00fc491e 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/CurrentItem.cs @@ -14,6 +14,7 @@ namespace ICSharpCode.Reports.Core { public class CurrentItem : AbstractColumn { - public object Value; + + public object Value{get;set;} } } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs index 1d76ed14a8..93fccfb7be 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/Layouter.cs @@ -42,7 +42,7 @@ namespace ICSharpCode.Reports.Core FindLowestElement (container.Items); int extend = containerItem.Size.Height - canGrowShrinkCollection.First().Size.Height; // Rectangle surroundingRec = this.FindSurroundingRectangle_2(graphics,container.Items); - Rectangle surroundingRec = this.FindSurroundingRectangle(graphics,canGrowShrinkCollection); + Rectangle surroundingRec = FindSurroundingRectangle(graphics,canGrowShrinkCollection); if (surroundingRec.Height > desiredContainerRectangle.Height) { desiredContainerRectangle = new Rectangle(containerItem.Location.X, @@ -74,7 +74,7 @@ namespace ICSharpCode.Reports.Core if (canGrowShrinkCollection.Count() > 0) { int extend = section.Size.Height - canGrowShrinkCollection.First().Size.Height; - Rectangle surroundingRec = this.FindSurroundingRectangle(graphics,canGrowShrinkCollection); + Rectangle surroundingRec = FindSurroundingRectangle(graphics,canGrowShrinkCollection); if (surroundingRec.Height > desiredSectionRectangle .Height) { desiredSectionRectangle = new Rectangle(section.Location.X, section .Location.Y, @@ -109,7 +109,7 @@ namespace ICSharpCode.Reports.Core } - private Rectangle FindSurroundingRectangle (Graphics graphics,IEnumerable canGrowShrinkCollection) + private static Rectangle FindSurroundingRectangle (Graphics graphics,IEnumerable canGrowShrinkCollection) { int top = int.MaxValue; Rectangle rec = new Rectangle(canGrowShrinkCollection.First().Location.X, diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs index 243d37eb42..eb8366ee00 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/DataManager/DataManager.cs @@ -217,7 +217,6 @@ namespace ICSharpCode.Reports.Core { private void DataBind() { -// CheckReportColumns(); this.dataViewStrategy.Bind(); this.dataNavigator = new DataNavigator(this.dataViewStrategy); } diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs index 05d05ea0ff..bec193e34d 100644 --- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs +++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Globals/GlobalValues.cs @@ -142,18 +142,6 @@ namespace ICSharpCode.Reports.Core { } - /// - /// Size of Grids in Sections, used by the Designer - ///