PrintableWidth() as ExtensionMethod, Cleanup

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/DesignerBinding.cs

@@ -48,41 +48,25 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding {
 				var cmd = new ReportWizardCommand();
 				cmd.Run();
 				if (!cmd.Canceled) {
-					LoggingService.Info("reportWizard canceled");
-					//return null;
 					var reportModel = cmd.ReportModel;
-					
 					var xml = CreateFormSheetFromModel.ToXml(reportModel);
 					var doc = new XmlDocument();
 					doc.LoadXml(xml.ToString());
 					var ar = XmlToArray(doc);
 					file.SetData(ar);
 				} else {
+					LoggingService.Info("ReportWizard canceled");
 					return null;
 				}
 			}
 
 			var viewCmd = new CreateDesignerCommand(file);
 			viewCmd.Run();
-			LoggingService.Info("return DesignerView");
+			LoggingService.Info("DesignerBinding -> Designer started");
 			return viewCmd.DesignerView;
-			
-			/*
-			if (file.IsDirty) {
-
-				var reportModel = ReportModelFactory.Create();
-				var xml = CreateFormSheetFromModel.ToXml(reportModel);
-				
-				var doc = new XmlDocument();
-				doc.LoadXml(xml.ToString());
-				var ar = XmlToArray(doc);
-				file.SetData(ar);
-			}
-			
-			
-			 */
 		}
 
+		
 		static byte[] XmlToArray(XmlDocument doc)
 		{
 			using (var stream = new MemoryStream()) {

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/DesignerBinding/ReportDefinitionDeserializer.cs

@@ -35,7 +35,6 @@ namespace ICSharpCode.Reporting.Addin.DesignerBinding
 		
 		public static XmlDocument LoadXmlFromStream(Stream stream)
 		{
-			Console.Write("LoadXml");
 			if (stream == null)
 				throw new ArgumentNullException("stream");
 			var xmlDocument = new XmlDocument();

src/AddIns/Misc/Reporting/ICSharpCode.Reporting.Addin/src/Factory/CreateFormSheetFromModel.cs

@@ -9,8 +9,9 @@
 using System;
 using System.Drawing;
 using System.IO;
+using ICSharpCode.Reporting.BaseClasses;
+using ICSharpCode.Reporting.Globals;
 using ICSharpCode.Reporting.Interfaces;
-using ICSharpCode.Reporting.Addin.DesignableItems;
 using ICSharpCode.Reporting.Addin.Globals;
 using ICSharpCode.Reporting.Addin.XML;
 
@@ -28,8 +29,7 @@ namespace ICSharpCode.Reporting.Addin.Factory
 				foreach (var section in reportModel.SectionCollection)
 				{
 					section.Location = new Point(reportModel.ReportSettings.LeftMargin,locY);
-					section.Size = new Size(reportModel.ReportSettings.PageSize.Width - reportModel.ReportSettings.LeftMargin - reportModel.ReportSettings.RightMargin,
-						70);
+					section.Size = new Size(reportModel.ReportSettings.PrintableWidth(),GlobalValues.DefaultSectionHeight + 10);
 					locY = locY + section.Size.Height + DesignerGlobals.GabBetweenSection;
 				}
 	

src/AddIns/Misc/Reporting/ICSharpCode.Reporting/Src/Factories/ReportModelFactory.cs

@@ -8,6 +8,7 @@
  */
 using System;
 using System.Drawing;
+using ICSharpCode.Reporting.BaseClasses;
 using ICSharpCode.Reporting.Globals;
 using ICSharpCode.Reporting.Items;
 
@@ -27,8 +28,7 @@ namespace ICSharpCode.Reporting.Factories
 			}
 			
 			foreach (var section in reportModel.SectionCollection) {
-					section.Size = new Size(reportModel.ReportSettings.PageSize.Width - reportModel.ReportSettings.LeftMargin - reportModel.ReportSettings.RightMargin,
-						GlobalValues.DefaultSectionHeight);
+				section.Size = new Size(reportModel.ReportSettings.PrintableWidth(),GlobalValues.DefaultSectionHeight);
 			}
 			
 			return reportModel;