From 788350e5b00fdad05d82517619de8912710ef528 Mon Sep 17 00:00:00 2001 From: Peter Forstmeier Date: Mon, 14 Oct 2013 20:10:30 +0200 Subject: [PATCH] Handling of Evaluator.Globals --- .../Src/Expressions/Irony/Ast/AstExtensions.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/Ast/AstExtensions.cs b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/Ast/AstExtensions.cs index 0a8c77a83d..05b919cf37 100644 --- a/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/Ast/AstExtensions.cs +++ b/src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Expressions/Irony/Ast/AstExtensions.cs @@ -19,7 +19,11 @@ namespace ICSharpCode.Reporting.Expressions.Irony.Ast if (pageInfo == null) throw new ArgumentNullException("pageInfo"); - app.Globals.Add("PageInfo",pageInfo); + if (!app.Globals.ContainsKey("PageInfo")) { + app.Globals.Add("PageInfo",pageInfo); + } else { + app.Globals["PageInfo"] = pageInfo; + } } @@ -50,8 +54,11 @@ namespace ICSharpCode.Reporting.Expressions.Irony.Ast public static void AddCurrentContainer (this ReportingExpressionEvaluator app,ExportContainer container){ if (container == null) throw new ArgumentNullException("container"); - app.Globals.Add("CurrentContainer",container); - + if (!app.Globals.ContainsKey("CurrentContainer")) { + app.Globals.Add("CurrentContainer",container); + } else { + app.Globals["CurrentContainer"] = container; + } } public static ExportContainer GetCurrentContainer (this ScriptThread thread){