Fix to prevent non-comment objects from throwing errors when retrieving the set of comment objects from the XML

git-svn-id: https://phpexcel.svn.codeplex.com/svn/trunk@69155 2327b42d-5241-43d6-9e2a-de5ac946f064
This commit is contained in:
Mark Baker 2011-02-22 14:02:27 +00:00
parent a07dd58fc7
commit f27b3d7815
1 changed files with 6 additions and 3 deletions

View File

@ -510,11 +510,14 @@ class PHPExcel_Reader_Gnumeric implements PHPExcel_Reader_IReader
if ((!$this->_readDataOnly) && (isset($sheet->Objects))) { if ((!$this->_readDataOnly) && (isset($sheet->Objects))) {
foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) { foreach($sheet->Objects->children('gnm',TRUE) as $key => $comment) {
$commentAttributes = $comment->attributes(); $commentAttributes = $comment->attributes();
// Only comment objects are handled at the moment
if ($commentAttributes->Text) {
$objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound ) $objPHPExcel->getActiveSheet()->getComment( (string)$commentAttributes->ObjectBound )
->setAuthor( (string)$commentAttributes->Author ) ->setAuthor( (string)$commentAttributes->Author )
->setText($this->_parseRichText((string)$commentAttributes->Text) ); ->setText($this->_parseRichText((string)$commentAttributes->Text) );
} }
} }
}
// echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />'; // echo '$maxCol=',$maxCol,'; $maxRow=',$maxRow,'<br />';
// //
foreach($sheet->Styles->StyleRegion as $styleRegion) { foreach($sheet->Styles->StyleRegion as $styleRegion) {