Merge branch 'myfix' into develop

Peter Lind · Peter Lind · commit 2549058a2158 · 2017-06-08T15:47:14.000+02:00
diff --git a/src/PhpPresentation/Writer/AbstractWriter.php b/src/PhpPresentation/Writer/AbstractWriter.php
@@ -96,11 +96,12 @@ protected function allDrawings()
         // Get an array of all drawings
         $aDrawings  = array();
 
-        // Loop trough PhpPresentation
-        foreach ($this->getPhpPresentation()->getAllSlides() as $oSlide) {
+        // Loop through PhpPresentation
+        foreach (array_merge($this->getPhpPresentation()->getAllSlides(), $this->getPhpPresentation()->getAllMasterSlides()) as $oSlide) {
             $arrayReturn = $this->iterateCollection($oSlide->getShapeCollection()->getIterator());
             $aDrawings = array_merge($aDrawings, $arrayReturn);
         }
+
         return $aDrawings;
     }
 
diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptSlideMasters.php b/src/PhpPresentation/Writer/PowerPoint2007/PptSlideMasters.php
@@ -55,7 +55,7 @@ public function writeSlideMasterRelationships(SlideMaster $oMasterSlide)
             $slideLayout->relationId = 'rId' . $relId;
         }
         // Write drawing relationships?
-        $this->writeDrawingRelations($oMasterSlide, $objWriter, $relId);
+        $this->writeDrawingRelations($oMasterSlide, $objWriter, ++$relId);
         // TODO: Write hyperlink relationships?
         // TODO: Write comment relationships
         // Relationship theme/theme1.xml

Original file line number	Diff line number	Diff line change
`@@ -96,11 +96,12 @@ protected function allDrawings()`
`96`	`96`	`// Get an array of all drawings`
`97`	`97`	`$aDrawings = array();`
`98`	`98`
`99`		`- // Loop trough PhpPresentation`
`100`		`- foreach ($this->getPhpPresentation()->getAllSlides() as $oSlide) {`
	`99`	`+ // Loop through PhpPresentation`
	`100`	`+ foreach (array_merge($this->getPhpPresentation()->getAllSlides(), $this->getPhpPresentation()->getAllMasterSlides()) as $oSlide) {`
`101`	`101`	`$arrayReturn = $this->iterateCollection($oSlide->getShapeCollection()->getIterator());`
`102`	`102`	`$aDrawings = array_merge($aDrawings, $arrayReturn);`
`103`	`103`	`}`
	`104`	`+`
`104`	`105`	`return $aDrawings;`
`105`	`106`	`}`
`106`	`107`
Original file line number	Diff line number	Diff line change
`@@ -55,7 +55,7 @@ public function writeSlideMasterRelationships(SlideMaster $oMasterSlide)`
`55`	`55`	`$slideLayout->relationId = 'rId' . $relId;`
`56`	`56`	`}`
`57`	`57`	`// Write drawing relationships?`
`58`		`- $this->writeDrawingRelations($oMasterSlide, $objWriter, $relId);`
	`58`	`+ $this->writeDrawingRelations($oMasterSlide, $objWriter, ++$relId);`
`59`	`59`	`// TODO: Write hyperlink relationships?`
`60`	`60`	`// TODO: Write comment relationships`
`61`	`61`	`// Relationship theme/theme1.xml`