Cleanup

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

@@ -145,8 +145,7 @@
     <Compile Include="Project\ReportItems\BaseDataItem.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Project\ReportItems\BaseGroupFooter.cs" />
-    <Compile Include="Project\ReportItems\BaseGroupItem.cs" />
+    <Compile Include="Project\ReportItems\GroupFooter.cs" />
     <Compile Include="Project\ReportItems\BaseImageItem.cs">
       <SubType>Component</SubType>
     </Compile>
@@ -171,7 +170,7 @@
     <Compile Include="Project\ReportItems\ErrorItem.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Project\ReportItems\BaseGroupeHeader.cs" />
+    <Compile Include="Project\ReportItems\GroupHeader.cs" />
     <Compile Include="Project\ReportItems\RectangleItemTypeProvider.cs" />
     <Compile Include="Project\ReportManagers\BaseManager.cs" />
     <Compile Include="Project\ReportManagers\StandartPreviewManager.cs" />

src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportItems/BaseGroupItem.cs

@@ -1,44 +0,0 @@
-// 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.ComponentModel;
-using System.ComponentModel.Design;
-using System.Drawing;
-using System.Windows.Forms;
-using System.Windows.Forms.Design;
-
-using ICSharpCode.Reports.Core;
-using ICSharpCode.Reports.Core.BaseClasses.Printing;
-
-namespace ICSharpCode.Reports.Addin
-{
-	/// <summary>
-	/// Description of BaseGroupItem.
-	/// </summary>
-	/// 
-	[Designer(typeof(ICSharpCode.Reports.Addin.Designer.GroupHeaderDesigner))]
-	public class BaseGroupItem:BaseDataItem
-	{
-		public BaseGroupItem()
-		{
-		}
-		
-		
-		[System.ComponentModel.EditorBrowsableAttribute()]
-		protected override void OnPaint(System.Windows.Forms.PaintEventArgs e)
-		{
-//			if (Text.CompareTo(ColumnName) != 0 ) {
-//				Text = ColumnName;
-//			}
-			base.OnPaint(e);
-			this.Draw(e.Graphics);
-		}
-		
-		
-		public override void Draw(Graphics graphics)
-		{
-			base.Draw (graphics);
-		}
-	}
-}

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

@@ -89,9 +89,8 @@
     <Compile Include="Project\BaseClasses\SinglePage.cs" />
     <Compile Include="Project\BaseClasses\SectionBounds.cs" />
     <Compile Include="Project\BaseClasses\SortColumn.cs" />
-    <Compile Include="Project\BaseItems\BaseGroupedRow.cs" />
-    <Compile Include="Project\BaseItems\BaseGroupeFooter.cs" />
-    <Compile Include="Project\BaseItems\BaseGroupItem.cs" />
+    <Compile Include="Project\BaseItems\GroupHeader.cs" />
+    <Compile Include="Project\BaseItems\GroupFooter.cs" />
     <Compile Include="Project\BaseItems\BaseTextItem.cs" />
     <Compile Include="Project\BaseItems\BaseGraphicItem.cs" />
     <Compile Include="Project\BaseItems\BaseReportItem.cs" />

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

@@ -1,17 +0,0 @@
-// 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;
-
-namespace ICSharpCode.Reports.Core
-{
-	/// <summary>
-	/// Description of BaseGroupeItem.
-	/// </summary>
-	public class BaseGroupItem:BaseDataItem
-	{
-		public BaseGroupItem():base()
-		{
-		}
-	}
-}

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Collections/Collections.cs

@@ -152,8 +152,7 @@ namespace ICSharpCode.Reports.Core{
 		public bool IsGrouped
 		{
 			get {
-				return (this[0] is GroupHeader)|| (this[0] is BaseGroupItem) ;
-				//return CreateGroupedList().Count > 0;
+				return (this[0] is GroupHeader) ;
 			}
 		}
 		
@@ -175,28 +174,9 @@ namespace ICSharpCode.Reports.Core{
 		}
 		
 		
-		private Collection<BaseGroupItem> old_CreateGroupedList ()
-		{
-			Collection<BaseGroupItem> inheritedReportItems = null;
-			foreach (BaseReportItem element in this) {
-				ISimpleContainer container = element as ISimpleContainer;
-				if (container == null) {
-					inheritedReportItems = new Collection<BaseGroupItem>(this.OfType<BaseGroupItem>().ToList());
-					break;
-				} else {
-					inheritedReportItems = new Collection<BaseGroupItem>(container.Items.OfType<BaseGroupItem>().ToList());
-					break;
-					
-				}
-			}
-			return inheritedReportItems;
-		}
-		
-		
 		public ReportItemCollection ExtractGroupedColumns ()
 		{
 			Collection<BaseDataItem> inheritedReportItems = CreateGroupedList();
-//			Collection<BaseGroupItem> inheritedReportItems = CreateGroupedList();
 			ReportItemCollection r = new ReportItemCollection();
 			r.AddRange(inheritedReportItems);
 			return r;

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

@@ -23,7 +23,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 	{
 		
 		private Size saveSize;
-		private IExpressionEvaluatorFacade evaluator;
+		
 	
 		public event EventHandler <NewPageEventArgs> PageFull;
 		public event EventHandler<SectionRenderEventArgs> SectionRendering;

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

@@ -13,8 +13,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 	{
 		IDataManager dataManager;
 		IDataNavigator dataNavigator;
-		Point positionAfterDetail;
-
+		
 		readonly object addLock = new object();