Merge pull request #2 from cedricmartel/pr/1

merge back
cedricmartel · Sep 19, 2016 · 8f5eabf · 8f5eabf
2 parents 33bd20c + 0831b12
commit 8f5eabf
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/Moon.PDFTemplate/Image.cs b/Moon.PDFTemplate/Image.cs
@@ -99,8 +99,14 @@ private void _init()
             SetXandWidth(X, PDFDraw.Helper.GetFloatAttributeValue(WidthAttributeConstant, Attributes, 50) );
         }
 
-
-		public override void SetXandWidth(float x, float width)
+
+        /// <summary>
+        /// Sets X position and width.
+        /// 20150203 :: Changed to virtual. Set internal vars.
+        /// </summary>
+        /// <param name="x"></param>
+        /// <param name="width"></param>
+        public override void SetXandWidth(float x, float width)
 		{
 			base.SetXandWidth(x, width);
 		}

diff --git a/Moon.PDFTemplateItextSharp/Generators/BodyGenerator.cs b/Moon.PDFTemplateItextSharp/Generators/BodyGenerator.cs
@@ -30,7 +30,7 @@ public BodyGenerator(PDFTemplate.PDFTemplate template, XmlNode bodyNodeXml)
         }
 
         /// <summary>
-        /// draw row & table items inside body. 
+        /// draw row and table items inside body. 
         /// table items are treated as tables 
         /// </summary>
         public void DrawBody(Hashtable data, IPDFDraw drawer)

diff --git a/external.references/itextsharp.dll b/external.references/itextsharp.dll
diff --git a/external.references/itextsharp.xtra.dll b/external.references/itextsharp.xtra.dll
diff --git a/testPDFTemplateItextSharp/Program.cs b/testPDFTemplateItextSharp/Program.cs
@@ -19,7 +19,10 @@ public static void TestArStatementXML()
             // need to load CJK b4 create PDFTemplateItextSharp
             // itextsharp.dll 5.3.5 ok
             // itextsharp.dll 5.1.3 not ok
-            iTextSharp.text.pdf.BaseFont.AddToResourceSearch("iTextAsian.dll"); // iTextAsian.dll 2.1.0.0
+            //iTextSharp.text.pdf.BaseFont.AddToResourceSearch("iTextAsian.dll"); // iTextAsian.dll 2.1.0.0
+
+            // istextsharp.dll 5.5.9 ok
+            iTextSharp.text.io.StreamUtil.AddToResourceSearch("iTextAsian.dll"); // iTextAsian.dll 2.1.0.0
 
             Moon.PDFTemplateItextSharp.PDFTemplateItextSharp pdfTpl = 
                 new Moon.PDFTemplateItextSharp.PDFTemplateItextSharp(@"file\ar_statement.xml");