diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs index ec947b3737..88471d1ca0 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs @@ -19,6 +19,7 @@ using System; using System.ComponentModel; using System.ComponentModel.Design.Serialization; +using System.Globalization; using System.IO; using System.Windows.Forms; @@ -72,9 +73,9 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding { string message; if (generator.ViewContent.PrimaryFile.IsDirty) { - message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); + message = String.Format(CultureInfo.CurrentCulture,"Create Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName)); } else { - message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName)); + message = String.Format(CultureInfo.CurrentCulture,"Load Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName)); } SD.StatusBar.SetMessage(message); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs index 7756fe69e4..7243c96c6a 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs @@ -22,7 +22,6 @@ namespace ICSharpCode.Reporting.Addin.Factory class CreateFormSheetFromModel { - public StringWriter ToXml(IReportModel reportModel) { int locY = reportModel.ReportSettings.TopMargin; @@ -39,7 +38,7 @@ namespace ICSharpCode.Reporting.Addin.Factory return xml; } - StringWriter ToXmlInternal(IReportModel model) + static StringWriter ToXmlInternal(IReportModel model) { var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8); var xml = XmlHelper.CreatePropperWriter(writer); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs index 35347f533b..d83aa841ef 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs @@ -64,7 +64,7 @@ namespace ICSharpCode.Reporting.Addin.Services { ShowHelpFromKeyword(generalKeyword); } - public void ShowHelp() + static public void ShowHelp() { // HelpProvider.ShowHelp(f1Keyword); } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs index ed2cf5dc54..f8313da331 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs @@ -188,7 +188,7 @@ namespace ICSharpCode.Reporting.Addin.Services // needed for Toolbox drag & drop if (serializedObject is System.Windows.Forms.IDataObject) { if (((System.Windows.Forms.IDataObject)serializedObject).GetDataPresent(typeof(ToolboxItem))) { - ToolboxItem item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem)); + var item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem)); // if (host != null) { // ArrayList list = (ArrayList)toolboxByHost[host]; // if (list != null && list.Contains(item)) { diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs index c9f0e1c603..ef250c1da7 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs @@ -85,12 +85,12 @@ namespace ICSharpCode.Reporting.Exporter.Visitors protected Collection Pages {get; private set;} - protected bool IsContainer (IExportColumn column) { + static protected bool IsContainer (IExportColumn column) { return (column is ExportContainer)|| (column is GraphicsContainer); } - protected bool IsGraphicsContainer (IExportColumn column) { + static protected bool IsGraphicsContainer (IExportColumn column) { return column is GraphicsContainer; } } diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs index 3f41d86d62..6d1c637aed 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs @@ -34,21 +34,16 @@ namespace ICSharpCode.Reporting.Expressions // http://blog.miraclespain.com/archive/2009/Oct-07.html // readonly Collection pages; - readonly ReportSettings reportSettings; readonly CollectionDataSource dataSource; - public ExpressionRunner(Collection pages,ReportSettings reportSettings,CollectionDataSource dataSource) - { + public ExpressionRunner(Collection pages,ReportSettings reportSettings,CollectionDataSource dataSource){ this.pages = pages; this.dataSource = dataSource; - this.reportSettings = reportSettings; Visitor = new ExpressionVisitor(reportSettings); } - public void Run() - { -// Visitor = new ExpressionVisitor (reportSettings); + public void Run(){ if (dataSource != null) { if (dataSource.SortedList != null) { Visitor.SetCurrentDataSource(dataSource.SortedList); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs index 644ffab2aa..5e0431f766 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs @@ -18,6 +18,7 @@ using System; using System.Data; +using System.Globalization; namespace ICSharpCode.Reporting.Globals { @@ -28,8 +29,7 @@ namespace ICSharpCode.Reporting.Globals { public static DbType DbTypeFromStringRepresenation(string type) { - switch (type.ToLower()) - { + switch (type.ToLower(CultureInfo.CurrentCulture)){ case "int": return DbType.Int16; case "int16": diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs index 73ae9df3d6..1ee1b452f5 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs @@ -40,9 +40,8 @@ namespace ICSharpCode.Reporting.Pdf public void Run (string fileName,bool show) { - string file; if (String.IsNullOrEmpty(fileName)) { - file = Pages[0].PageInfo.ReportName + ".pdf"; + fileName = Pages[0].PageInfo.ReportName + ".pdf"; } pdfDocument = new PdfDocument(); ConvertPagesToPdf(); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs index 9d72438667..24f591ceb0 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs @@ -53,7 +53,7 @@ namespace ICSharpCode.Reporting } - public IReportCreator ReportCreator (ReportModel reportModel) { + public IReportCreator ReportCreator (IReportModel reportModel) { ReportModel = reportModel; var builder = new FormPageBuilder(ReportModel); return builder; diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs index fda2a0ee08..5d5c2935ff 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs @@ -183,7 +183,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor } - DrawingElement CircleVisual(GraphicsContainer circle){ + static DrawingElement CircleVisual(GraphicsContainer circle){ var pen = FixedDocumentCreator.CreateWpfPen(circle); var rad = CalcRadius(circle.Size); @@ -199,7 +199,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor } - Border CreateBorder(IExportColumn exportColumn) + static Border CreateBorder(IExportColumn exportColumn) { var border = new Border(); border.BorderThickness = Thickness(exportColumn); @@ -211,7 +211,7 @@ namespace ICSharpCode.Reporting.WpfReportViewer.Visitor } - Thickness Thickness(IExportColumn exportColumn) + static Thickness Thickness(IExportColumn exportColumn) { double bT; bT = !IsGraphicsContainer(exportColumn) ? 1 : Convert.ToDouble(((GraphicsContainer)exportColumn).Thickness); diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs index b19606a5a8..5a3e5946ee 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs @@ -196,7 +196,7 @@ namespace ICSharpCode.Reporting.Xml } } - void ProcessAttributes(XmlNode node, object ret, Type type) + static void ProcessAttributes(XmlNode node, object ret, Type type) { // process attributes foreach(XmlAttribute attr in node.Attributes)