Update Sample, small changes from FxCop

samples/SharpDevelopReports/src/SharpReportSamples/MainForm.cs

@@ -151,6 +151,33 @@ namespace SharpReportSamples
 		}
 		
 		
+		#endregion
+		
+		
+		#region StoredProcedure
+		
+		void StoredProcedureWithParam(string fileName)
+		{
+			var model = ReportEngine.LoadReportModel(fileName);
+			ReportParameters parameters =  ReportEngine.LoadParameters(fileName);
+			
+			// The report has no sorting, so we can add it by code
+			
+			parameters.SortColumnCollection.Add (new SortColumn("ShippedDate",
+			                                                    System.ComponentModel.ListSortDirection.Ascending));
+			
+			
+			parameters.SqlParameters[0].ParameterValue = new System.DateTime(1997,11,01).ToString();
+			parameters.SqlParameters[1].ParameterValue = new System.DateTime(1997,12,31).ToString();
+
+			this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
+			{
+				this.previewControl1.RunReport(fileName,parameters);
+			};
+			this.previewControl1.RunReport(fileName,parameters);
+		}
+		
+		
 		#endregion
 		
 		#region Contributors
@@ -310,22 +337,6 @@ namespace SharpReportSamples
 		}
 		
 		
-		void StoredProcedureWithParam(string fileName)
-		{
-			var model = ReportEngine.LoadReportModel(fileName);
-			ReportParameters parameters =  ReportEngine.LoadParameters(fileName);
-			
-			parameters.SqlParameters[0].ParameterValue = new System.DateTime(1997,11,01).ToString();
-			parameters.SqlParameters[1].ParameterValue = new System.DateTime(1997,12,31).ToString();
-
-			this.previewControl1.PreviewLayoutChanged += delegate (object sender, EventArgs e)
-			{
-				this.previewControl1.RunReport(fileName,parameters);
-			};
-			this.previewControl1.RunReport(fileName,parameters);
-		}
-		
-		
 		//Handles  SectionRenderEvent
 //		int hour = 0;
 		
@@ -423,8 +434,6 @@ namespace SharpReportSamples
 		
 		#endregion
 		
