Merge pull request #294 from jrking4/develop

Fix Missing SlideLayout
PHPOffice · Nov 16, 2016 · c7ca3b4 · c7ca3b4
2 parents 2e9a958 + 0ba3e33
commit c7ca3b4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 0.8.0 - WIP
+
+### Bugfix
+- PowerPoint2007 Writer : The presentation need repairs on Mac @jrking4 GH-266 GH-276
+
 ## 0.7.0 - 2016-09-12
 
 ### Bugfix

diff --git a/src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php b/src/PhpPresentation/Writer/PowerPoint2007/PptSlides.php
@@ -79,10 +79,11 @@ protected function writeSlideRelationships(Slide $pSlide)
         $idxSlide = $pSlide->getParent()->getIndex($pSlide);
 
         // Write slideLayout relationship
+        $layoutId = 1;
         if ($pSlide->getSlideLayout()) {
             $layoutId = $pSlide->getSlideLayout()->layoutNr;
-            $this->writeRelationship($objWriter, $relId++, 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout', '../slideLayouts/slideLayout' . $layoutId . '.xml');
         }
+        $this->writeRelationship($objWriter, $relId, 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/slideLayout', '../slideLayouts/slideLayout' . $layoutId . '.xml');
 
         // Write drawing relationships?
         if ($pSlide->getShapeCollection()->count() > 0) {

diff --git a/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptSlidesTest.php b/tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptSlidesTest.php
@@ -709,6 +709,14 @@ public function testRichTextVertical()
         $this->assertEquals('vert', $pres->getElementAttribute($element, 'vert', 'ppt/slides/slide1.xml'));
     }
 
+    public function testSlideLayoutExists()
+    {
+        $oPhpPresentation = new PhpPresentation();
+
+        $pres = TestHelperDOCX::getDocument($oPhpPresentation, 'PowerPoint2007');
+        $this->assertTrue($pres->fileExists('ppt/slideLayouts/slideLayout1.xml'));
+    }
+
     public function testStyleSubScript()
     {
         $oPhpPresentation = new PhpPresentation();