ODPresentation Writer : Title in Legend in chart doesn't displayed - @…

…Progi1984 GH-79
PHPOffice · Jun 3, 2015 · e08f708 · e08f708
1 parent 3d80595
commit e08f708
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,7 @@
 
 ### Bugfix
 - PSR-0 via composer broken - @Progi1984 GH-51
+- ODPresentation Writer : Title in Legend in chart doesn't displayed - @Progi1984 GH-79
 - PowerPoint2007 Writer : Fill don't work for RichTextShapes - @Progi1984 GH-61
 - PowerPoint2007 Writer : Border don't work for RichTextShapes - @Progi1984 GH-61
 - PowerPoint2007 Writer : Hyperlink in table doesn't work - @Progi1984 GH-70

diff --git a/src/PhpPowerpoint/Writer/ODPresentation/Content.php b/src/PhpPowerpoint/Writer/ODPresentation/Content.php
@@ -328,7 +328,7 @@ public function writeShapePic(XMLWriter $objWriter, AbstractDrawing $shape)
         $objWriter->writeElement('text:p');
         $objWriter->endElement();
 
-        if ($shape->getHyperlink()) {
+        if ($shape->hasHyperlink()) {
             // office:event-listeners
             $objWriter->startElement('office:event-listeners');
             // presentation:event-listener
@@ -574,7 +574,7 @@ public function writeShapeTable(XMLWriter $objWriter, Table $shape)
                             if ($shapeRichText instanceof Run) {
                                 $objWriter->writeAttribute('text:style-name', 'T_' . $shapeRichText->getFont()->getHashCode());
                             }
-                            if ($shapeRichText->hasHyperlink() == true && $shapeRichText->getHyperlink()->getUrl() != '') {
+                            if ($shapeRichText->hasHyperlink()) {
                                 // text:a
                                 $objWriter->startElement('text:a');
                                 $objWriter->writeAttribute('xlink:href', $shapeRichText->getHyperlink()->getUrl());

diff --git a/src/PhpPowerpoint/Writer/ODPresentation/ObjectsChart.php b/src/PhpPowerpoint/Writer/ODPresentation/ObjectsChart.php
@@ -623,6 +623,19 @@ private function writeTable()
         $this->xmlContent->endElement();
         // > table:table-header-columns
         $this->xmlContent->endElement();
+
+        // table:table-columns
+        $this->xmlContent->startElement('table:table-columns');
+        // table:table-column
+        $this->xmlContent->startElement('table:table-column');
+        if (!empty($this->arrayData)) {
+            $rowFirst = reset($this->arrayData);
+            $this->xmlContent->writeAttribute('table:number-columns-repeated', count($rowFirst) - 1);
+        }
+        // > table:table-column
+        $this->xmlContent->endElement();
+        // > table:table-columns
+        $this->xmlContent->endElement();
 
         // table:table-header-rows
         $this->xmlContent->startElement('table:table-header-rows');
@@ -633,7 +646,9 @@ private function writeTable()
             foreach ($rowFirst as $key => $cell) {
                 // table:table-cell
                 $this->xmlContent->startElement('table:table-cell');
-                $this->xmlContent->writeAttribute('office:value', 'string');
+                if (isset($this->arrayTitle[$key - 1])) {
+                    $this->xmlContent->writeAttribute('office:value-type', 'string');
+                }
                 // text:p
                 $this->xmlContent->startElement('text:p');
                 if (isset($this->arrayTitle[$key - 1])) {

diff --git a/tests/PhpPowerpoint/Tests/Writer/ODPresentation/ChartsTest.php b/tests/PhpPowerpoint/Tests/Writer/ODPresentation/ChartsTest.php
@@ -205,4 +205,31 @@ public function testChartScatter()
         $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
         $this->assertEquals('chart:scatter', $pres->getElementAttribute($element, 'chart:class', 'Object 1/content.xml'));
     }
+
+    public function testLegend()
+    {
+        $oSeries = new Series('Series', array('Jan' => 1, 'Feb' => 5, 'Mar' => 2));
+        $oSeries->setShowSeriesName(true);
+
+        $oLine = new Line();
+        $oLine->addSeries($oSeries);
+
+        $phpPowerPoint = new PhpPowerpoint();
+        $oSlide = $phpPowerPoint->getActiveSlide();
+        $oChart = $oSlide->createChartShape();
+        $oChart->getPlotArea()->setType($oLine);
+
+        $pres = TestHelperDOCX::getDocument($phpPowerPoint, 'ODPresentation');
+
+        $element = '/office:document-content/office:body/office:chart/chart:chart/chart:legend';
+        $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
+        $element = '/office:document-content/office:body/office:chart/chart:chart/table:table/table:table-header-rows';
+        $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
+        $element = '/office:document-content/office:body/office:chart/chart:chart/table:table/table:table-header-rows/table:table-row';
+        $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
+        $element = '/office:document-content/office:body/office:chart/chart:chart/table:table/table:table-header-rows/table:table-row/table:table-cell';
+        $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
+        $element = '/office:document-content/office:body/office:chart/chart:chart/table:table/table:table-header-rows/table:table-row/table:table-cell[@office:value-type=\'string\']';
+        $this->assertTrue($pres->elementExists($element, 'Object 1/content.xml'));
+    }
 }