cleanup

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

@@ -278,7 +278,6 @@ namespace ICSharpCode.Reports.Core {
 			
 		
 		
-
         public override object CurrentFromPosition (int pos)
         {
         	return this.baseList[pos];

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

@@ -2,12 +2,11 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Data;
-using System.Linq;
+
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
+
 namespace ICSharpCode.Reports.Core
 {
 	/// <summary>
@@ -93,9 +92,10 @@ namespace ICSharpCode.Reports.Core
 			}
 		}
 		
+		
 		object ExtractDBValue(DataRow row,BaseDataItem item)
 		{
-			if  ((!String.IsNullOrEmpty(item.Expression)) && (item.Expression.StartsWith("=",StringComparison.InvariantCultureIgnoreCase))) {
+			if (EvaluationHelper.CanEvaluate(item.Expression)) {
 				return ExtractFromExpression(item.Expression, row);
 			}
 			else
@@ -219,9 +219,7 @@ namespace ICSharpCode.Reports.Core
 		}
 		
 		
-		
+		object  ExtractColumnValue(DataRow row,ColumnCollection col, int criteriaIndex)
-		
-		 object  ExtractColumnValue(DataRow row,ColumnCollection col, int criteriaIndex)
 		{
 			AbstractColumn c = (AbstractColumn)col[criteriaIndex];
 			object val = null;
@@ -259,7 +257,7 @@ namespace ICSharpCode.Reports.Core
 		
 		object ExtractFromExpression(string expression, DataRow row)
 		{
-			var v = ((ExpressionEvaluatorFacade)base.ExpressionEvaluator).Evaluate(expression, row);
+			var v = base.ExpressionEvaluator.Evaluate(expression, row);
 			return v;
 		}
 		

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

@@ -2,14 +2,11 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-
 using ICSharpCode.Reports.Core.BaseClasses;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
-using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter
@@ -315,13 +312,24 @@ foreach (var element in section.Items)
 						EvaluateRecursive(evaluatorFassade,ec.Items);
 					}
 				}
+				/*
+			IReportExpression expr = be as IReportExpression;
+			if (expr != null)
+			{
+				if (EvaluationHelper.CanEvaluate(expr.Text)) {
+						expr.Text = evaluatorFassade.Evaluate(expr.Text);
+					}
+			}
+				 */
+				
 				ExportText et = be as ExportText;
 				
 				if ((et != null) && (!String.IsNullOrEmpty(et.Text))) {
-					if (et.Text.StartsWith("=",StringComparison.InvariantCulture)) {
+					if (EvaluationHelper.CanEvaluate(et.Text)) {
 						et.Text = evaluatorFassade.Evaluate(et.Text);
 					}
 				}
+				
 			}
 		}
 		

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

@@ -2,16 +2,12 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Collections.ObjectModel;
 using System.Drawing;
-using System.Linq;
-
 using ICSharpCode.Reports.Core.BaseClasses;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Events;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
-using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter

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

@@ -6,7 +6,6 @@ using System.Drawing;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
-using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter

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

@@ -9,7 +9,6 @@ using System.Linq;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
 using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
-using ICSharpCode.Reports.Core.Project.Exporter;
 using ICSharpCode.Reports.Expressions.ReportingLanguage;
 
 namespace ICSharpCode.Reports.Core.Exporter

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

@@ -9,11 +9,9 @@
 using System;
 using System.Drawing;
 using ICSharpCode.Reports.Core.BaseClasses.Printing;
-using ICSharpCode.Reports.Core.Exporter;
-using ICSharpCode.Reports.Core.Globals;
 using ICSharpCode.Reports.Core.Interfaces;
 
-namespace ICSharpCode.Reports.Core.Project.Exporter
+namespace ICSharpCode.Reports.Core.Exporter
 {
 	/// <summary>
 	/// Description of ExportHelper.

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/ExpressionEvaluatorFacade.cs

@@ -2,8 +2,6 @@
 // This code is distributed under the GNU LGPL (for details please see \doc\license.txt)
 
 using System;
-using System.Data;
-using ICSharpCode.Reports.Core;
 using ICSharpCode.Reports.Core.Interfaces;
 using SimpleExpressionEvaluator;
 using SimpleExpressionEvaluator.Evaluation;

src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/IExpressionEvaluatorFacade.cs

@@ -13,6 +13,7 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 	public interface IExpressionEvaluatorFacade
 	{
 		string Evaluate (string expression);
+		string Evaluate (string expression, object row);
 		IPageInfo SinglePage {get;set;}
 	}
 }