Cleanup (FxCop)

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj

@@ -171,6 +171,7 @@
     <Compile Include="Project\Exceptions\WrongSectionException.cs" />
     <Compile Include="Project\Exporter\Converters\GroupedTableConverter.cs" />
     <Compile Include="Project\Exporter\ExportColumns\ExportGraphicContainer.cs" />
+    <Compile Include="Project\Exporter\ExportColumns\IBaseExportColumn.cs" />
     <Compile Include="Project\Exporter\ExportHelper.cs" />
     <Compile Include="Project\Exporter\ExportRenderer\ExportRunner.cs" />
     <Compile Include="Project\Exporter\ExportRenderer\FixedDocumentRenderer.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseDataItem.cs

@@ -35,16 +35,13 @@ namespace ICSharpCode.Reports.Core
 		#endregion
 
 		
-
 		#region IExportColumnBuilder  implementation
 
-		public new BaseExportColumn CreateExportColumn()
+		public new IBaseExportColumn CreateExportColumn()
 		{
-//			string toPrint = CheckForNullValue();
 			TextStyleDecorator st = base.CreateItemStyle();
-			ExportText item = new ExportText(st, false);
+			ExportText item = new ExportText(st);
 			item.Text = StandardFormatter.FormatOutput(DBValue, this.FormatString, base.DataType, this.NullValue);
-
 			return item;
 		}
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseRowItem.cs

