Replace unset Parameter Values with string.Empty, write message to console to inform user

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

@@ -37,32 +37,13 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
 					}
 				}
 				
-				/*
-				if (str.Contains(Environment.NewLine))
-				{
-				    	Console.WriteLine ("newline");
-				}
-				
-				
-				int lp = 0;
-				int cp = 0;
-				SizeF test = graphics.MeasureString(str.TrimEnd(), textItem.Font, textItem.Size, 
 				
-				                                      StringFormat.GenericTypographic,out cp, out lp);
-
-				
-				*/
 				SizeF sf = graphics.MeasureString(str.TrimEnd(),
 				                                  textItem.Font,
 				                                  textItem.Size.Width);
-				var hh = textItem.Font.GetHeight();
-				var h1 = textItem.Font.Height;
-				var aa = sf.Height / textItem.Font.GetHeight();
-				
 				return sf.ToSize();
 			}
 			return item.Size;
 		}
-		
 	}
 }

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

@@ -91,10 +91,9 @@ namespace ICSharpCode.Reports.Core.Exporter
 		protected ExporterCollection ConvertSection (BaseSection section,int dataRow)
 		{
 			FireSectionRenderEvent (section ,dataRow);
-			PrintHelper.AdjustParent((BaseSection)section,section.Items);
+			PrintHelper.AdjustParent(section,section.Items);
 			
-			var list = new ExporterCollection();
-			Point startLocation = section.Location;
+			var convertedSection = new ExporterCollection();
 			Offset = new Point(section.Location.X,section.SectionOffset);
 			
 			if (section.Items.Count > 0) {
@@ -113,25 +112,28 @@ namespace ICSharpCode.Reports.Core.Exporter
 					if (simpleContainer != null)
 					{
 						EvaluationHelper.EvaluateReportItems(evaluator,simpleContainer.Items);
-						var l = (ILayouter)ServiceContainer.GetService(typeof(ILayouter));
-						LayoutHelper.SetLayoutForRow(Graphics,l, simpleContainer);
+						
+						var layouter = (ILayouter)ServiceContainer.GetService(typeof(ILayouter));
+						LayoutHelper.SetLayoutForRow(Graphics,layouter, simpleContainer);
+						
 						ExportContainer exportContainer = StandardPrinter.ConvertToContainer(simpleContainer,Offset);
 						
-						ExporterCollection clist = StandardPrinter.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location);
-						exportContainer.Items.AddRange(clist);
-						list.Add(exportContainer);
+						ExporterCollection exporterCollection = StandardPrinter.ConvertPlainCollection(simpleContainer.Items,exportContainer.StyleDecorator.Location);
+						exportContainer.Items.AddRange(exporterCollection);
+						convertedSection.Add(exportContainer);
+						
 						Offset = new Point(Offset.X,Offset.Y + exportContainer.StyleDecorator.Size.Height);
 					}
 					else
 					{
-						list = StandardPrinter.ConvertPlainCollection(section.Items,Offset);
+						convertedSection = StandardPrinter.ConvertPlainCollection(section.Items,Offset);
 						Offset = new Point(Offset.X,Offset.Y + section.Size.Height);
 					}
 					section.Size = new Size(section.Size.Width,Offset.Y  - section.SectionOffset);
 					
 				}
 			}
-			return list;
+			return convertedSection;
 		}
 
 		

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

@@ -78,13 +78,8 @@ namespace ICSharpCode.Reports.Core.Exporter
 		protected override void BuildPageHeader ()
 		{
 			base.ReportModel.PageHeader.SectionOffset = base.AdjustPageHeader();
-//        	 Console.WriteLine ("pageHeader at start {0}",base.ReportModel.PageHeader.Size);
 			ExporterCollection convertedList =  base.ConvertSection (base.ReportModel.PageHeader,this.dataNavigator.CurrentRow);
-//			Console.WriteLine ("pageHeader after convert {0}",base.ReportModel.PageHeader.Size);
-//			Console.WriteLine ("Offset from base {0}",base.Offset);
-//			base.ReportModel.PageHeader.Size = new Size(base.ReportModel.PageHeader.Size.Width,base.Offset.Y);
 			base.SectionBounds.MeasurePageHeader(base.ReportModel.PageHeader);
-//			Console.WriteLine ("PageHeaderRectangle {0} DetailStart  {1}",base.SectionBounds.PageHeaderRectangle,base.SectionBounds.DetailStart);
 			base.SinglePage.Items.AddRange(convertedList);
 		}
 		

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

@@ -78,14 +78,25 @@ namespace ICSharpCode.Reports.Expressions.ReportingLanguage
 		
 		private void VariableStore (object sender,SimpleExpressionEvaluator.Evaluation.UnknownVariableEventArgs e)
 		{
-			
 			PropertyPath path = this.singlePage.ParsePropertyPath(e.VariableName);
 			if (path != null) {
 				e.VariableValue = path.Evaluate(path);
 			}
+			
 			// Look in Parametershash
-			if (singlePage.ParameterHash.ContainsKey(e.VariableName)) {
-				e.VariableValue = singlePage.ParameterHash[e.VariableName].ToString();
+			if (singlePage.ParameterHash.ContainsKey(e.VariableName))
+			{
+				try {
+					e.VariableValue = singlePage.ParameterHash[e.VariableName].ToString();
+				}
+				catch (Exception)
+				{
+					e.VariableValue = String.Empty;
+					Console.WriteLine("");
+					Console.WriteLine("ExpressionEvaluatorFacade.VariableStore");
+					Console.WriteLine("Replace Param <{0}> with String.Empty because no value is set",e.VariableName);
+					Console.WriteLine("");
+				}
 			}
 		}