diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
index 1bfed8184d..c9df7fe46c 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Addin/ICSharpCode.Reports.Addin.csproj
@@ -34,6 +34,9 @@
False
+
+ ..\Libraries\itextsharp.dll
+
3.5
@@ -246,10 +249,6 @@
{4B2239FF-8FD6-431D-9D22-1B8049BA6917}
ICSharpCode.Reports.Core
-
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}
- itextsharp
-
{2A75196C-D9EB-4129-B803-931327F72D5C}
2
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
index 272e03fb45..d0468a4e35 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/ICSharpCode.Reports.Core.csproj
@@ -50,6 +50,9 @@
False
+
+ ..\Libraries\itextsharp.dll
+
3.5
@@ -378,10 +381,6 @@
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}
Irony
-
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}
- itextsharp
-
\ No newline at end of file
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs
index 3e1bb68953..72d7799fca 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/BaseStyleDecorator.cs
@@ -45,8 +45,8 @@ namespace ICSharpCode.Reports.Core.Exporter
}
- public iTextSharp.text.Color PdfBackColor {
- get { return new iTextSharp.text.Color(this.backColor.R, this.backColor.G, this.backColor.B, this.backColor.A); }
+ public iTextSharp.text.BaseColor PdfBackColor {
+ get { return new iTextSharp.text.BaseColor(this.backColor.R, this.backColor.G, this.backColor.B, this.backColor.A); }
}
@@ -56,8 +56,8 @@ namespace ICSharpCode.Reports.Core.Exporter
}
- public iTextSharp.text.Color PdfForeColor {
- get { return new iTextSharp.text.Color(this.foreColor.R, this.foreColor.G, this.foreColor.B, this.foreColor.A); }
+ public iTextSharp.text.BaseColor PdfForeColor {
+ get { return new iTextSharp.text.BaseColor(this.foreColor.R, this.foreColor.G, this.foreColor.B, this.foreColor.A); }
}
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs
index 1bd264eb31..9e86aacd3e 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Exporter/Decorators/IBaseStyleDecorator.cs
@@ -14,9 +14,9 @@ namespace ICSharpCode.Reports.Core.Exporter
{
bool DrawBorder { get; set; }
Color BackColor { get; set; }
- iTextSharp.text.Color PdfBackColor { get; }
+ iTextSharp.text.BaseColor PdfBackColor { get; }
Color ForeColor { get; set; }
- iTextSharp.text.Color PdfForeColor { get; }
+ iTextSharp.text.BaseColor PdfForeColor { get; }
Point Location { get; set; }
Size Size { get; set; }
Rectangle DisplayRectangle { get; }
diff --git a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs
index ee7b63d658..3c939dfea6 100644
--- a/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs
+++ b/src/AddIns/Misc/SharpReport/ICSharpCode.Reports.Core/Project/Printing/Graphics/FillPatterns.cs
@@ -23,14 +23,14 @@ namespace ICSharpCode.Reports.Core {
Color color;
Brush brush;
- iTextSharp.text.Color pdfColor;
+ iTextSharp.text.BaseColor pdfColor;
protected AbstractFillPattern(Color color) {
this.color = color;
}
- protected AbstractFillPattern(iTextSharp.text.Color pdfColor)
+ protected AbstractFillPattern(iTextSharp.text.BaseColor pdfColor)
{
this.pdfColor = pdfColor;
}
@@ -47,7 +47,7 @@ namespace ICSharpCode.Reports.Core {
}
}
- public iTextSharp.text.Color PdfColor {
+ public iTextSharp.text.BaseColor PdfColor {
get { return pdfColor; }
set { pdfColor = value; }
}
@@ -71,7 +71,7 @@ namespace ICSharpCode.Reports.Core {
public SolidFillPattern (Color color) :base(color){
}
- public SolidFillPattern (iTextSharp.text.Color pdfColor):base(pdfColor)
+ public SolidFillPattern (iTextSharp.text.BaseColor pdfColor):base(pdfColor)
{
}
diff --git a/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln b/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
index a502341556..9805ca7261 100644
--- a/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
+++ b/src/AddIns/Misc/SharpReport/SharpDevelop.Reports.Test.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 10.00
# Visual Studio 2008
-# SharpDevelop 3.2.0.5366
+# SharpDevelop 3.2.0.5385
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin", "ICSharpCode.Reports.Addin\ICSharpCode.Reports.Addin.csproj", "{35D002D7-C78B-44FB-92AA-104BEB431678}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Addin.Test", "ICSharpCode.Reports.Addin\Test\ICSharpCode.Reports.Addin.Test.csproj", "{2B232C7E-CFB6-4B73-A1B8-134A8A2ED4F7}"
@@ -10,8 +10,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core",
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.Reports.Core.Test", "ICSharpCode.Reports.Core\Test\ICSharpCode.Reports.Core.Test\ICSharpCode.Reports.Core.Test.csproj", "{E16B73CA-3603-47EE-915E-6F8B2A07304B}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "itextsharp", "itextsharp\itextsharp.csproj", "{84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}"
-EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Irony", "Irony\Irony.csproj", "{D81F5C91-D7DB-46E5-BC99-49488FB6814C}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ICSharpCode.SharpDevelop", "..\..\..\Main\Base\Project\ICSharpCode.SharpDevelop.csproj", "{2748AD25-9C63-4E12-877B-4DCE96FBED54}"
@@ -38,10 +36,6 @@ Global
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.Build.0 = Release|Any CPU
{E16B73CA-3603-47EE-915E-6F8B2A07304B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}.Release|Any CPU.Build.0 = Release|Any CPU
- {84C4FDD9-3ED7-453B-B9DA-B3ED52CB071C}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D81F5C91-D7DB-46E5-BC99-49488FB6814C}.Release|Any CPU.Build.0 = Release|Any CPU