Fixed Doughnut

Author: Progi1984

src/PhpPresentation/Writer/PowerPoint2007/PptCharts.php

@@ -1247,9 +1247,7 @@ protected function writeTypeBar3D(XMLWriter $objWriter, Bar3D $subject, bool $in
     }
 
     /**
-     * Write Type Pie.
-     *
-     * @param XMLWriter $objWriter XML Writer
+     * Write Type Doughnut.
      */
     protected function writeTypeDoughnut(XMLWriter $objWriter, Doughnut $subject, bool $includeSheet = false): void
     {
@@ -1348,22 +1346,6 @@ protected function writeTypeDoughnut(XMLWriter $objWriter, Doughnut $subject, bo
                 // c:dLbls\c:txPr\a:p
                 $objWriter->startElement('a:p');
 
-                $this->writeElementWithValAttribute($objWriter, 'c:showLegendKey', $series->hasShowLegendKey() ? '1' : '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showVal', $series->hasShowValue() ? '1' : '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showCatName', $series->hasShowCategoryName() ? '1' : '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showSerName', $series->hasShowSeriesName() ? '1' : '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showPercent', $series->hasShowPercentage() ? '1' : '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showBubbleSize', '0');
-                $this->writeElementWithValAttribute($objWriter, 'c:showLeaderLines', $series->hasShowLeaderLines() ? '1' : '0');
-
-                // c:dLbls\c:txPr
-                $objWriter->startElement('c:txPr');
-                $objWriter->writeElement('a:bodyPr', null);
-                $objWriter->writeElement('a:lstStyle', null);
-
-                // c:dLbls\c:txPr\a:p
-                $objWriter->startElement('a:p');
-
                 // c:dLbls\c:txPr\a:p\a:pPr
                 $objWriter->startElement('a:pPr');
 
@@ -1406,6 +1388,14 @@ protected function writeTypeDoughnut(XMLWriter $objWriter, Doughnut $subject, bo
                 // c:dLbls\c:txPr\
                 $objWriter->endElement();
 
+                $this->writeElementWithValAttribute($objWriter, 'c:showLegendKey', $series->hasShowLegendKey() ? '1' : '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showVal', $series->hasShowValue() ? '1' : '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showCatName', $series->hasShowCategoryName() ? '1' : '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showSerName', $series->hasShowSeriesName() ? '1' : '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showPercent', $series->hasShowPercentage() ? '1' : '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showBubbleSize', '0');
+                $this->writeElementWithValAttribute($objWriter, 'c:showLeaderLines', $series->hasShowLeaderLines() ? '1' : '0');
+
                 $separator = $series->getSeparator();
                 if (!empty($separator) && PHP_EOL != $separator) {
                     // c:dLbls\c:separator