mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 22:08:20 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch 'MDL-36845' of git://github.com/timhunt/moodle

Browse Source
This commit is contained in:
Dan Poltawski 2012-12-11 11:58:44 +08:00
commit cdb7110f72
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/excellib.class.php
View File

@ -74,8 +74,8 @@ class MoodleExcelWorkbook {
* @param string $name Name of the sheet
* @return object MoodleExcelWorksheet
*/
function &add_worksheet($name = '') {
/// Create the Moodle Worksheet. Returns one pointer to it
function add_worksheet($name = '') {
// Create the Moodle Worksheet. Returns one pointer to it
$ws = new MoodleExcelWorksheet ($name, $this->pear_excel_workbook, $this->latin_output);
return $ws;
}
@ -138,6 +138,9 @@ class MoodleExcelWorksheet {
*/
function MoodleExcelWorksheet($name, &$workbook, $latin_output=false) {
// Replace any characters in the name that Excel cannot cope with.
$name = strtr($name, '[]*/\?:', ' ');
if (strlen($name) > 31) {
// Excel does not seem able to cope with sheet names > 31 chars.
// With $latin_output = false, it does not cope at all.

2
lib/tablelib.php
View File

@ -1495,7 +1495,7 @@ class table_spreadsheet_export_format_parent extends table_default_export_format
}
function start_table($sheettitle) {
$this->worksheet =& $this->workbook->add_worksheet($sheettitle);
$this->worksheet = $this->workbook->add_worksheet($sheettitle);
$this->rownum=0;
}