-
-		
 		void TreeView1MouseDoubleClick(object sender, MouseEventArgs e)
 		{
 			TreeNode selectedNode = this.treeView1.SelectedNode;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/StandardFormatter.cs

@@ -115,7 +115,8 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 					str = dec.ToString (format,CultureInfo.CurrentCulture);
 					
 				} catch (System.FormatException e) {
-						string s = String.Format(CultureInfo.InvariantCulture,"\tDecimalValue < {0} > {1}",toFormat,e.Message);
+//						string s = String.Format(CultureInfo.InvariantCulture,"\tDecimalValue < {0} > {1}",toFormat,e.Message);
+				
 				}
 				return str;
 			} else {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/Graphics/BaseImageItem.cs

@@ -68,7 +68,7 @@ namespace ICSharpCode.Reports.Core {
 			try {
 				Image im;
 				string absFileName = this.AbsoluteFileName;
-				System.Diagnostics.Trace.WriteLine(String.Format("<CORE.LoadImage > {0}",absFileName));
+//				System.Diagnostics.Trace.WriteLine(String.Format("<CORE.LoadImage > {0}",absFileName));
 				if (!String.IsNullOrEmpty(absFileName) && File.Exists(absFileName)) {
 					im = Image.FromFile (this.AbsoluteFileName);
 				} else {
@@ -172,7 +172,7 @@ namespace ICSharpCode.Reports.Core {
 			set {
 				imageFileName = value;
 				this.imageSource = GlobalEnums.ImageSource.File;
-				System.Diagnostics.Trace.WriteLine(String.Format("<CORE.BaseImage> ImageFilename {0}",Path.GetFullPath(this.imageFileName)));
+//				System.Diagnostics.Trace.WriteLine(String.Format("<CORE.BaseImage> ImageFilename {0}",Path.GetFullPath(this.imageFileName)));
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

@@ -159,92 +159,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 				if (currentBottom.Y > Offset.Y) {
 					Offset = new Point (Offset.X,currentBottom.Y);
 				}
-//				Offset = new Point (Offset.X,Offset.Y + gapCalculator.LastGap);
-			}
-			SectionBounds.Offset = Offset;
-			return convertedSection;
-		}
-		
-
-		protected ExporterCollection old_ConvertSection (BaseSection section,int dataRow)
-		{
-			Point currentBottom = Point.Empty;
-			FireSectionRenderEvent (section ,dataRow);
-			PrintHelper.AdjustParent(section,section.Items);
-			PrintHelper.AdjustSectionLocation(section);
-			
-			var convertedSection = new ExporterCollection();
-			Offset = SectionBounds.Offset;
-			Point startOffset = Offset;
-			
-			if (section.Items.Count > 0)
-			{
-				Size sectionSize = section.Size;
-				IExpressionEvaluatorFacade evaluator = EvaluationHelper.CreateEvaluator(this.SinglePage,this.SinglePage.IDataNavigator);
-
-				Rectangle desiredRectangle = LayoutHelper.CalculateSectionLayout(this.Graphics,section);
-				LayoutHelper.FixSectionLayout(desiredRectangle,section);
-				section.Items.SortByLocation();
-				GapList gapCalculator = new GapList();
-				gapCalculator.CalculateGapList(section);
-				int i = 0;
-				
-				foreach (BaseReportItem item in section.Items)
-				{
-					ISimpleContainer simpleContainer = item as ISimpleContainer;
-					
-					if (simpleContainer != null)
-					{
-						Offset = new Point(Offset.X,Offset.Y + gapCalculator.GapBetweenItems[i] );
-						var containerSize = simpleContainer.Size;
-						
-						EvaluationHelper.EvaluateReportItems(evaluator,simpleContainer.Items);
-						
-						var layouter = (ILayouter)ServiceContainer.GetService(typeof(ILayouter));
-						LayoutHelper.SetLayoutForRow(Graphics,layouter, simpleContainer);
-						/*
-						 * */
-
-						
-						/*
-				section.Items.ForEach(delegate(BaseReportItem aitem)
-				                      {
-//				                      	Console.WriteLine(item.Location);
-				                      });
-				var h = section.Items.FindHighestElement();
-						 */
-						section.MeasureOverride(section.Size);
-						/** */
-						Offset = BaseConverter.ConvertContainer(convertedSection,simpleContainer,Offset.X,Offset);
-						simpleContainer.Size = containerSize;
-					}
-					else
-					{
-						var converteditem = ExportHelper.ConvertLineItem(item,Offset);
-						if (converteditem != null) {
-						if (converteditem.StyleDecorator.DisplayRectangle.Bottom > currentBottom.Y) {
-							currentBottom = new Point(converteditem.StyleDecorator.Location.X,converteditem.StyleDecorator.DisplayRectangle.Bottom);
-						}
-						
-						convertedSection.Add((BaseExportColumn)converteditem );
-							
-						}
-//						if (converteditem.StyleDecorator.DisplayRectangle.Bottom > currentBottom.Y) {
-//							currentBottom = new Point(converteditem.StyleDecorator.Location.X,converteditem.StyleDecorator.DisplayRectangle.Bottom);
-//						}
-//						
-//						convertedSection.Add((BaseExportColumn)converteditem );
-						
-					}
-					i ++;
-				}
-				Offset = new Point (Offset.X,Offset.Y + gapCalculator.LastGap);
-//				Offset = new Point (Offset.X,Offset.Y + 5);
-				
-				if (currentBottom.Y > Offset.Y) {
-					Offset = new Point (Offset.X,currentBottom.Y);
-				}
-//				Offset = new Point (Offset.X,Offset.Y + gapCalculator.LastGap);
 			}
 			SectionBounds.Offset = Offset;
 			return convertedSection;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/EvaluationHelper.cs

@@ -7,6 +7,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
+using System.Globalization;
 using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.Exporter;
 using ICSharpCode.Reports.Core.Globals;
@@ -83,13 +84,13 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		
 		public static string ExtractExpressionPart (string src)
 		{
-			char v = Convert.ToChar("=");
+			char v = Convert.ToChar("=",CultureInfo.CurrentCulture );
 			return StringHelpers.RightOf(src,v).Trim();
 		}
 		
 		public static string ExtractResultPart (string src)
 		{
-			char v = Convert.ToChar("=");
+			char v = Convert.ToChar("=",CultureInfo.CurrentCulture );
 			return StringHelpers.LeftOf(src,v).Trim();
 		}
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/Substring.cs

@@ -7,6 +7,7 @@
  * To change this template use Tools | Options | Coding | Edit Standard Headers.
  */
 using System;
+using System.Globalization;
 
 namespace SimpleExpressionEvaluator.Compilation.Functions
 {
@@ -23,7 +24,7 @@ namespace SimpleExpressionEvaluator.Compilation.Functions
 			  }
 			   string str = args[0].ToString();
 			   if (args.Length == 2) {
-			   	 var start = Convert.ToInt32(args[1]);
+			   	 var start = Convert.ToInt32(args[1],CultureInfo.CurrentCulture);
 			   return str.Substring(start);
 			   }
 			   else if (args.Length == 3) {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ToString.cs

@@ -28,7 +28,7 @@ $Log: /CoreServices/Hsi/ExpressionEvaluator/Parser/Functions/ToString.cs $
 #endregion
 
 using System;
-
+using System.Globalization;
 
 namespace SimpleExpressionEvaluator.Compilation.Functions
 {
@@ -51,7 +51,7 @@ namespace SimpleExpressionEvaluator.Compilation.Functions
                 Array.Copy(args, 1, newArgs, 0, nTarget);
                 try
                 {
-                    return String.Format(strFormat, newArgs);
+                    return String.Format(CultureInfo.CurrentCulture, strFormat, newArgs);
                 }
                 catch (Exception ex)
                 {

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/Graphics/Border.cs

@@ -39,7 +39,7 @@ namespace ICSharpCode.Reports.Core {
 				throw new ArgumentNullException("graphics");
 			}
 			using (Pen p = baseline.CreatePen(baseline.Thickness)) {
-				Rectangle r = System.Drawing.Rectangle.Inflate(rectangle,1,1);
+//				Rectangle r = System.Drawing.Rectangle.Inflate(rectangle,1,1);
 				graphics.DrawRectangle (p,rectangle);
 			}
 		}