diff --git a/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php b/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php index 4b3cbf500b6511f6660fe28c709746fa5669200d..6cd72019a601bf9ae4842ba8a53b524f479b47b9 100755 --- a/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php +++ b/functions/PEAR/Spreadsheet/Excel/Writer/Workbook.php @@ -326,6 +326,10 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri if (strlen($name) > 31) { return $this->raiseError("Sheetname $name must be <= 31 chars"); } + } else { + if (function_exists('iconv')) { + $name = iconv('UTF-8', 'UTF-16LE', $name); + } } // Check that the worksheet name doesn't already exist: a fatal Excel error. @@ -932,11 +936,15 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri } $grbit = 0x0000; // Visibility and sheet type - $cch = strlen($sheetname); // Length of sheet name + if ($this->_BIFF_version == 0x0600) { + $cch = mb_strlen($sheetname, 'UTF-16LE'); // Length of sheet name + } else { + $cch = strlen($sheetname); // Length of sheet name + } $header = pack("vv", $record, $length); if ($this->_BIFF_version == 0x0600) { - $data = pack("Vvv", $offset, $grbit, $cch); + $data = pack("VvCC", $offset, $grbit, $cch, 0x1); } else { $data = pack("VvC", $offset, $grbit, $cch); }