Browse Source

Fix NullReferenceException in Designer(ContextMenu)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/reports@5985 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 16 years ago
parent
commit
7fb0d9a161
  1. 4
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
  2. 2
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs
  3. 6
      src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs

4
src/AddIns/Misc/Reports/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@ -100,7 +100,7 @@ namespace ICSharpCode.Reports.Addin
private void LoadDesigner(Stream stream) private void LoadDesigner(Stream stream)
{ {
LoggingService.Info("Form Designer: BEGIN INITIALIZE"); LoggingService.Info("Form Designer: BEGIN INITIALIZE");
CreatePanel();
defaultServiceContainer = new DefaultServiceContainer(); defaultServiceContainer = new DefaultServiceContainer();
defaultServiceContainer.AddService(typeof(System.Windows.Forms.Design.IUIService), defaultServiceContainer.AddService(typeof(System.Windows.Forms.Design.IUIService),
@ -188,7 +188,7 @@ namespace ICSharpCode.Reports.Addin
if (e.HasSucceeded) { if (e.HasSucceeded) {
CreatePanel(); // CreatePanel();
SetupDesignSurface(); SetupDesignSurface();
this.IsFormsDesignerVisible = true; this.IsFormsDesignerVisible = true;
generator.MergeFormChanges(null); generator.MergeFormChanges(null);

2
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs

@ -80,7 +80,7 @@ namespace ICSharpCode.Reports.Core
if (row != null) if (row != null)
{ {
PrintHelper.AdjustParent(tableContainer as BaseReportItem,tableContainer.Items); PrintHelper.AdjustParent(tableContainer as BaseReportItem,tableContainer.Items);
// row.Parent = tableContainer as BaseReportItem;
if (PrintHelper.IsTextOnlyRow(row) ) if (PrintHelper.IsTextOnlyRow(row) )
{ {

6
src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/old_Exporter/Decorators/BaseStyleDecorator.cs

@ -58,10 +58,10 @@ namespace ICSharpCode.Reports.Core.old_Exporter
} }
public Rectangle DisplayRectangle { public Rectangle DisplayRectangle {
get { return new Rectangle(this.location.X, this.location.Y, this.size.Width, this.size.Height); } get {
return new Rectangle(Location,Size);
}
} }
private static iTextSharp.text.BaseColor ConvertToPdfBaseColor (Color color) private static iTextSharp.text.BaseColor ConvertToPdfBaseColor (Color color)

Loading…
Cancel
Save