Cleanup - FxCop

PeterForstmeier · PeterForstmeier · commit 8247fde3313f · 2014-06-26T20:09:32.000+02:00
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportRootDesigner.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Designer/ReportRootDesigner.cs
@@ -24,6 +24,7 @@
 using System.Drawing;
 using System.Drawing.Design;
 using System.Drawing.Printing;
+using System.Globalization;
 using System.Windows.Forms;
 using System.Windows.Forms.Design;
 using ICSharpCode.Core;
@@ -217,7 +218,6 @@ void OnComponentAdded(object sender, ComponentEventArgs ce)
 			if (section != null) {
 				sections.Add(section);
 				section.SizeChanged += new EventHandler( OnSectionSizeChanged);
-				Console.Write("reportRootDesigner:OnComponentAdded");
 				foreach (Control ctrl in section.Controls) {
 					AddToHost(ctrl);
 					host.Container.Add(ctrl);
@@ -240,7 +240,7 @@ void AddToHost (Control ctrl)
 		private void OnComponentChanged(object sender, ComponentChangedEventArgs ce)
 		{
 			LoggingService.InfoFormatted("RootDesigner:OnComponentChanged");
-			String str = String.Format("RootDesigner:OnComponentChanged <{0}> from <{1}> to <{2}>",ce.Component.ToString(),ce.OldValue,ce.NewValue);
+			var str = String.Format(CultureInfo.CurrentCulture,"RootDesigner:OnComponentChanged <{0}> from <{1}> to <{2}>",ce.Component.ToString(),ce.OldValue,ce.NewValue);
 			LoggingService.InfoFormatted(str);
 
 			var section = ce.Component as BaseSection;
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/StringWriterWithEncoding.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Globals/StringWriterWithEncoding.cs
@@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.Addin.Globals
 	/// </summary>
 	class StringWriterWithEncoding:System.IO.StringWriter
 	{
-		private readonly Encoding encoding;
+		readonly Encoding encoding;
 		
 		public StringWriterWithEncoding(Encoding encoding)
 		{
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/AbstractItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/AbstractItemTypeProvider.cs
@@ -22,26 +22,20 @@ public AbstractItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abst
 		{
 		}
 		
-//		public AbstractItemTypeProvider(TypeDescriptionProvider parent): base(parent)
-//		{
-//		}
-
 		
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType, instance);
-			return new AbstractItemTypeDescriptor(td, instance);
+			return new AbstractItemTypeDescriptor(td);
 		}
 	}
 	
-	internal class AbstractItemTypeDescriptor : CustomTypeDescriptor
+	class AbstractItemTypeDescriptor : CustomTypeDescriptor
 	{
-//		private AbstractItem _instance;
 		
-		public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
-//			_instance = instance as AbstractItem;
 		}
 
 		
@@ -54,8 +48,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			foreach (PropertyDescriptor p in props)
 			{
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/CircleItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/CircleItemTypeProvider.cs
@@ -26,15 +26,15 @@ public CircleItemTypeProvider():  base(TypeDescriptor.GetProvider(typeof(Abstrac
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new CircleItemTypeDescriptor(td, instance);
+			return new CircleItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class CircleItemTypeDescriptor : CustomTypeDescriptor
 	{
 	
-		public CircleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance): base(parent)
+		public CircleItemTypeDescriptor(ICustomTypeDescriptor parent): base(parent)
 		{
 		}
 
@@ -48,7 +48,7 @@ public override PropertyDescriptorCollection GetProperties()
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
 			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddGraphicProperties(allProperties,props);
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/DataItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/DataItemTypeProvider.cs
@@ -27,7 +27,7 @@ public DataItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abstract
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new DataItemTypeDescriptor(td, instance);
+			return new DataItemTypeDescriptor(td);
 		}
 	}
 	
@@ -36,7 +36,7 @@ public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object
 	class DataItemTypeDescriptor : CustomTypeDescriptor
 	{
 		
-		public DataItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public DataItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -50,8 +50,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 		
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddTextBasedProperties(allProperties,props);
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/GroupedRowTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/GroupedRowTypeProvider.cs
@@ -26,14 +26,14 @@ public GroupedRowTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abstra
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new GroupedRowItemTypeDescriptor(td, instance);
+			return new GroupedRowItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class GroupedRowItemTypeDescriptor : CustomTypeDescriptor
 	{
-		public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -69,16 +69,9 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);
 		
-//			prop = props.Find("AlternateBackColor",true);
-//			allProperties.Add(prop);
-//			
-//			prop = props.Find("ChangeBackColorEveryNRow",true);
-//			allProperties.Add(prop);
-			
 			prop = props.Find("PageBreakOnGroupChange",true);
 			allProperties.Add(prop);
 			
-			
 			return new PropertyDescriptorCollection(allProperties.ToArray());
 		}
 	}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/LineItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/LineItemTypeProvider.cs
@@ -25,7 +25,7 @@ public LineItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abstract
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new LineItemTypeDescriptor(td, instance);
+			return new LineItemTypeDescriptor(td);
 		}
 	}
 	
@@ -35,7 +35,7 @@ class LineItemTypeDescriptor : CustomTypeDescriptor
 	{
 
 		
-		public LineItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public LineItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 
@@ -50,8 +50,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -71,9 +71,6 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute
 			prop = props.Find("EndLineCap",true);
 			allProperties.Add(prop);
 			
-//			prop = props.Find("DashLineCap",true);
-//			allProperties.Add(prop);
-			
 			prop = props.Find("DashStyle",true);
 			allProperties.Add(prop);
 			
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RectangleItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RectangleItemTypeProvider.cs
@@ -25,15 +25,15 @@ public RectangleItemTypeProvider():  base(TypeDescriptor.GetProvider(typeof(Abst
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new RectangleItemTypeDescriptor(td, instance);
+			return new RectangleItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class RectangleItemTypeDescriptor : CustomTypeDescriptor
 	{
 	
-		public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 			
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			TypeProviderHelper.AddGraphicProperties(allProperties,props);
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RowItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/RowItemTypeProvider.cs
@@ -26,14 +26,14 @@ public RowItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(AbstractI
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new RowItemTypeDescriptor(td, instance);
+			return new RowItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	internal class RowItemTypeDescriptor : CustomTypeDescriptor
 	{
-		public RowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public RowItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()
 		
 		public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)
 		{
-			PropertyDescriptorCollection props = base.GetProperties(attributes);
-			List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();
+			var props = base.GetProperties(attributes);
+			var allProperties = new List<PropertyDescriptor>();
 
 			TypeProviderHelper.AddDefaultProperties(allProperties,props);
 			
@@ -69,12 +69,6 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute
 			prop = props.Find("Controls",true);
 			allProperties.Add(prop);
 	
-//			prop = props.Find("AlternateBackColor",true);
-//			allProperties.Add(prop);
-//			
-//			prop = props.Find("ChangeBackColorEveryNRow",true);
-//			allProperties.Add(prop);
-			
 			return new PropertyDescriptorCollection(allProperties.ToArray());
 		}
 	}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/SectionItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/SectionItemTypeProvider.cs
@@ -26,7 +26,7 @@ public SectionItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abstr
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new SectionItemDescriptor(td, instance);
+			return new SectionItemDescriptor(td);
 		}
 	}
 	
@@ -35,7 +35,7 @@ class SectionItemDescriptor : CustomTypeDescriptor
 	{
 
 		
-		public SectionItemDescriptor(ICustomTypeDescriptor parent, object instance)
+		public SectionItemDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
 		}
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/TextItemTypeProvider.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/TypeProvider/TextItemTypeProvider.cs
@@ -26,19 +26,17 @@ public TextItemTypeProvider() :  base(TypeDescriptor.GetProvider(typeof(Abstract
 		public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)
 		{
 			ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);
-			return new TextItemTypeDescriptor(td, instance);
+			return new TextItemTypeDescriptor(td);
 		}
 	}
 	
 	
 	class TextItemTypeDescriptor : CustomTypeDescriptor
 	{
-//		BaseTextItem instance;
 		
-		public TextItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)
+		public TextItemTypeDescriptor(ICustomTypeDescriptor parent)
 			: base(parent)
 		{
-//			instance = instance as BaseTextItem;
 		}
 
 		
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Views/DesignerView.cs
@@ -212,7 +212,7 @@ void SelectionChangedHandler(object sender, EventArgs args)
 					abstractItem.Site.Name = abstractItem.Name;
 				}
 			}
-			UpdatePropertyPadSelection((ISelectionService)sender);
+			UpdatePropertyPadSelection(selectionService);
 		}
 		
 		#endregion
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/MycroWriter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/MycroWriter.cs
@@ -9,6 +9,7 @@
 using System;
 using System.Collections;
 using System.ComponentModel;
+using System.Globalization;
 using System.Reflection;
 using System.Xml;
 using System.Xml.Serialization;
@@ -53,7 +54,7 @@ public void Save(object obj, XmlWriter writer)
 				if (val is ICollection) {
 //					PropertyInfo pinfo = t.GetProperty(info.Name);
 //					Console.WriteLine("pinfo {0}",pinfo.Name);
-					if (info.Name.StartsWith("Contr")) {
+					if (info.Name.StartsWith("Contr",true,CultureInfo.CurrentCulture)) {
 						writer.WriteStartElement("Items");
 					} else {
 					writer.WriteStartElement(info.Name);
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDefinitionParser.cs
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDesignerWriter.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/XML/ReportDesignerWriter.cs
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/DataSource/ExtendedTypeDescriptor.cs
diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Xml/MycroParser.cs

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ namespace ICSharpCode.Reporting.Addin.Globals`
`16`	`16`	`/// </summary>`
`17`	`17`	`class StringWriterWithEncoding:System.IO.StringWriter`
`18`	`18`	`{`
`19`		`- private readonly Encoding encoding;`
	`19`	`+ readonly Encoding encoding;`
`20`	`20`
`21`	`21`	`public StringWriterWithEncoding(Encoding encoding)`
`22`	`22`	`{`
Original file line number	Diff line number	Diff line change
`@@ -22,26 +22,20 @@ public AbstractItemTypeProvider() : base(TypeDescriptor.GetProvider(typeof(Abst`
`22`	`22`	`{`
`23`	`23`	`}`
`24`	`24`
`25`		`-// public AbstractItemTypeProvider(TypeDescriptionProvider parent): base(parent)`
`26`		`-// {`
`27`		`-// }`
`28`		`-`
`29`	`25`
`30`	`26`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`31`	`27`	`{`
`32`	`28`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType, instance);`
`33`		`- return new AbstractItemTypeDescriptor(td, instance);`
	`29`	`+ return new AbstractItemTypeDescriptor(td);`
`34`	`30`	`}`
`35`	`31`	`}`
`36`	`32`
`37`		`- internal class AbstractItemTypeDescriptor : CustomTypeDescriptor`
	`33`	`+ class AbstractItemTypeDescriptor : CustomTypeDescriptor`
`38`	`34`	`{`
`39`		`-// private AbstractItem _instance;`
`40`	`35`
`41`		`- public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`36`	`+ public AbstractItemTypeDescriptor(ICustomTypeDescriptor parent)`
`42`	`37`	`: base(parent)`
`43`	`38`	`{`
`44`		`-// _instance = instance as AbstractItem;`
`45`	`39`	`}`
`46`	`40`
`47`	`41`
`@@ -54,8 +48,8 @@ public override PropertyDescriptorCollection GetProperties()`
`54`	`48`
`55`	`49`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`56`	`50`	`{`
`57`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`58`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`51`	`+ var props = base.GetProperties(attributes);`
	`52`	`+ var allProperties = new List<PropertyDescriptor>();`
`59`	`53`
`60`	`54`	`foreach (PropertyDescriptor p in props)`
`61`	`55`	`{`
Original file line number	Diff line number	Diff line change
`@@ -26,15 +26,15 @@ public CircleItemTypeProvider(): base(TypeDescriptor.GetProvider(typeof(Abstrac`
`26`	`26`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`27`	`27`	`{`
`28`	`28`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`29`		`- return new CircleItemTypeDescriptor(td, instance);`
	`29`	`+ return new CircleItemTypeDescriptor(td);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`	`34`	`class CircleItemTypeDescriptor : CustomTypeDescriptor`
`35`	`35`	`{`
`36`	`36`
`37`		`- public CircleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance): base(parent)`
	`37`	`+ public CircleItemTypeDescriptor(ICustomTypeDescriptor parent): base(parent)`
`38`	`38`	`{`
`39`	`39`	`}`
`40`	`40`
`@@ -48,7 +48,7 @@ public override PropertyDescriptorCollection GetProperties()`
`48`	`48`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`49`	`49`	`{`
`50`	`50`	`PropertyDescriptorCollection props = base.GetProperties(attributes);`
`51`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`51`	`+ var allProperties = new List<PropertyDescriptor>();`
`52`	`52`
`53`	`53`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`54`	`54`	`TypeProviderHelper.AddGraphicProperties(allProperties,props);`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public DataItemTypeProvider() : base(TypeDescriptor.GetProvider(typeof(Abstract`
`27`	`27`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`28`	`28`	`{`
`29`	`29`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`30`		`- return new DataItemTypeDescriptor(td, instance);`
	`30`	`+ return new DataItemTypeDescriptor(td);`
`31`	`31`	`}`
`32`	`32`	`}`
`33`	`33`
`@@ -36,7 +36,7 @@ public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object`
`36`	`36`	`class DataItemTypeDescriptor : CustomTypeDescriptor`
`37`	`37`	`{`
`38`	`38`
`39`		`- public DataItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`39`	`+ public DataItemTypeDescriptor(ICustomTypeDescriptor parent)`
`40`	`40`	`: base(parent)`
`41`	`41`	`{`
`42`	`42`	`}`
`@@ -50,8 +50,8 @@ public override PropertyDescriptorCollection GetProperties()`
`50`	`50`
`51`	`51`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`52`	`52`	`{`
`53`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`54`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`53`	`+ var props = base.GetProperties(attributes);`
	`54`	`+ var allProperties = new List<PropertyDescriptor>();`
`55`	`55`
`56`	`56`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`57`	`57`	`TypeProviderHelper.AddTextBasedProperties(allProperties,props);`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public GroupedRowTypeProvider() : base(TypeDescriptor.GetProvider(typeof(Abstra`
`26`	`26`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`27`	`27`	`{`
`28`	`28`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`29`		`- return new GroupedRowItemTypeDescriptor(td, instance);`
	`29`	`+ return new GroupedRowItemTypeDescriptor(td);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`	`34`	`class GroupedRowItemTypeDescriptor : CustomTypeDescriptor`
`35`	`35`	`{`
`36`		`- public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`36`	`+ public GroupedRowItemTypeDescriptor(ICustomTypeDescriptor parent)`
`37`	`37`	`: base(parent)`
`38`	`38`	`{`
`39`	`39`	`}`
`@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()`
`47`	`47`
`48`	`48`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`49`	`49`	`{`
`50`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`51`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`50`	`+ var props = base.GetProperties(attributes);`
	`51`	`+ var allProperties = new List<PropertyDescriptor>();`
`52`	`52`
`53`	`53`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`54`	`54`
`@@ -69,16 +69,9 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute`
`69`	`69`	`prop = props.Find("Controls",true);`
`70`	`70`	`allProperties.Add(prop);`
`71`	`71`
`72`		`-// prop = props.Find("AlternateBackColor",true);`
`73`		`-// allProperties.Add(prop);`
`74`		`-//`
`75`		`-// prop = props.Find("ChangeBackColorEveryNRow",true);`
`76`		`-// allProperties.Add(prop);`
`77`		`-`
`78`	`72`	`prop = props.Find("PageBreakOnGroupChange",true);`
`79`	`73`	`allProperties.Add(prop);`
`80`	`74`
`81`		`-`
`82`	`75`	`return new PropertyDescriptorCollection(allProperties.ToArray());`
`83`	`76`	`}`
`84`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ public LineItemTypeProvider() : base(TypeDescriptor.GetProvider(typeof(Abstract`
`25`	`25`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`26`	`26`	`{`
`27`	`27`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`28`		`- return new LineItemTypeDescriptor(td, instance);`
	`28`	`+ return new LineItemTypeDescriptor(td);`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`@@ -35,7 +35,7 @@ class LineItemTypeDescriptor : CustomTypeDescriptor`
`35`	`35`	`{`
`36`	`36`
`37`	`37`
`38`		`- public LineItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`38`	`+ public LineItemTypeDescriptor(ICustomTypeDescriptor parent)`
`39`	`39`	`: base(parent)`
`40`	`40`	`{`
`41`	`41`
`@@ -50,8 +50,8 @@ public override PropertyDescriptorCollection GetProperties()`
`50`	`50`
`51`	`51`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`52`	`52`	`{`
`53`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`54`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`53`	`+ var props = base.GetProperties(attributes);`
	`54`	`+ var allProperties = new List<PropertyDescriptor>();`
`55`	`55`
`56`	`56`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`57`	`57`
`@@ -71,9 +71,6 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute`
`71`	`71`	`prop = props.Find("EndLineCap",true);`
`72`	`72`	`allProperties.Add(prop);`
`73`	`73`
`74`		`-// prop = props.Find("DashLineCap",true);`
`75`		`-// allProperties.Add(prop);`
`76`		`-`
`77`	`74`	`prop = props.Find("DashStyle",true);`
`78`	`75`	`allProperties.Add(prop);`
`79`	`76`
Original file line number	Diff line number	Diff line change
`@@ -25,15 +25,15 @@ public RectangleItemTypeProvider(): base(TypeDescriptor.GetProvider(typeof(Abst`
`25`	`25`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`26`	`26`	`{`
`27`	`27`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`28`		`- return new RectangleItemTypeDescriptor(td, instance);`
	`28`	`+ return new RectangleItemTypeDescriptor(td);`
`29`	`29`	`}`
`30`	`30`	`}`
`31`	`31`
`32`	`32`
`33`	`33`	`class RectangleItemTypeDescriptor : CustomTypeDescriptor`
`34`	`34`	`{`
`35`	`35`
`36`		`- public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`36`	`+ public RectangleItemTypeDescriptor(ICustomTypeDescriptor parent)`
`37`	`37`	`: base(parent)`
`38`	`38`	`{`
`39`	`39`	`}`
`@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()`
`47`	`47`
`48`	`48`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`49`	`49`	`{`
`50`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`51`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`50`	`+ var props = base.GetProperties(attributes);`
	`51`	`+ var allProperties = new List<PropertyDescriptor>();`
`52`	`52`
`53`	`53`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`54`	`54`	`TypeProviderHelper.AddGraphicProperties(allProperties,props);`
Original file line number	Diff line number	Diff line change
`@@ -26,14 +26,14 @@ public RowItemTypeProvider() : base(TypeDescriptor.GetProvider(typeof(AbstractI`
`26`	`26`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`27`	`27`	`{`
`28`	`28`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`29`		`- return new RowItemTypeDescriptor(td, instance);`
	`29`	`+ return new RowItemTypeDescriptor(td);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`	`33`
`34`	`34`	`internal class RowItemTypeDescriptor : CustomTypeDescriptor`
`35`	`35`	`{`
`36`		`- public RowItemTypeDescriptor(ICustomTypeDescriptor parent, object instance)`
	`36`	`+ public RowItemTypeDescriptor(ICustomTypeDescriptor parent)`
`37`	`37`	`: base(parent)`
`38`	`38`	`{`
`39`	`39`	`}`
`@@ -47,8 +47,8 @@ public override PropertyDescriptorCollection GetProperties()`
`47`	`47`
`48`	`48`	`public override PropertyDescriptorCollection GetProperties(Attribute[] attributes)`
`49`	`49`	`{`
`50`		`- PropertyDescriptorCollection props = base.GetProperties(attributes);`
`51`		`- List<PropertyDescriptor> allProperties = new List<PropertyDescriptor>();`
	`50`	`+ var props = base.GetProperties(attributes);`
	`51`	`+ var allProperties = new List<PropertyDescriptor>();`
`52`	`52`
`53`	`53`	`TypeProviderHelper.AddDefaultProperties(allProperties,props);`
`54`	`54`
`@@ -69,12 +69,6 @@ public override PropertyDescriptorCollection GetProperties(Attribute[] attribute`
`69`	`69`	`prop = props.Find("Controls",true);`
`70`	`70`	`allProperties.Add(prop);`
`71`	`71`
`72`		`-// prop = props.Find("AlternateBackColor",true);`
`73`		`-// allProperties.Add(prop);`
`74`		`-//`
`75`		`-// prop = props.Find("ChangeBackColorEveryNRow",true);`
`76`		`-// allProperties.Add(prop);`
`77`		`-`
`78`	`72`	`return new PropertyDescriptorCollection(allProperties.ToArray());`
`79`	`73`	`}`
`80`	`74`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@ public SectionItemTypeProvider() : base(TypeDescriptor.GetProvider(typeof(Abstr`
`26`	`26`	`public override ICustomTypeDescriptor GetTypeDescriptor(Type objectType, object instance)`
`27`	`27`	`{`
`28`	`28`	`ICustomTypeDescriptor td = base.GetTypeDescriptor(objectType,instance);`
`29`		`- return new SectionItemDescriptor(td, instance);`
	`29`	`+ return new SectionItemDescriptor(td);`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`@@ -35,7 +35,7 @@ class SectionItemDescriptor : CustomTypeDescriptor`
`35`	`35`	`{`
`36`	`36`
`37`	`37`
`38`		`- public SectionItemDescriptor(ICustomTypeDescriptor parent, object instance)`
	`38`	`+ public SectionItemDescriptor(ICustomTypeDescriptor parent)`
`39`	`39`	`: base(parent)`
`40`	`40`	`{`
`41`	`41`	`}`