Spreadsheet/Excel/Writer/Workbook.php
authoredward <edward@roojs.com>
Thu, 12 May 2016 06:19:02 +0000 (14:19 +0800)
committeredward <edward@roojs.com>
Thu, 12 May 2016 06:19:02 +0000 (14:19 +0800)
Spreadsheet/Excel/Writer/Parser.php

Spreadsheet/Excel/Writer/Parser.php
Spreadsheet/Excel/Writer/Workbook.php

index 9d72d11..12664c3 100644 (file)
@@ -964,9 +964,9 @@ class Spreadsheet_Excel_Writer_Parser extends PEAR
     */
     function _getSheetIndex($sheet_name)
     {
-//        if(function_exists('iconv')) {
-//            $sheet_name = @iconv('UTF-8','UTF-16LE',$sheet_name);
-//        }
+        if(function_exists('iconv')) {
+            $sheet_name = @iconv('UTF-8','UTF-16LE',$sheet_name);
+        }
         
         if (!isset($this->_ext_sheets[$sheet_name])) {
             return -1;
index dafcb8a..12a9d63 100644 (file)
@@ -323,9 +323,9 @@ class Spreadsheet_Excel_Writer_Workbook extends Spreadsheet_Excel_Writer_BIFFwri
                 return $this->raiseError("Sheetname $name must be <= 31 chars");
             }
         } else {
-//            if(function_exists('iconv')) {
-//                $name = @iconv('UTF-8','UTF-16LE',$name);
-//            }
+            if(function_exists('iconv')) {
+                $name = @iconv('UTF-8','UTF-16LE',$name);
+            }
         }
 
         // Check that the worksheet name doesn't already exist: a fatal Excel error.