From 25ecb0011af0009fbe2fc4ec455c5148b9dfe6bd Mon Sep 17 00:00:00 2001 From: Linquize Date: Sun, 10 Aug 2014 11:44:45 +0800 Subject: [PATCH] Fix crash if report data source is an empty collection and sum() is used --- .../Src/PageBuilder/DataPageBuilder.cs | 26 +++++-------------- 1 file changed, 7 insertions(+), 19 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs index 98ca29edc38..9ae3f214c41 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/PageBuilder/DataPageBuilder.cs @@ -66,14 +66,12 @@ public override void BuildExportList() void BuildDetail() { CurrentSection = ReportModel.DetailSection; - if(DataSourceContainsData()) { - CurrentLocation = DetailStart; - var converter = new ContainerConverter(DetailStart); - if (IsGrouped()) { - BuildGroupedDetails(converter,DetailStart); - } else { - BuildSortedDetails(converter,DetailStart); - } + CurrentLocation = DetailStart; + var converter = new ContainerConverter(DetailStart); + if (IsGrouped()) { + BuildGroupedDetails(converter,DetailStart); + } else { + BuildSortedDetails(converter,DetailStart); } } @@ -194,17 +192,7 @@ List FillAndConvert(ExportContainer parent, object current, List< void CreateDataSource(){ DataSource = new CollectionDataSource(List, ReportModel.ReportSettings); - if (DataSourceContainsData()) { - DataSource.Bind(); - } - } - - - bool DataSourceContainsData () { - if (DataSource.Count > 0) { - return true; - } - return false; + DataSource.Bind(); }