alex
/
PhpSpreadsheet
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'charts' into develop

This commit is contained in:
Mark Baker 2012-08-04 16:11:25 +01:00
parent b8150a1b9c 7d13b6de2e
commit b2b66ecfd4
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Classes/PHPExcel/Writer/Excel2007/Chart.php
View File

@ -444,7 +444,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if (is_array($caption)) if (is_array($caption))
$caption = $caption[0]; $caption = $caption[0];
$objWriter->startElement('a:t'); $objWriter->startElement('a:t');
$objWriter->writeAttribute('xml:space', 'preserve'); // $objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption )); $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement(); $objWriter->endElement();
@ -570,7 +570,7 @@ class PHPExcel_Writer_Excel2007_Chart extends PHPExcel_Writer_Excel2007_WriterPa
if (is_array($caption)) if (is_array($caption))
$caption = $caption[0]; $caption = $caption[0];
$objWriter->startElement('a:t'); $objWriter->startElement('a:t');
$objWriter->writeAttribute('xml:space', 'preserve'); // $objWriter->writeAttribute('xml:space', 'preserve');
$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption )); $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $caption ));
$objWriter->endElement(); $objWriter->endElement();

2
Classes/PHPExcel/Writer/Excel2007/StringTable.php
View File

@ -286,7 +286,7 @@ class PHPExcel_Writer_Excel2007_StringTable extends PHPExcel_Writer_Excel2007_Wr
// t // t
$objWriter->startElement($prefix.'t'); $objWriter->startElement($prefix.'t');
$objWriter->writeAttribute('xml:space', 'preserve'); // $objWriter->writeAttribute('xml:space', 'preserve'); // Excel2010 accepts, Excel2007 complains
$objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() )); $objWriter->writeRawData(PHPExcel_Shared_String::ControlCharacterPHP2OOXML( $element->getText() ));
$objWriter->endElement(); $objWriter->endElement();

2
changelog.txt
View File

@ -97,6 +97,8 @@ Fixed in develop branch:
- Bugfix: (MBaker) Work Item 18415 - mb_stripos empty delimiter - Bugfix: (MBaker) Work Item 18415 - mb_stripos empty delimiter
- Bugfix: (takaakik) Work Item 15455 - getNestingLevel() Error on Excel5 Read - Bugfix: (takaakik) Work Item 15455 - getNestingLevel() Error on Excel5 Read
- Bugfix: (MBaker) Fix to Excel5 Reader when cell annotations are defined before their referenced text objects - Bugfix: (MBaker) Fix to Excel5 Reader when cell annotations are defined before their referenced text objects
- Bugfix: (MBaker) OOCalc Reader modified to process number-rows-repeated
- Bugfix: (MBaker) Work item 18377 - Chart Title compatibility on Excel 2007
2012-05-19 (v1.7.7): 2012-05-19 (v1.7.7):