Cleanup (FxCop)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5687 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs

@@ -104,8 +104,8 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		
-		public static bool IsTextOnlyRow (BaseRowItem item)
+		public static bool IsTextOnlyRow (ISimpleContainer item)
+		//public static bool IsTextOnlyRow (BaseRowItem item)
 		{
 			var res =  from r in item.Items where r is BaseDataItem
 				select ((BaseTextItem)r);

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

@@ -137,7 +137,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 			}
 		}
 		
-		private void AdjustBackColor (ISimpleContainer container)
+		private static void AdjustBackColor (ISimpleContainer container)
 		{
 			BaseReportItem parent = container as BaseReportItem;
 			foreach (BaseReportItem item in container.Items)

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

@@ -21,7 +21,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 	public class BaseConverter:IBaseConverter
 	{
 		
-		private BaseReportItem parentItem;
 		private IDataNavigator dataNavigator;
 		private ExporterPage singlePage;
 		private SectionBounds sectionBounds;
@@ -73,10 +72,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		}
 		
 		
-			
-		protected  ExporterCollection ConvertItems (BaseReportItem parent,
-		                                            ISimpleContainer row,Point offset)
-		                                
+		
+		protected  ExporterCollection ConvertItems (ISimpleContainer row,Point offset)		                                          
 		{
 			this.exportItemsConverter.Offset = offset.Y;
 			IExportColumnBuilder exportLineBuilder = row as IExportColumnBuilder;
@@ -110,7 +107,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 		
 		public virtual ExporterCollection Convert(BaseReportItem parent, BaseReportItem item)
 		{
-			this.parentItem = parent;
 			this.parentRectangle = new Rectangle(parent.Location,parent.Size);
 			return new ExporterCollection();;
 		}
@@ -162,14 +158,12 @@ namespace ICSharpCode.Reports.Core.Exporter
 			PrintHelper.SetLayoutForRow(Graphics,Layouter,row);
 		}
 		
-		
-		protected Point BaseConvert(ExporterCollection myList,BaseReportItem parent, BaseReportItem item,int leftPos,Point curPos)
+		protected Point BaseConvert(ExporterCollection myList,ISimpleContainer container,int leftPos,Point curPos)
 		{
-			BaseRowItem row = item as BaseRowItem;
-			row.Location = new Point (leftPos,row.Location.Y);	
-			ExporterCollection ml = this.ConvertItems (parent,row, curPos);		
+			container.Location = new Point (leftPos,container.Location.Y);	
+			ExporterCollection ml = this.ConvertItems (container, curPos);		
 			myList.AddRange(ml);
-			return new Point (leftPos,curPos.Y + row.Size.Height + (3 *GlobalValues.GapBetweenContainer));
+			return new Point (leftPos,curPos.Y + container.Size.Height + (3 *GlobalValues.GapBetweenContainer));
 		}
 	}
 }

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

