[prev in list] [next in list] [prev in thread] [next in thread] 

List:       pear-cvs
Subject:    [PEAR-CVS] =?utf-8?q?svn:_/pear/packages/Spreadsheet=5FExcel=5FWriter/trunk/Spreadsheet/Excel/Writer
From:       LEFEVRE_Franck <progi1984 () php ! net>
Date:       2010-03-31 10:28:04
Message-ID: svn-progi1984-1270031284-297215-407534725 () svn ! php ! net
[Download RAW message or body]

progi1984                                Wed, 31 Mar 2010 10:28:04 +0000

Revision: http://svn.php.net/viewvc?view=revision&revision=297215

Log:
Fixed issue #9062: Euro does not appear correctly in formula styles - patch by \
fvielle

Bug: http://pear.php.net/bugs/9062 (unknown) 
      
Changed paths:
    U   pear/packages/Spreadsheet_Excel_Writer/trunk/Spreadsheet/Excel/Writer/Workbook.php


Modified: pear/packages/Spreadsheet_Excel_Writer/trunk/Spreadsheet/Excel/Writer/Workbook.php
 ===================================================================
--- pear/packages/Spreadsheet_Excel_Writer/trunk/Spreadsheet/Excel/Writer/Workbook.php	2010-03-31 \
                09:46:10 UTC (rev 297214)
+++ pear/packages/Spreadsheet_Excel_Writer/trunk/Spreadsheet/Excel/Writer/Workbook.php	2010-03-31 \
10:28:04 UTC (rev 297215) @@ -1014,12 +1014,23 @@
             $length    = 3 + strlen($format);      // Number of bytes to follow
         }

-        $cch       = strlen($format);             // Length of format string
+        if ( $this->_BIFF_version == 0x0600 && function_exists('iconv') ) {     // \
Encode format String +            if (mb_detect_encoding($format, 'auto') !== \
'UTF-16LE'){ +                $format = iconv(mb_detect_encoding($format, \
'auto'),'UTF-16LE',$format); +            }
+            $encoding = 1;
+            $cch = function_exists('mb_strlen') ? mb_strlen($format, 'UTF-16LE') : \
(strlen($format) / 2); +        } else {
+            $encoding = 0;
+            $cch  = strlen($format);             // Length of format string
+        }
+        $length = strlen($format);

-        $header    = pack("vv", $record, $length);
         if ($this->_BIFF_version == 0x0600) {
+            $header    = pack("vv", $record, 5 + $length);
             $data      = pack("vvC", $ifmt, $cch, $encoding);
         } elseif ($this->_BIFF_version == 0x0500) {
+            $header    = pack("vv", $record, 3 + $length);
             $data      = pack("vC", $ifmt, $cch);
         }
         $this->_append($header . $data . $format);



-- 
PEAR CVS Mailing List (http://pear.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

[prev in list] [next in list] [prev in thread] [next in thread]