Merge 037ec30 into ad70328

PHPOffice · Dec 11, 2023 · 425b29b · 425b29b
2 parents ad70328 + 037ec30
commit 425b29b
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/docs/changes/1.1.0.md b/docs/changes/1.1.0.md
@@ -30,6 +30,7 @@
 - PowerPoint2007 Writer : Fixed broken video file relationship - [@potofcoffee](https://github.com/potofcoffee) in [#776](https://github.com/PHPOffice/PHPPresentation/pull/776)
 - PowerPoint2007 Writer : Fixed issue when first element in series is null - [@ksmeeks0001](https://github.com/ksmeeks0001) in [#778](https://github.com/PHPOffice/PHPPresentation/pull/778)
 - PowerPoint2007 & ODPresentation Writer : Use of the disk caching directory for temporary files - [@nhalle](https://github.com/nhalle) in [#781](https://github.com/PHPOffice/PHPPresentation/pull/781)
+- PowerPoint2007 Reader : Fixed reading of RichText shape in Note - [@aelliott1485](https://github.com/aelliott1485) in [#782](https://github.com/PHPOffice/PHPPresentation/pull/782)
 
 ## Miscellaneous
 

diff --git a/src/PhpPresentation/Reader/PowerPoint2007.php b/src/PhpPresentation/Reader/PowerPoint2007.php
@@ -890,7 +890,10 @@ protected function loadShapeDrawing(XMLReader $document, DOMElement $node, Abstr
         $oSlide->addShape($oShape);
     }
 
-    protected function loadShapeRichText(XMLReader $document, DOMElement $node, AbstractSlide $oSlide): void
+    /**
+     * @param AbstractSlide|Note $oSlide
+     */
+    protected function loadShapeRichText(XMLReader $document, DOMElement $node, $oSlide): void
     {
         if (!$document->elementExists('p:txBody/a:p/a:r', $node)) {
             return;
@@ -1386,11 +1389,15 @@ protected function loadSlideShapes($oSlide, DOMNodeList $oElements, XMLReader $x
             }
             switch ($oNode->tagName) {
                 case 'p:graphicFrame':
-                    $this->loadShapeTable($xmlReader, $oNode, $oSlide);
+                    if ($oSlide instanceof AbstractSlide) {
+                        $this->loadShapeTable($xmlReader, $oNode, $oSlide);
+                    }
 
                     break;
                 case 'p:pic':
-                    $this->loadShapeDrawing($xmlReader, $oNode, $oSlide);
+                    if ($oSlide instanceof AbstractSlide) {
+                        $this->loadShapeDrawing($xmlReader, $oNode, $oSlide);
+                    }
 
                     break;
                 case 'p:sp':

diff --git a/tests/PhpPresentation/Tests/Reader/PowerPoint2007Test.php b/tests/PhpPresentation/Tests/Reader/PowerPoint2007Test.php
@@ -643,4 +643,12 @@ public function testLoadFileWithInvalidImages(): void
         self::assertInstanceOf('PhpOffice\\PhpPresentation\\PhpPresentation', $oPhpPresentation);
         self::assertEquals(1, $oPhpPresentation->getSlideCount());
     }
+
+    public function testLoadingFileWithNoteInSlide(): void
+    {
+        $file = PHPPRESENTATION_TESTS_BASE_DIR . '/resources/files/PPTX_SlideNoteWithRichText.pptx';
+        $object = new PowerPoint2007();
+        $oPhpPresentation = $object->load($file);
+        self::assertInstanceOf('PhpOffice\\PhpPresentation\\PhpPresentation', $oPhpPresentation);
+    }
 }
diff --git a/tests/resources/files/PPTX_SlideNoteWithRichText.pptx b/tests/resources/files/PPTX_SlideNoteWithRichText.pptx