Minor charting fixes

PHPOffice · Oct 26, 2012 · 9be433a · 9be433a
1 parent a3303cd
commit 9be433a
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/Classes/PHPExcel/Chart/DataSeriesValues.php b/Classes/PHPExcel/Chart/DataSeriesValues.php
@@ -289,6 +289,12 @@ public function refresh(PHPExcel_Worksheet $worksheet, $flatten = TRUE) {
 			);
 			if ($flatten) {
 				$this->_dataValues = PHPExcel_Calculation_Functions::flattenArray($newDataValues);
+				foreach($this->_dataValues as &$dataValue) {
+					if ((!empty($dataValue)) && ($dataValue[0] == '#')) {
+						$dataValue = 0.0;
+					}
+				}
+				unset($dataValue);
 			} else {
 				$cellRange = explode('!',$this->_dataSource);
 				if (count($cellRange) > 1) {

diff --git a/Classes/PHPExcel/Reader/Excel2007/Chart.php b/Classes/PHPExcel/Reader/Excel2007/Chart.php
@@ -347,6 +347,10 @@ private static function _chartDataSeriesValues($seriesValueSet,$dataType='n') {
 			}
 		}
 
+		if (empty($seriesVal)) {
+			$seriesVal = NULL;
+		}
+
 		return array( 'formatCode'	=> $formatCode,
 					  'pointCount'	=> $pointCount,
 					  'dataValues'	=> $seriesVal

diff --git a/Classes/PHPExcel/Writer/Excel2007/Chart.php b/Classes/PHPExcel/Writer/Excel2007/Chart.php
@@ -463,13 +463,13 @@ private function _writeCatAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $xAx
 						$objWriter->endElement();
 					$objWriter->endElement();
 
+					$layout = $xAxisLabel->getLayout();
+					$this->_writeLayout($layout, $objWriter);
+
 					$objWriter->startElement('c:overlay');
 						$objWriter->writeAttribute('val', 0);
 					$objWriter->endElement();
 
-					$layout = $xAxisLabel->getLayout();
-					$this->_writeLayout($layout, $objWriter);
-
 				$objWriter->endElement();
 
 			}
@@ -589,15 +589,15 @@ private function _writeValAx($objWriter, PHPExcel_Chart_PlotArea $plotArea, $yAx
 						$objWriter->endElement();
 					$objWriter->endElement();
 
-					$objWriter->startElement('c:overlay');
-						$objWriter->writeAttribute('val', 0);
-					$objWriter->endElement();
-
 					if ($groupType !== PHPExcel_Chart_DataSeries::TYPE_BUBBLECHART) {
 						$layout = $yAxisLabel->getLayout();
 						$this->_writeLayout($layout, $objWriter);
 					}
 
+					$objWriter->startElement('c:overlay');
+						$objWriter->writeAttribute('val', 0);
+					$objWriter->endElement();
+
 				$objWriter->endElement();
 			}
 

diff --git a/Classes/PHPExcel/Writer/Excel2007/Worksheet.php b/Classes/PHPExcel/Writer/Excel2007/Worksheet.php
@@ -652,7 +652,9 @@ private function _writeProtectedRanges(PHPExcel_Shared_XMLWriter $objWriter = nu
 					$objWriter->startElement('protectedRange');
 					$objWriter->writeAttribute('name',		'p' . md5($protectedCell));
 					$objWriter->writeAttribute('sqref',	$protectedCell);
-					$objWriter->writeAttribute('password',	$passwordHash);
+					if (!empty($passwordHash)) {
+						$objWriter->writeAttribute('password',	$passwordHash);
+					}
 					$objWriter->endElement();
 				}