Merge pull request #453 from bkanber/develop

Remove % signs from PptCharts to fix chart generation. Fixes #452
PHPOffice · Feb 8, 2018 · ba7ca1a · ba7ca1a
2 parents f4e000b + 02aa18f
commit ba7ca1a
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php b/src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php
@@ -105,7 +105,7 @@ public function writeChart(Chart $chart)
 
         // c:hPercent
         $hPercent = $chart->getView3D()->getHeightPercent();
-        $objWriter->writeElementIf($hPercent != null, 'c:hPercent', 'val', $hPercent . '%');
+        $objWriter->writeElementIf($hPercent != null, 'c:hPercent', 'val', $hPercent);
 
         // c:rotY
         $objWriter->startElement('c:rotY');
@@ -2322,7 +2322,7 @@ protected function writeAxis(XMLWriter $objWriter, Chart\Axis $oAxis, $typeAxis,
 
             // c:lblOffset
             $objWriter->startElement('c:lblOffset');
-            $objWriter->writeAttribute('val', '100%');
+            $objWriter->writeAttribute('val', '100');
             $objWriter->endElement();
         }
 

diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptChartsTest.php
@@ -988,7 +988,7 @@ public function testView3D()
 
         $element = '/c:chartSpace/c:chart/c:view3D/c:hPercent';
         $this->assertZipXmlElementExists('ppt/charts/' . $oShape->getIndexedFilename(), $element);
-        $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', '100%');
+        $this->assertZipXmlAttributeEquals('ppt/charts/' . $oShape->getIndexedFilename(), $element, 'val', '100');
 
         $oShape->getView3D()->setHeightPercent(null);
         $this->resetPresentationFile();

diff --git a/tests/resources/schema/ooxml/dml-chart.xsd b/tests/resources/schema/ooxml/dml-chart.xsd
@@ -194,15 +194,15 @@
     <xsd:attribute name="val" type="ST_RotX" default="0"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_HPercent">
-    <xsd:union memberTypes="ST_HPercentWithSymbol"/>
+    <xsd:union memberTypes="ST_HPercentWithSymbol xsd:unsignedShort"/>
   </xsd:simpleType>
   <xsd:simpleType name="ST_HPercentWithSymbol">
     <xsd:restriction base="xsd:string">
       <xsd:pattern value="0*(([5-9])|([1-9][0-9])|([1-4][0-9][0-9])|500)%"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_HPercent">
-    <xsd:attribute name="val" type="ST_HPercent" default="100%"/>
+    <xsd:attribute name="val" type="ST_HPercent" default="100"/>
   </xsd:complexType>
   <xsd:simpleType name="ST_RotY">
     <xsd:restriction base="xsd:unsignedShort">
@@ -1164,15 +1164,15 @@
     </xsd:sequence>
   </xsd:complexType>
   <xsd:simpleType name="ST_LblOffset">
-    <xsd:union memberTypes="ST_LblOffsetPercent"/>
+    <xsd:union memberTypes="ST_LblOffsetPercent xsd:unsignedShort"/>
   </xsd:simpleType>
   <xsd:simpleType name="ST_LblOffsetPercent">
     <xsd:restriction base="xsd:string">
       <xsd:pattern value="0*(([0-9])|([1-9][0-9])|([1-9][0-9][0-9])|1000)%"/>
     </xsd:restriction>
   </xsd:simpleType>
   <xsd:complexType name="CT_LblOffset">
-    <xsd:attribute name="val" type="ST_LblOffset" default="100%"/>
+    <xsd:attribute name="val" type="ST_LblOffset" default="100"/>
   </xsd:complexType>
   <xsd:group name="EG_AxShared">
     <xsd:sequence>