Skip to content

Commit 05b1fcd

Browse files
committed
#226 : PowerPoint97 Reader : Support of Slide Note (PhpMd Fixes)
1 parent eb5e3c6 commit 05b1fcd

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/PhpPresentation/Reader/PowerPoint2007.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ protected function loadSlides($sPart)
287287
$slideRels = 'ppt/slides/_rels/' . basename($pathSlide) . '.rels';
288288
$this->loadRels($slideRels);
289289
$this->loadSlide($pptSlide, basename($pathSlide));
290-
foreach ($this->arrayRels[$slideRels] as $key => $rel) {
290+
foreach ($this->arrayRels[$slideRels] as $rel) {
291291
if ($rel['Type'] == 'http://schemas.openxmlformats.org/officeDocument/2006/relationships/notesSlide') {
292292
$this->loadSlideNote(basename($rel['Target']), $this->oPhpPresentation->getActiveSlide());
293293
}

src/PhpPresentation/Reader/PowerPoint97.php

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -938,9 +938,9 @@ private function readRecordDocumentContainer($stream, $pos)
938938

939939
$drawingGroup = $this->loadRecordHeader($stream, $pos);
940940
if ($drawingGroup['recVer'] == 0xF && $drawingGroup['recInstance'] == 0x000 && $drawingGroup['recType'] == self::RT_DRAWINGGROUP) {
941-
//$drawing = $this->readRecordDrawingGroupContainer($stream, $pos);
941+
$drawing = $this->readRecordDrawingGroupContainer($stream, $pos);
942942
$pos += 8;
943-
$pos += $drawingGroup['recLen'];
943+
$pos += $drawing['length'];
944944
}
945945

946946
$masterList = $this->loadRecordHeader($stream, $pos);
@@ -973,8 +973,8 @@ private function readRecordDocumentContainer($stream, $pos)
973973
$pos += 8;
974974
do {
975975
// SlideListWithTextSubContainerOrAtom
976-
$rh = $this->loadRecordHeader($stream, $pos);
977-
if ($rh['recVer'] == 0x0 && $rh['recInstance'] == 0x000 && $rh['recType'] == self::RT_SLIDEPERSISTATOM && $rh['recLen'] == 0x00000014) {
976+
$rhSlideList = $this->loadRecordHeader($stream, $pos);
977+
if ($rhSlideList['recVer'] == 0x0 && $rhSlideList['recInstance'] == 0x000 && $rhSlideList['recType'] == self::RT_SLIDEPERSISTATOM && $rhSlideList['recLen'] == 0x00000014) {
978978
$pos += 8;
979979
$slideList['recLen'] -= 8;
980980
// persistIdRef
@@ -3390,7 +3390,7 @@ private function readRecordNotesContainer($stream, $pos)
33903390

33913391
// drawing
33923392
$drawing = $this->readRecordDrawingContainer($stream, $pos);
3393-
// $pos += $drawing['length'];
3393+
$pos += $drawing['length'];
33943394

33953395
// slideSchemeColorSchemeAtom
33963396
// slideNameAtom

0 commit comments

Comments
 (0)