]> source.dussan.org Git - redmine.git/commitdiff
PDF: fix ArgumentError MultiCell() in CJK (#8737).
authorToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 2 Jul 2011 14:59:30 +0000 (14:59 +0000)
committerToshi MARUYAMA <marutosijp2@yahoo.co.jp>
Sat, 2 Jul 2011 14:59:30 +0000 (14:59 +0000)
add dummy ln parameter at rfpdf CJK MultiCell method.
ln parameter has already added in trunk by r6131, r6132, r6133.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.2-stable@6155 e93f8b46-1217-0410-a6f0-8f06a7374b81

vendor/plugins/rfpdf/lib/fpdf/chinese.rb
vendor/plugins/rfpdf/lib/fpdf/japanese.rb
vendor/plugins/rfpdf/lib/fpdf/korean.rb

index 5edccca9f2142dfab2e8cd4c468cfb32d646ccd0..5ac279d70b5d84d7ef4ab71b120d91b5d5034640 100644 (file)
@@ -142,7 +142,7 @@ module PDF_Chinese
        return l*@font_size/1000
   end
 
-  def MultiCell(w,h,txt,border=0,align='L',fill=0)
+  def MultiCell(w,h,txt,border=0,align='L',fill=0,ln=1)
        if(@current_font['type']=='Type0')
                MBMultiCell(w,h,txt,border,align,fill)
        else
index 65ce2c40a8ea164b0a122b9275d8f32f4b9ab61c..9ac3e2778b80d295350c4c00781145c8f1a6092c 100644 (file)
@@ -118,7 +118,7 @@ module PDF_Japanese
        return l*@font_size/1000
   end
 
-  def MultiCell(w,h,txt,border=0,align='L',fill=0)
+  def MultiCell(w,h,txt,border=0,align='L',fill=0,ln=1)
        if(@current_font['type']=='Type0')
                SJISMultiCell(w,h,txt,border,align,fill)
        else
index 11df9ffb0ea604f0082ed59c20bbd10a60147f5c..fbea998e72b9911c32d52f48e06299140abf2817 100644 (file)
@@ -111,7 +111,7 @@ UHC_widths={' ' => 333, '!' => 416, '"' => 416, '#' => 833, '$' => 625, '%' => 9
        return l*@font_size/1000\r
   end\r
 \r
-  def MultiCell(w,h,txt,border=0,align='L',fill=0)\r
+  def MultiCell(w,h,txt,border=0,align='L',fill=0,ln=1)\r
        if(@current_font['type']=='Type0')\r
                MBMultiCell(w,h,txt,border,align,fill)\r
        else\r