Fixing bugs in writing out presentations:

- images in master slides are not saved
- duplicate IDs in relationships for master slides

Author: Peter Lind

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;
     }
 

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