Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit b2bdd81

Browse files
PeterForstmeierPeterForstmeier
committed
FxCop Cleanup
1 parent 5ede713 commit b2bdd81

11 files changed

Lines changed: 18 additions & 24 deletions

File tree

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/InternalReportLoader.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
using System;
2020
using System.ComponentModel;
2121
using System.ComponentModel.Design.Serialization;
22+
using System.Globalization;
2223
using System.IO;
2324
using System.Windows.Forms;
2425

@@ -72,9 +73,9 @@ void UpdateStatusbar ()
7273
{
7374
string message;
7475
if (generator.ViewContent.PrimaryFile.IsDirty) {
75-
message = String.Format("Create Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName));
76+
message = String.Format(CultureInfo.CurrentCulture,"Create Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName));
7677
} else {
77-
message = String.Format("Load Report <{0}> ...",Path.GetFileName(this.generator.ViewContent.PrimaryFile.FileName));
78+
message = String.Format(CultureInfo.CurrentCulture,"Load Report <{0}> ...",Path.GetFileName(generator.ViewContent.PrimaryFile.FileName));
7879
}
7980
SD.StatusBar.SetMessage(message);
8081
}

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ namespace ICSharpCode.Reporting.Addin.Factory
2222
class CreateFormSheetFromModel
2323
{
2424

25-
2625
public StringWriter ToXml(IReportModel reportModel) {
2726
int locY = reportModel.ReportSettings.TopMargin;
2827

@@ -39,7 +38,7 @@ public StringWriter ToXml(IReportModel reportModel) {
3938
return xml;
4039
}
4140

42-
StringWriter ToXmlInternal(IReportModel model)
41+
static StringWriter ToXmlInternal(IReportModel model)
4342
{
4443
var writer = new StringWriterWithEncoding(System.Text.Encoding.UTF8);
4544
var xml = XmlHelper.CreatePropperWriter(writer);

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/HelpService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public void ShowGeneralHelp()
6464
{
6565
ShowHelpFromKeyword(generalKeyword);
6666
}
67-
public void ShowHelp()
67+
static public void ShowHelp()
6868
{
6969
// HelpProvider.ShowHelp(f1Keyword);
7070
}

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Services/ToolboxService.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ public bool IsToolboxItem(object serializedObject, IDesignerHost host)
188188
// needed for Toolbox drag & drop
189189
if (serializedObject is System.Windows.Forms.IDataObject) {
190190
if (((System.Windows.Forms.IDataObject)serializedObject).GetDataPresent(typeof(ToolboxItem))) {
191-
ToolboxItem item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem));
191+
var item = (ToolboxItem) ((System.Windows.Forms.IDataObject)serializedObject).GetData(typeof(ToolboxItem));
192192
// if (host != null) {
193193
// ArrayList list = (ArrayList)toolboxByHost[host];
194194
// if (list != null && list.Contains(item)) {

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Exporter/Visitors/AbstractVisitor.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,12 +85,12 @@ protected static bool ShouldSetBackcolor (ExportColumn exportColumn) {
8585
protected Collection<ExportPage> Pages {get; private set;}
8686

8787

88-
protected bool IsContainer (IExportColumn column) {
88+
static protected bool IsContainer (IExportColumn column) {
8989
return (column is ExportContainer)|| (column is GraphicsContainer);
9090
}
9191

9292

93-
protected bool IsGraphicsContainer (IExportColumn column) {
93+
static protected bool IsGraphicsContainer (IExportColumn column) {
9494
return column is GraphicsContainer;
9595
}
9696
}

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/ExpressionRunner.cs‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,21 +34,16 @@ class ExpressionRunner
3434
// http://blog.miraclespain.com/archive/2009/Oct-07.html
3535
//
3636
readonly Collection<ExportPage> pages;
37-
readonly ReportSettings reportSettings;
3837
readonly CollectionDataSource dataSource;
3938

40-
public ExpressionRunner(Collection<ExportPage> pages,ReportSettings reportSettings,CollectionDataSource dataSource)
41-
{
39+
public ExpressionRunner(Collection<ExportPage> pages,ReportSettings reportSettings,CollectionDataSource dataSource){
4240
this.pages = pages;
4341
this.dataSource = dataSource;
44-
this.reportSettings = reportSettings;
4542
Visitor = new ExpressionVisitor(reportSettings);
4643
}
4744

4845

49-
public void Run()
50-
{
51-
// Visitor = new ExpressionVisitor (reportSettings);
46+
public void Run(){
5247
if (dataSource != null) {
5348
if (dataSource.SortedList != null) {
5449
Visitor.SetCurrentDataSource(dataSource.SortedList);

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Globals/TypeHelper.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
using System;
2020
using System.Data;
21+
using System.Globalization;
2122

2223
namespace ICSharpCode.Reporting.Globals
2324
{
@@ -28,8 +29,7 @@ class TypeHelper
2829
{
2930
public static DbType DbTypeFromStringRepresenation(string type)
3031
{
31-
switch (type.ToLower())
32-
{
32+
switch (type.ToLower(CultureInfo.CurrentCulture)){
3333
case "int":
3434
return DbType.Int16;
3535
case "int16":

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Pdf/PdfExporter.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@ public PdfExporter(Collection<ExportPage> pages):base(pages){
4040

4141

4242
public void Run (string fileName,bool show) {
43-
string file;
4443
if (String.IsNullOrEmpty(fileName)) {
45-
file = Pages[0].PageInfo.ReportName + ".pdf";
44+
fileName = Pages[0].PageInfo.ReportName + ".pdf";
4645
}
4746
pdfDocument = new PdfDocument();
4847
ConvertPagesToPdf();

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/ReportingFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public IReportCreator ReportCreator (Stream stream)
5353
}
5454

5555

56-
public IReportCreator ReportCreator (ReportModel reportModel) {
56+
public IReportCreator ReportCreator (IReportModel reportModel) {
5757
ReportModel = reportModel;
5858
var builder = new FormPageBuilder(ReportModel);
5959
return builder;

‎src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Wpf/Visitor/WpfVisitor.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -183,7 +183,7 @@ Canvas CreateItemsInContainer (List<IExportColumn> items) {
183183
}
184184

185185

186-
DrawingElement CircleVisual(GraphicsContainer circle){
186+
static DrawingElement CircleVisual(GraphicsContainer circle){
187187
var pen = FixedDocumentCreator.CreateWpfPen(circle);
188188
var rad = CalcRadius(circle.Size);
189189

@@ -199,7 +199,7 @@ DrawingElement CircleVisual(GraphicsContainer circle){
199199
}
200200

201201

202-
Border CreateBorder(IExportColumn exportColumn)
202+
static Border CreateBorder(IExportColumn exportColumn)
203203
{
204204
var border = new Border();
205205
border.BorderThickness = Thickness(exportColumn);
@@ -211,7 +211,7 @@ Border CreateBorder(IExportColumn exportColumn)
211211
}
212212

213213

214-
Thickness Thickness(IExportColumn exportColumn)
214+
static Thickness Thickness(IExportColumn exportColumn)
215215
{
216216
double bT;
217217
bT = !IsGraphicsContainer(exportColumn) ? 1 : Convert.ToDouble(((GraphicsContainer)exportColumn).Thickness);

0 commit comments

Comments
 (0)