@@ -21,7 +21,7 @@ namespace ICSharpCode.Reports.Core.Exporter
 	
 	public class RowConverter:BaseConverter
 	{
-		private BaseRowItem baseRowItem;
+
 		private BaseReportItem parent;
 		
 		public RowConverter(IDataNavigator dataNavigator,
@@ -39,47 +39,45 @@ namespace ICSharpCode.Reports.Core.Exporter
 			if (item == null) {
 				throw new ArgumentNullException("item");
 			}
+			ISimpleContainer simpleContainer = item as ISimpleContainer;
 			this.parent = parent;
 			
-			this.baseRowItem = item as BaseRowItem;
-			this.baseRowItem.Parent = parent;
+			simpleContainer.Parent = parent;
 			
-			PrintHelper.AdjustParent(parent,this.baseRowItem.Items);
-			if (PrintHelper.IsTextOnlyRow(this.baseRowItem)) {
+			PrintHelper.AdjustParent(parent,simpleContainer.Items);
+			if (PrintHelper.IsTextOnlyRow(simpleContainer)) {
 				ExporterCollection myList = new ExporterCollection();
 
-				base.BaseConvert (myList,parent, item,parent.Location.X,
+				base.BaseConvert (myList,simpleContainer,parent.Location.X,
 				                  new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y));
 				return myList;
 			} else {
-				return this.ConvertDataRow(item);
+				return this.ConvertDataRow(simpleContainer);
 			}
 		}
 		
-		private ExporterCollection ConvertDataRow (BaseReportItem item)
+		private ExporterCollection ConvertDataRow (ISimpleContainer simpleContainer)
 		{
 			ExporterCollection mylist = new ExporterCollection();
 			Point currentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y);
 			BaseSection section = parent as BaseSection;
-			ISimpleContainer row = section.Items[0] as ISimpleContainer;
+			
 			int defaultLeftPos = parent.Location.X;
 			
 			do {
 				section.Location = new Point(section.Location.X,section.SectionOffset );
 				section.Size = this.SectionBounds.DetailSectionRectangle.Size;
-				base.SaveSize = new Size (section.Items[0].Size.Width,section.Items[0].Size.Height);
+				base.SaveSize = section.Items[0].Size;
 				
-				base.FillAndLayoutRow(row as BaseRowItem);
+				base.FillAndLayoutRow(simpleContainer);
 				base.FireSectionRendering(section);
-				currentPosition = base.BaseConvert(mylist,parent,item,defaultLeftPos,currentPosition);
-				section.Items[0].Size = base.RestoreSize;
+				currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
 				
+				section.Items[0].Size = base.RestoreSize;
 				section.SectionOffset += section.Size.Height + 2 * base.SinglePage.SectionBounds.Gap;
 
 				
-				Rectangle r = new Rectangle(new Point (((BaseRowItem)row).Location.X,currentPosition.Y), section.Size);
-				
-				if (PrintHelper.IsPageFull(r,base.SectionBounds)) {
+				if (PrintHelper.IsPageFull(new Rectangle(new Point (simpleContainer.Location.X,currentPosition.Y), section.Size),base.SectionBounds)) {
 					base.FirePageFull(mylist);
 					section.SectionOffset = base.SinglePage.SectionBounds.PageHeaderRectangle.Location.Y;
 					currentPosition = new Point(base.SectionBounds.PageHeaderRectangle.X,base.SectionBounds.PageHeaderRectangle.Y);

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

@@ -50,45 +50,46 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 			Point currentPosition = new Point(base.SectionBounds.DetailStart.X,base.SectionBounds.DetailStart.Y);
 			Point dataAreaStart = new Point(baseTable.Items[0].Location.X,baseTable.Items[0].Location.Y + currentPosition.Y);
-			BaseRowItem headerRow = null;
+			ISimpleContainer headerContainer = null;
+			
 			int defaultLeftPos = PrintHelper.DrawingAreaRelativeToParent(this.baseTable.Parent,this.baseTable).Left;
 			
 			this.baseTable.Items.SortByLocation();
 			
-			foreach (BaseRowItem row in this.baseTable.Items)
+			foreach (ISimpleContainer simpleContainer in this.baseTable.Items)
 			{
-				if (row.Items.Count > 0) {
-					row.Location = new Point (row.Location.X + defaultLeftPos,row.Location.Y);
-					row.Parent = (BaseReportItem)this.baseTable;
-					base.SaveSize =  new Size (row.Size.Width,row.Size.Height);
+				if (simpleContainer.Items.Count > 0) {
+					simpleContainer.Location = new Point (simpleContainer.Location.X + defaultLeftPos,simpleContainer.Location.Y);
+					simpleContainer.Parent = (BaseReportItem)this.baseTable;
+					base.SaveSize =  new Size (simpleContainer.Size.Width,simpleContainer.Size.Height);
 					// Header/FooterRow
 				
-					if (PrintHelper.IsTextOnlyRow(row) ) {
-						headerRow = row;
-						currentPosition = base.BaseConvert(mylist,this.baseTable.Parent,headerRow,defaultLeftPos,currentPosition);
+					if (PrintHelper.IsTextOnlyRow(simpleContainer) ) {
+						headerContainer = simpleContainer;
+						currentPosition = base.BaseConvert(mylist,headerContainer,defaultLeftPos,currentPosition);
 					}
 					
 					else 
 					{
 						// DataRegion
-						base.SaveSize = new Size (row.Size.Width,row.Size.Height);
+						base.SaveSize = simpleContainer.Size;
 						do {
 							//
 							BaseSection section = this.baseTable.Parent as BaseSection;
 							section.Location = new Point(section.Location.X,section.SectionOffset );
-							base.FillAndLayoutRow(row);
+							base.FillAndLayoutRow(simpleContainer);
 							
-							if (PrintHelper.IsPageFull(new Rectangle(new Point (row.Location.X,currentPosition.Y),row.Size),base.SectionBounds)) {
+							if (PrintHelper.IsPageFull(new Rectangle(new Point (simpleContainer.Location.X,currentPosition.Y),simpleContainer.Size),base.SectionBounds)) {
 								base.FirePageFull(mylist);
 								mylist.Clear();
 
-								currentPosition = base.BaseConvert(mylist,this.baseTable.Parent,headerRow,
+								currentPosition = base.BaseConvert(mylist,headerContainer,
 								                                     defaultLeftPos,
 								                                     base.SectionBounds.ReportHeaderRectangle.Location);
 							}
 							
-							currentPosition = base.BaseConvert(mylist,this.baseTable.Parent,row,defaultLeftPos,currentPosition);
-							row.Size = base.RestoreSize;
+							currentPosition = base.BaseConvert(mylist,simpleContainer,defaultLeftPos,currentPosition);
+							simpleContainer.Size = base.RestoreSize;
 						}
 						while (base.DataNavigator.MoveNext());
 						//Allway's reset the DataNavigator

src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/ReportViewer/ReportViewer.cs

@@ -39,7 +39,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 		private delegate void invokeDelegate();
 		private ReportSettings reportSettings;
 		private IDataManager dataManager;
-		private string pagesCreatedMessage;
+//		private string pagesCreatedMessage;
 		
 		#region Constructor
 		
@@ -397,7 +397,7 @@ namespace ICSharpCode.Reports.Core.ReportViewer
 				this.comboZoom.ToolTipText = this.reportViewerMessages.ZoomMessage;
 				this.createPdfMenu.Text = this.reportViewerMessages.PdfFileMessage;
 				this.pdfButton.ToolTipText = this.reportViewerMessages.PdfFileMessage;
-				this.pagesCreatedMessage = this.reportViewerMessages.PagesCreatedMessage;
+//				this.pagesCreatedMessage = this.reportViewerMessages.PagesCreatedMessage;
 			}
 		}