Browse Source

Fix creation of ReportExplorer (see 4.0)

git-svn-id: svn://svn.sharpdevelop.net/sharpdevelop/branches/3.0@5809 1ccf3a8d-04fe-1044-b7c0-cef0b8235c61
pull/1/head
Peter Forstmeier 15 years ago
parent
commit
4f0594ec63
  1. 2
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs
  2. 9
      src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs

2
src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/Project/ReportDesignerView.cs

@ -287,7 +287,7 @@ namespace ICSharpCode.Reports.Addin @@ -287,7 +287,7 @@ namespace ICSharpCode.Reports.Addin
private void StartReportExplorer ()
{
ReportExplorerPad explorerPad = CheckReportExplorer();
WorkbenchSingleton.Workbench.ShowPad(WorkbenchSingleton.Workbench.GetPad(typeof(ReportExplorerPad)));
WorkbenchSingleton.Workbench.GetPad(typeof(ReportExplorerPad)).BringPadToFront();
explorerPad.AddContent(this.loader.ReportModel);
explorerPad.PropertyChanged += new System.ComponentModel.PropertyChangedEventHandler(ReportExplorer_PropertyChanged);
}

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

@ -93,6 +93,8 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -93,6 +93,8 @@ namespace ICSharpCode.Reports.Core.Exporter
protected ExporterCollection ConvertSection (BaseSection section,int dataRow)
{
bool debugItemadded = false;
FireSectionRenderEvent (section ,dataRow);
PrintHelper.AdjustParent((BaseSection)section,section.Items);
@ -101,6 +103,7 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -101,6 +103,7 @@ namespace ICSharpCode.Reports.Core.Exporter
if (section.DrawBorder == true) {
section.Items.Insert(0,CreateDebugItem(section));
debugItemadded = true;
}
if (section.Items.Count > 0) {
@ -131,6 +134,12 @@ namespace ICSharpCode.Reports.Core.Exporter @@ -131,6 +134,12 @@ namespace ICSharpCode.Reports.Core.Exporter
}
list = this.exportItemsConverter.ConvertSimpleItems(offset,section.Items);
// if (debugItemadded) {
// BaseExportColumn debugColumn = list[0];
// debugColumn.StyleDecorator.Location = section.Location;
// debugColumn.StyleDecorator.Size = section.Size;
// }
}
}
}

Loading…
Cancel
Save