diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
index cab72d453d..28df99f472 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
@@ -77,6 +77,7 @@
+
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs
new file mode 100644
index 0000000000..b4a5280aad
--- /dev/null
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/PageInfo.cs
@@ -0,0 +1,64 @@
+/*
+ * Created by SharpDevelop.
+ * User: Peter Forstmeier
+ * Date: 25.09.2010
+ * Time: 19:42
+ *
+ * To change this template use Tools | Options | Coding | Edit Standard Headers.
+ */
+using System;
+using System.Collections;
+
+namespace ICSharpCode.Reports.Core.BaseClasses
+{
+ ///
+ /// Description of PageInfo.
+ ///
+ public class PageInfo
+ {
+
+ private Hashtable parameterHash;
+
+
+ public PageInfo(int pageNumber)
+ {
+ this.PageNumber = pageNumber;
+ }
+
+ public int PageNumber {get;set;}
+
+
+ public int TotalPages {get;set;}
+
+
+ public string ReportName {get;set;}
+
+
+ public string ReportFileName {get;set;}
+
+
+ public string ReportFolder {
+ get{
+ return System.IO.Path.GetDirectoryName(this.ReportFileName);
+ }
+ }
+
+
+
+ public DateTime ExecutionTime {get;set;}
+
+
+ public Hashtable ParameterHash{
+ get{
+ if (this.parameterHash == null) {
+ this.parameterHash = new Hashtable();
+ }
+ return parameterHash;
+ }
+ set {this.parameterHash = value;}
+ }
+
+
+ public IDataNavigator IDataNavigator {get;set;}
+ }
+}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs
index f3bb3690be..05f6758b68 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/Printing/PrintHelper.cs
@@ -114,8 +114,6 @@ namespace ICSharpCode.Reports.Core.BaseClasses.Printing
public static void InitPage (ISinglePage singlePage,ReportSettings reportSettings)
{
- singlePage.StartRow = -1;
- singlePage.EndRow = -1;
singlePage.ReportFileName = reportSettings.FileName;
singlePage.ReportName = reportSettings.ReportName;
singlePage.ParameterHash = reportSettings.ParameterCollection.CreateHash();
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs
index eb28498f64..679f3733ce 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SectionBounds.cs
@@ -8,7 +8,8 @@
using System;
using System.Drawing;
-namespace ICSharpCode.Reports.Core{
+namespace ICSharpCode.Reports.Core.BaseClasses
+{
///
/// Description of Page.
///
@@ -25,7 +26,6 @@ namespace ICSharpCode.Reports.Core{
Point DetailEnds {get;}
Rectangle DetailArea {get;}
Size PageSize {get;set;}
- //int Gap {get;}
bool Landscape{get;}
}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs
index 0234b0cd4e..3cb99dad1e 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/BaseClasses/SinglePage.cs
@@ -10,18 +10,19 @@ using System;
using System.Collections;
using ICSharpCode.Reports.Core.Interfaces;
-namespace ICSharpCode.Reports.Core
+namespace ICSharpCode.Reports.Core.BaseClasses
{
///
/// Description of AbstractPage.
///
- public class SinglePage : ISinglePage
+ public class SinglePage :PageInfo, ISinglePage
{
private SectionBounds sectionBounds;
- private Hashtable parameterHash;
+
- public SinglePage(SectionBounds sectionBounds, int pageNumber)
+ public SinglePage(SectionBounds sectionBounds, int pageNumber):base(pageNumber)
+
{
if (sectionBounds == null) {
throw new ArgumentNullException("sectionBounds");
@@ -66,47 +67,5 @@ namespace ICSharpCode.Reports.Core
set { this.sectionBounds = value; }
}
-
- public int StartRow {get;set;}
-
-
- public int EndRow {get;set;}
-
-
- public int PageNumber {get;set;}
-
-
- public int TotalPages {get;set;}
-
-
- public string ReportName {get;set;}
-
-
- public string ReportFileName {get;set;}
-
-
- public string ReportFolder {
- get{
- return System.IO.Path.GetDirectoryName(this.ReportFileName);
- }
- }
-
-
-
- public DateTime ExecutionTime {get;set;}
-
-
- public Hashtable ParameterHash{
- get{
- if (this.parameterHash == null) {
- this.parameterHash = new Hashtable();
- }
- return parameterHash;
- }
- set {this.parameterHash = value;}
- }
-
-
- public IDataNavigator IDataNavigator {get;set;}
}
}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
index 4cc9ef92a6..1f6d140dc5 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/BasePager.cs
@@ -9,6 +9,7 @@
using System;
using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.BaseClasses.Printing;
using ICSharpCode.Reports.Core.Interfaces;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
index 73693b86c8..16c67ca6cb 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/Converters/BaseConverter.cs
@@ -8,6 +8,7 @@
*/
using System;
using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.BaseClasses.Printing;
using ICSharpCode.Reports.Core.Events;
using ICSharpCode.Reports.Core.Interfaces;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs
index db76ed6658..63e3f05d34 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/DataPageBuilder.cs
@@ -54,9 +54,6 @@ namespace ICSharpCode.Reports.Core.Exporter
protected override void BuildNewPage ()
{
base.BuildNewPage();
- if (this.dataNavigator != null) {
- this.SinglePage.StartRow = this.dataNavigator.CurrentRow +1;
- }
this.BuildReportHeader();
this.BuildPageHeader();
@@ -65,18 +62,9 @@ namespace ICSharpCode.Reports.Core.Exporter
#endregion
- private void SetPageFull()
- {
- if (this.dataNavigator != null) {
- this.SinglePage.EndRow = this.dataNavigator.CurrentRow;
- }
- }
-
-
private void OnPageFull(object sender, NewPageEventArgs e)
{
this.SinglePage.Items.AddRange(e.ItemsList);
- SetPageFull();
PageBreak();
}
@@ -140,7 +128,6 @@ namespace ICSharpCode.Reports.Core.Exporter
convertedList = baseConverter.Convert(section,item);
base.SinglePage.Items.AddRange(convertedList);
- SetPageFull();
}
}
}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs
index c65f44705b..ede783bf42 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Exporter/ExporterPage.cs
@@ -6,6 +6,7 @@
//
using System;
+using ICSharpCode.Reports.Core.BaseClasses;
namespace ICSharpCode.Reports.Core.Exporter
{
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
index 0c32187f27..07ffdb05eb 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Expressions/SimpleExpressionEvaluator/Compilation/Functions/ReportingService/FieldReference.cs
@@ -7,8 +7,8 @@
* To change this template use Tools | Options | Coding | Edit Standard Headers.
*/
using System;
-
using ICSharpCode.Reports.Core;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Interfaces;
using SimpleExpressionEvaluator.Compilation.Functions.AggregateFunctions;
using SimpleExpressionEvaluator.Utilities;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs
index 553513d6ca..68f4f3959b 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/IItemConverter.cs
@@ -8,6 +8,7 @@
*/
using System;
using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Events;
using ICSharpCode.Reports.Core.Exporter;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs
index dcf918342d..395f122a70 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Interfaces/ISinglePage.cs
@@ -9,18 +9,13 @@
using System;
using ICSharpCode.Reports.Core;
+using ICSharpCode.Reports.Core.BaseClasses;
namespace ICSharpCode.Reports.Core.Interfaces
{
- public interface ISinglePage
+
+ public interface IPageInfo
{
- void CalculatePageBounds(IReportModel reportModel);
-
-
- SectionBounds SectionBounds {get;set;}
-
- int StartRow {get;set;}
- int EndRow {get;set;}
int PageNumber {get;set;}
int TotalPages {get;set;}
string ReportName {get;set;}
@@ -30,4 +25,11 @@ namespace ICSharpCode.Reports.Core.Interfaces
System.Collections.Hashtable ParameterHash {get;set;}
IDataNavigator IDataNavigator {get;set;}
}
+
+
+ public interface ISinglePage:IPageInfo
+ {
+ void CalculatePageBounds(IReportModel reportModel);
+ SectionBounds SectionBounds {get;set;}
+ }
}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs
index 56af2a7831..f81f0967e2 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractDataRenderer.cs
@@ -72,7 +72,6 @@ namespace ICSharpCode.Reports.Core
this.CurrentSection.Location.Y);
tableContainer.Items.SortByLocation();
- rpea.SinglePage.StartRow = this.dataNavigator.CurrentRow;
Size rs = Size.Empty;
foreach (BaseRowItem row in tableContainer.Items)
@@ -106,7 +105,6 @@ namespace ICSharpCode.Reports.Core
do {
if (PrintHelper.IsPageFull(new Rectangle(currentPosition,row.Size),this.SectionBounds)) {
tableContainer.Location = saveLocation;
- rpea.SinglePage.EndRow = this.dataNavigator.CurrentRow;
AbstractRenderer.PageBreak(rpea);
return;
}
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs
index 105e45ead9..4fed805812 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Project/Printing/AbstractRenderer.cs
@@ -11,6 +11,7 @@ using System.Drawing;
using System.Drawing.Printing;
using System.Globalization;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.BaseClasses.Printing;
using ICSharpCode.Reports.Core.Interfaces;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs
index 4028917cf1..2df4541555 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SectionBoundFixture.cs
@@ -9,6 +9,7 @@
using System;
using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Test.TestHelpers;
using NUnit.Framework;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs
index 4fd885e081..5943ebd1fd 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/Printing/SinglePageFixture.cs
@@ -9,6 +9,7 @@
using System;
using System.Drawing;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Interfaces;
using NUnit.Framework;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs
index 74bda902ae..b32c2b9c2f 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFixture.cs
@@ -10,11 +10,12 @@
using System;
using System.Data;
using System.Windows.Forms;
+using System.Xml;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Test.TestHelpers;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
using NUnit.Framework;
-using System.Xml;
namespace ICSharpCode.Reports.Core.Test.ReportingLanguage.IntegrationTests
{
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs
index ccb11cccb4..23bf19f4ab 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/AggregateFunctionsFromIListFixture.cs
@@ -9,6 +9,7 @@
using System;
using System.Data;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Test.TestHelpers;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
using NUnit.Framework;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs
index e95ff34c32..fb9ec1560f 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/ConcatFieldsFixture.cs
@@ -9,6 +9,7 @@
using System;
using System.Data;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Core.Test.TestHelpers;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
using NUnit.Framework;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs
index 8862a9ee21..f73ca42081 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/IntegrationTests/GlobalFunctions.cs
@@ -8,6 +8,7 @@
*/
using System;
+using ICSharpCode.Reports.Core.BaseClasses;
using ICSharpCode.Reports.Expressions.ReportingLanguage;
using NUnit.Framework;
using SimpleExpressionEvaluator;
diff --git a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs
index ba427109d6..bc181758b7 100644
--- a/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs
+++ b/src/AddIns/Misc/Reports/ICSharpCode.Reports.Core/Test/ICSharpCode.Reports.Core.Test/ReportingLanguage/TestHelper.cs
@@ -7,6 +7,7 @@
* Sie können diese Vorlage unter Extras > Optionen > Codeerstellung > Standardheader ändern.
*/
using System;
+using ICSharpCode.Reports.Core.BaseClasses;
namespace ICSharpCode.Reports.Core.Test.ReportingLanguage
{