@@ -29,11 +29,10 @@ namespace ICSharpCode.Reports.Core{
 		
 		#region IExportColumnBuilder  implementation
 		
-		public BaseExportColumn CreateExportColumn()
+		public IBaseExportColumn CreateExportColumn()
 		{
 			BaseStyleDecorator st = this.CreateItemStyle();
-			ExportContainer item = new ExportContainer(st);
+			return  new ExportContainer(st);
-			return item;
 		}
 
 		protected BaseStyleDecorator CreateItemStyle () 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTableItem.cs

@@ -29,7 +29,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region IExportColumnBuilder
 		
-		public ICSharpCode.Reports.Core.Exporter.BaseExportColumn CreateExportColumn()
+		public IBaseExportColumn CreateExportColumn()
 		{
 			BaseStyleDecorator st = this.CreateItemStyle();
 			ExportContainer item = new ExportContainer(st);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/BaseTextItem.cs

@@ -37,9 +37,9 @@ namespace ICSharpCode.Reports.Core
 		
 		#region IExportColumnBuilder  implementation
 		
-		public virtual BaseExportColumn CreateExportColumn(){
+		public virtual IBaseExportColumn CreateExportColumn(){
 			TextStyleDecorator st = this.CreateItemStyle();
-			ExportText item = new ExportText(st,false);
+			ExportText item = new ExportText(st);
 			item.Text = this.text;
 			item.Expression = this.Expression;
 			return item;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseItems/ErrorItem.cs

@@ -41,10 +41,10 @@ namespace ICSharpCode.Reports.Core
 		
 		#region IExportColumnBuilder  implementation
 		
-		public override BaseExportColumn CreateExportColumn(){
+		public override IBaseExportColumn CreateExportColumn(){
 			this.SetErrorLayout();
 			TextStyleDecorator st = base.CreateItemStyle();
-			ExportText item = new ExportText(st,false);
+			ExportText item = new ExportText(st);
 			item.Text = this.errMess;
 			return item;
 		}

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

@@ -30,9 +30,9 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region IExportColumnBuilder
 		
-		public BaseExportColumn CreateExportColumn(){
+		public IBaseExportColumn CreateExportColumn(){
 			IGraphicStyleDecorator style = base.CreateItemStyle(this.shape);
-			return new ExportGraphicContainer(style,true);
+			return new ExportGraphicContainer(style);
 		}
 	
 		

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

@@ -34,7 +34,7 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region IExportColumnBuilder  implementation
 		
-		public BaseExportColumn CreateExportColumn()
+		public IBaseExportColumn CreateExportColumn()
 		{
 			BaseStyleDecorator st = this.CreateItemStyle();
 			ExportImage item = new ExportImage(st);

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

@@ -20,11 +20,6 @@ namespace ICSharpCode.Reports.Core {
 	public class BaseLineItem : BaseGraphicItem,IExportColumnBuilder {
 		
 		private LineShape shape  = new LineShape();
-//		private Point fromPoint;
-//		private Point toPoint;
-//		private LineCap startLineCap;
-//		private LineCap endLineCap;
-//		private DashCap dashLineCap;
 		
 		#region Constructor
 		
@@ -36,10 +31,10 @@ namespace ICSharpCode.Reports.Core {
 		
 		#region IExportColumnBuilder  implementation
 		
-		public BaseExportColumn CreateExportColumn()
+		public IBaseExportColumn CreateExportColumn()
 		{
 			LineDecorator style = this.CreateLineShape();
-			ExportGraphic item = new ExportGraphic(style,false);
+			ExportGraphic item = new ExportGraphic(style);
 			return item as ExportGraphic;
 		}
 	
@@ -47,7 +42,6 @@ namespace ICSharpCode.Reports.Core {
 		private LineDecorator CreateLineShape ()
 		{
 			LineDecorator decorator = new LineDecorator(this.shape);
-//			decorator.Size = CalculateLineSize ();
 			decorator.Size = this.Size;
 			decorator.Location = this.Location;
 			decorator.BackColor = this.BackColor;

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

@@ -35,10 +35,10 @@ namespace ICSharpCode.Reports.Core
 		
 		#region IExportColumnBuilder
 		
-		public BaseExportColumn CreateExportColumn(){
+		public IBaseExportColumn CreateExportColumn(){
 			shape.CornerRadius = CornerRadius;
 			IGraphicStyleDecorator style = base.CreateItemStyle(this.shape);
-			return  new ExportGraphicContainer(style,true);
+			return  new ExportGraphicContainer(style);
 		}
 		
 		

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

@@ -132,7 +132,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 					else
 					{
 						var converteditem = ExportHelper.ConvertLineItem(item,Offset);
-						convertedSection.Add(converteditem );
+						convertedSection.Add((BaseExportColumn)converteditem );
 					}
 					i ++;
 				}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/GroupedRowConverter.cs

@@ -191,9 +191,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 			if (section.DrawBorder == true) {
 				BaseRectangleItem br = BasePager.CreateDebugItem (section);
-				BaseExportColumn bec = br.CreateExportColumn();
+				IBaseExportColumn bec = br.CreateExportColumn();
 				bec.StyleDecorator.Location = section.Location;
-				list.Insert(0,bec);
+				list.Insert(0,(BaseExportColumn)bec);
 			}
 		}
 	}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/BaseExportColumn.cs

@@ -3,6 +3,8 @@
 
 using System;
 using System.Drawing;
+using System.Globalization;
+
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using iTextSharp.text.pdf;
@@ -12,35 +14,32 @@ namespace ICSharpCode.Reports.Core.Exporter
 	/// <summary>
 	/// Description of BaseLineItem.
 	/// </summary>
-	public class BaseExportColumn
+	public class BaseExportColumn : IBaseExportColumn
 	{
-		
+
 		#region Constructors
-		
+
 		public BaseExportColumn()
 		{
-			this.StyleDecorator = new BaseStyleDecorator(System.Drawing.Color.White,
+			this.StyleDecorator = new BaseStyleDecorator(System.Drawing.Color.White, System.Drawing.Color.Black);
-			                                             System.Drawing.Color.Black);
 		}
-		
+
-		
+
-		public BaseExportColumn(IBaseStyleDecorator styleDecorator, bool isContainer)
+		public BaseExportColumn(IBaseStyleDecorator styleDecorator)
 		{
 			this.StyleDecorator = styleDecorator;
-			this.IsContainer = isContainer;
 		}
-		
+
 		#endregion
-		
+
 		#region draw item
-		
+
-		public virtual void DrawItem (Graphics graphics) 
+		public virtual void DrawItem(Graphics graphics)
 		{
 		}
-		
+
-		
+
-		public virtual void DrawItem (PdfWriter pdfWriter,
+		public virtual void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter)
-		                              ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter)
 		{
 			if (pdfWriter == null) {
 				throw new ArgumentNullException("pdfWriter");
@@ -52,50 +51,47 @@ namespace ICSharpCode.Reports.Core.Exporter
 			this.PdfUnitConverter = converter;
 		}
 		#endregion
-		
+
-		
+
 		#region Decorate
-		
+
 		/// <summary>
 		/// Fill the Background and draw a (Rectangle)Frame around the Control
 		/// </summary>
 		/// <param name="graphics"></param>
-		
+
-		protected virtual void Decorate (Graphics graphics)
+		protected virtual void Decorate(Graphics graphics)
 		{
 			if (graphics == null) {
 				throw new ArgumentNullException("graphics");
 			}
 			RectangleShape shape = new RectangleShape();
-			this.FillShape(graphics,shape);
+			this.FillShape(graphics, shape);
-			StandardPrinter.DrawBorder(graphics,this.StyleDecorator as BaseStyleDecorator);
+			StandardPrinter.DrawBorder(graphics, this.StyleDecorator as BaseStyleDecorator);
 		}
-		
+
-		
+
-		protected virtual void Decorate ()
+		protected virtual void Decorate()
 		{
 			RectangleShape shape = new RectangleShape();
-	
+
-			shape.DrawShape(this.PdfWriter.DirectContent,
+			shape.DrawShape(this.PdfWriter.DirectContent, null, this.StyleDecorator, ConvertToPdfRectangle());
-			            null,
-			            this.StyleDecorator,
-			            ConvertToPdfRectangle());        
 			this.DrawFrame();
-			
+
 		}
-		
+
 		#endregion
-		
+
-		
+
 		#region FillShape
-		
+
 		/// <summary>
 		/// Draw the Backround <see cref="BaseStyleDecorator"></see>
 		/// </summary>
 		/// <param name="graphics">a valid graphics object</param>
 		/// <param name="shape">the shape to fill</param>
 		/// 
-		protected virtual void FillShape (Graphics graphics,BaseShape shape)
+		protected virtual void FillShape(Graphics graphics, BaseShape shape)
 		{
 			if (graphics == null) {
 				throw new ArgumentNullException("graphics");
@@ -103,63 +99,49 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (shape == null) {
 				throw new ArgumentNullException("shape");
 			}
-			
+			shape.FillShape(graphics, new SolidFillPattern(this.StyleDecorator.BackColor), this.StyleDecorator.DisplayRectangle);
-			shape.FillShape(graphics,
-			                new SolidFillPattern(this.StyleDecorator.BackColor),
-			                this.StyleDecorator.DisplayRectangle);
-			
 		}
-		
+
 		#endregion
-		
+
-		
+
-		protected iTextSharp.text.Rectangle ConvertToPdfRectangle ()
+		protected iTextSharp.text.Rectangle ConvertToPdfRectangle()
 		{
 			ScreenRectToPdfRectConverter rectangleConverter = new ScreenRectToPdfRectConverter(this.PdfUnitConverter);
-			
+			iTextSharp.text.Rectangle r = (iTextSharp.text.Rectangle)rectangleConverter.
-			iTextSharp.text.Rectangle r = (iTextSharp.text.Rectangle)rectangleConverter.ConvertTo(null,System.Globalization.CultureInfo.InvariantCulture,
+				ConvertTo(null, CultureInfo.InvariantCulture, 
-			                                                                                      this.StyleDecorator.DisplayRectangle,
+				          this.StyleDecorator.DisplayRectangle, typeof(iTextSharp.text.Rectangle));
-			                                                                                      typeof(iTextSharp.text.Rectangle));
+
-		
+			iTextSharp.text.Rectangle rr = new iTextSharp.text.Rectangle(r.Left, r.Bottom - 2, r.Left + r.Width, r.Bottom + r.Height);
-			
-			iTextSharp.text.Rectangle rr = new iTextSharp.text.Rectangle(r.Left,r.Bottom -2,
-			                                                             r.Left + r.Width,r.Bottom  + r.Height);
-			
 			return rr;
 		}
-		
+
-		
+
 		#region DrawFrame
-		
+
-		
+
 		private Border CreateDefaultBorder()
 		{
-			return new Border(new BaseLine (this.StyleDecorator.FrameColor,
+			return new Border(new BaseLine(this.StyleDecorator.FrameColor, System.Drawing.Drawing2D.DashStyle.Solid, 1));
-			                                    System.Drawing.Drawing2D.DashStyle.Solid,1));
 		}
-		
+
-		
+
-		private  void DrawFrame ()
+		private void DrawFrame()
 		{
 			if (this.StyleDecorator.DrawBorder) {
 				Border b = this.CreateDefaultBorder();
-				b.DrawBorder(this.PdfWriter.DirectContent,
+				b.DrawBorder(this.PdfWriter.DirectContent, ConvertToPdfRectangle(), this.StyleDecorator);
-				             ConvertToPdfRectangle(),
-				             this.StyleDecorator);
 			}
 		}
 
-		
+
 		#endregion
-		
+
-
+		public virtual IBaseStyleDecorator StyleDecorator { get; set; }
-		public virtual IBaseStyleDecorator StyleDecorator {get;set;}
+
-		
+		protected ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter { get; set; }
-		public bool IsContainer {get; protected set;}
+
-			
+		protected PdfWriter PdfWriter { get; set; }
-		public ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter PdfUnitConverter {get;protected set;}
+
-		
-		public PdfWriter PdfWriter {get;protected set;}
-		
 	}
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportContainer.cs

@@ -16,13 +16,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		ExporterCollection items;
 
 		#region Constructor
-
+	
-		public ExportContainer() : base()
+		public ExportContainer(BaseStyleDecorator itemStyle) : base(itemStyle)
-		{
-			base.IsContainer = true;
-		}
-
-		public ExportContainer(BaseStyleDecorator itemStyle) : base(itemStyle, true)
 		{
 		}
 

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphic.cs

@@ -21,7 +21,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 		}
 		
-		public ExportGraphic (IBaseStyleDecorator itemStyle,bool isContainer):base(itemStyle,isContainer)
+		public ExportGraphic (IBaseStyleDecorator itemStyle):base(itemStyle)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportGraphicContainer.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 	public class ExportGraphicContainer :ExportContainer
 	{
 //		public ExportGraphicContainer (IExportContainer itemStyle,bool isContainer):base(itemStyle as BaseStyleDecorator)
-		public ExportGraphicContainer (IBaseStyleDecorator itemStyle,bool isContainer):base(itemStyle as BaseStyleDecorator)
+		public ExportGraphicContainer (IBaseStyleDecorator itemStyle):base(itemStyle as BaseStyleDecorator)
 		{
 			
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportImage.cs

@@ -25,7 +25,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-		public ExportImage (BaseStyleDecorator itemStyle):base(itemStyle,false) 
+		public ExportImage (BaseStyleDecorator itemStyle):base(itemStyle) 
 		{
 			
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/ExportText.cs

@@ -17,7 +17,7 @@ namespace ICSharpCode.Reports.Core.Exporter {
 		
 		#region Constructors
 		
-		public ExportText (BaseStyleDecorator itemStyle,bool isContainer):base(itemStyle,isContainer)
+		public ExportText (BaseStyleDecorator itemStyle):base(itemStyle)
 		{
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IBaseExportColumn.cs

@@ -0,0 +1,19 @@
+// Copyright (c) AlphaSierraPapa for the SharpDevelop Team (for details please see \doc\copyright.txt)
+// This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
+
+using System;
+using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses.Printing;
+using ICSharpCode.Reports.Core.Exporter.ExportRenderer;
+using ICSharpCode.Reports.Core.Globals;
+using iTextSharp.text.pdf;
+
+namespace ICSharpCode.Reports.Core.Exporter
+{
+	public interface IBaseExportColumn
+	{
+		void DrawItem(Graphics graphics);
+		void DrawItem(PdfWriter pdfWriter,PdfUnitConverter converter);
+		IBaseStyleDecorator StyleDecorator { get; set; }
+	}
+}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportColumnBuilder .cs

@@ -11,7 +11,7 @@ namespace ICSharpCode.Reports.Core
 	/// Description of Interface1.
 	/// </summary>
 	public interface IExportColumnBuilder{
-		BaseExportColumn CreateExportColumn ();
+		IBaseExportColumn CreateExportColumn ();
 	}
 
 }

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportColumns/IExportContainer.cs

@@ -6,10 +6,8 @@ using iTextSharp.text.pdf;
 
 namespace ICSharpCode.Reports.Core.Exporter
 {
-	public interface IExportContainer
+	public interface IExportContainer:IBaseExportColumn
 	{
-		void DrawItem(System.Drawing.Graphics graphics);
-		void DrawItem(PdfWriter pdfWriter, ICSharpCode.Reports.Core.Exporter.ExportRenderer.PdfUnitConverter converter);
 		ExporterCollection Items { get; }
 	}
 }

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

@@ -19,14 +19,14 @@ namespace ICSharpCode.Reports.Core.Exporter
 	internal static class ExportHelper
 	{
 		
-		public static BaseExportColumn ConvertLineItem (BaseReportItem item,Point offset)
+		public static IBaseExportColumn ConvertLineItem (BaseReportItem item,Point offset)
 		{
 			if (item == null) {
 				throw new ArgumentNullException("item");
 			}
 
 			IExportColumnBuilder columnBuilder = item as IExportColumnBuilder;
-			BaseExportColumn lineItem = null;
+			IBaseExportColumn lineItem = null;
 			
 			
 			if (columnBuilder != null) {
@@ -52,7 +52,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 				
 				foreach(BaseReportItem item in items)
 				{
-					col.Add(ExportHelper.ConvertLineItem(item,offset));
+					col.Add((BaseExportColumn)ExportHelper.ConvertLineItem(item,offset));
 				}
 			}
 			return col;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExportRenderer/FixedDocumentRenderer.cs

@@ -89,14 +89,14 @@ namespace ICSharpCode.Reports.Core.Exporter.ExportRenderer
 			foreach (var page in pages)
 			{
 				FixedPage fixedPage = docCreator.CreatePage (page);
-				docCreator.ArrangePage(document.DocumentPaginator.PageSize,fixedPage);
+				FixedDocumentCreator.ArrangePage(document.DocumentPaginator.PageSize,fixedPage);
 				AddPageToDocument(document,fixedPage);
 			}
 			Document = document;
 		}
 		
 	
-		void AddPageToDocument(FixedDocument fixedDocument,FixedPage page)
+		static void AddPageToDocument(FixedDocument fixedDocument,FixedPage page)
 		{
 			PageContent pageContent = new PageContent();
 			((IAddChild)pageContent).AddChild(page);

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/WPF/FixedDocumentCreator.cs

@@ -212,7 +212,7 @@ namespace ICSharpCode.Reports.Core.WPF
 		}
 
 		
-		System.Windows.Media.Imaging.BitmapImage BitmapFromImage(ExportImage image)
+		static System.Windows.Media.Imaging.BitmapImage BitmapFromImage(ExportImage image)
 		{
 			var bitmap = new System.Windows.Media.Imaging.BitmapImage();
 			bitmap.BeginInit();
@@ -304,7 +304,7 @@ namespace ICSharpCode.Reports.Core.WPF
 		}
 		
 		
-		void SetDimension (FrameworkElement element,IBaseStyleDecorator decorator)
+		static void SetDimension (FrameworkElement element,IBaseStyleDecorator decorator)
 		{
 			element.Width = decorator.DisplayRectangle.Width;
 			element.Height = decorator.DisplayRectangle.Height;
@@ -313,12 +313,12 @@ namespace ICSharpCode.Reports.Core.WPF
 		}
 		
 		
-		public void ArrangePage(Size pageSize, FixedPage page)
+		public static void ArrangePage(Size pageSize, FixedPage page)
 		{
 			page.Measure(pageSize);
 			page.Arrange(new Rect(new System.Windows.Point(), pageSize));
 			page.UpdateLayout();
-		}
+		} 
 		
 		
 		public System.Windows.Size PageSize {get;set;}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseDataItemFixture.cs

@@ -103,7 +103,7 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		public void ExportColumnIsNotNull ()
 		{
 			BaseDataItem bt = new BaseDataItem();
-			BaseExportColumn bec = bt.CreateExportColumn();
+			var bec = bt.CreateExportColumn();
 			Assert.IsNotNull(bec);
 		}
 		
@@ -112,7 +112,7 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		public void TypeofExportShouldBeExportText ()
 		{
 			BaseTextItem bt = new BaseDataItem();
-			BaseExportColumn bec = bt.CreateExportColumn();
+			var bec = bt.CreateExportColumn();
 			Type t = typeof(ExportText);
 			Assert.AreEqual(t,bec.GetType(),"Type should be 'ExportText");
 		}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseRowItemFixture.cs

@@ -38,7 +38,7 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		public void ExportColumnIsNotNull ()
 		{
 			BaseRowItem bri = new BaseRowItem();
-			BaseExportColumn bec = bri.CreateExportColumn();
+			var bec = bri.CreateExportColumn();
 			Assert.IsNotNull(bec);
 		}
 		
@@ -46,7 +46,7 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		public void TypeofExportShouldBeExportContainer ()
 		{
 			BaseRowItem bri = new BaseRowItem();
-			BaseExportColumn bec = bri.CreateExportColumn();
+			var bec = bri.CreateExportColumn();
 			Type t = typeof(ExportContainer);
 			Assert.AreEqual(t,bec.GetType(),"Type should be 'ExportContainer");
 		}
@@ -57,7 +57,6 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 			BaseRowItem bri = new BaseRowItem();
 			ExportContainer ec = (ExportContainer)bri.CreateExportColumn();
 			Assert.AreEqual (0,ec.Items.Count,"Items.Count should BeforePrintEventArgs '0'");
-			Assert.IsTrue(ec.IsContainer);
 			Assert.AreEqual(bri.Size,ec.StyleDecorator.Size);                 
 		}
 		#endregion

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/BaseItems/BaseTextItemFixture.cs

@@ -91,8 +91,8 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		[Test]
 		public void ExportColumnIsNotNull ()
 		{
-			BaseTextItem bt = new BaseTextItem();
+			var bt = new BaseTextItem();
-			BaseExportColumn bec = bt.CreateExportColumn();
+			var bec = bt.CreateExportColumn();
 			Assert.IsNotNull(bec);
 		}
 		
@@ -100,8 +100,8 @@ namespace ICSharpCode.Reports.Core.Test.BaseItems
 		[Test]
 		public void TypeofExportShouldBeExportText ()
 		{
-			BaseTextItem bt = new BaseTextItem();
+			var bt = new BaseTextItem();
-			BaseExportColumn bec = bt.CreateExportColumn();
+			var bec = bt.CreateExportColumn();
 			Type t = typeof(ExportText);
 			Assert.AreEqual(t,bec.GetType(),"Type should be 'ExportText");
 		}