FormSheet Reports with ReportViewer are working again

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ChildNavigator.cs

@@ -18,7 +18,7 @@ namespace ICSharpCode.Reports.Core
 	{
 		private IndexList indexList;
 		private IDataViewStrategy store;
-		private System.Collections.Generic.List<BaseComparer>.Enumerator ce;
+		private System.Collections.Generic.List<BaseComparer>.Enumerator genEnumerator;
 			
 		public ChildNavigator(IDataViewStrategy dataStore,IndexList indexList)
 		{
@@ -27,8 +27,8 @@ namespace ICSharpCode.Reports.Core
 			}
 			this.store = dataStore;
 			this.indexList = indexList;
-			ce = this.indexList.GetEnumerator();
-			ce.MoveNext();
+			genEnumerator = this.indexList.GetEnumerator();
+			genEnumerator.MoveNext();
 		}
 		
 		
@@ -46,13 +46,6 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		/*
-		public int ChildListCount {
-			get {
-				throw new NotImplementedException();
-			}
-		}
-		*/
 		public bool IsSorted {
 			get {
 				throw new NotImplementedException();
@@ -83,7 +76,7 @@ namespace ICSharpCode.Reports.Core
 		public object Current {
 			get {
 				TableStrategy t = this.store as TableStrategy;
-				return t.myCurrent(ce.Current.ListIndex);
+				return t.myCurrent(genEnumerator.Current.ListIndex);
 			}
 		}
 		

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/DataManager/ListStrategy/TableStrategy.cs

@@ -260,9 +260,6 @@ namespace ICSharpCode.Reports.Core
 				} catch (Exception) {
 					throw;
 				}
-//				int cr = base.CurrentPosition;
-//				int li = (base.IndexList[cr] ).ListIndex;
-				
 			}
 		}
 		

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

@@ -225,8 +225,6 @@ namespace ICSharpCode.Reports.Core.Exporter
 				}
 				ExportText et = be as ExportText;
 				if (et != null) {
-					Console.WriteLine("nav {0}",evaluatorFassade.SinglePage.IDataNavigator.CurrentRow);
-					Console.WriteLine("-- {0}",et.Text);
 					et.Text = evaluatorFassade.Evaluate(et.Text);
 				}
 			}

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

@@ -69,6 +69,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		{
 			base.BuildDetailInternal(section);
 			section.SectionOffset = base.SinglePage.SectionBounds.DetailStart.Y;
+			ExporterCollection convertedList = convertedList = base.ConvertSection (base.ReportModel.DetailSection,0);
+			base.SinglePage.Items.AddRange(convertedList);	   
 		}