Skip to content

Commit 6614239

Browse files
committed
Refactored the PowerPoint97 Reader for managing the group shape and improving evolutions - @Progi1984 GH-110
1 parent b9ff9fc commit 6614239

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/PhpPowerpoint/Reader/PowerPoint97.php

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1215,13 +1215,13 @@ private function readRecordOfficeArtClientTextbox($stream, $pos)
12151215
case self::RT_INTERACTIVEINFO:
12161216
//@link : http://msdn.microsoft.com/en-us/library/dd948623(v=office.12).aspx
12171217
if ($rhChild['recInstance'] == 0x0000) {
1218-
$mouseClickInteractiveInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
1219-
$arrayReturn['length'] += $mouseClickInteractiveInfo['length'];
1220-
$arrayReturn['hyperlink'][]['id'] = $mouseClickInteractiveInfo['exHyperlinkIdRef'];
1218+
$mouseClickInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
1219+
$arrayReturn['length'] += $mouseClickInfo['length'];
1220+
$arrayReturn['hyperlink'][]['id'] = $mouseClickInfo['exHyperlinkIdRef'];
12211221
}
12221222
if ($rhChild['recInstance'] == 0x0001) {
1223-
$mouseOverInteractiveInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
1224-
$arrayReturn['length'] += $mouseOverInteractiveInfo['length'];
1223+
$mouseOverInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
1224+
$arrayReturn['length'] += $mouseOverInfo['length'];
12251225
}
12261226
break;
12271227
case self::RT_STYLETEXTPROPATOM:
@@ -2186,12 +2186,12 @@ private function readRecordOfficeArtClientData($stream, $pos)
21862186
$arrayReturn['length'] += $dataAnimationInfo['length'];
21872187

21882188
// mouseClickInteractiveInfo (variable)
2189-
$mouseClickInteractiveInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
2190-
$arrayReturn['length'] += $mouseClickInteractiveInfo['length'];
2189+
$mouseClickInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
2190+
$arrayReturn['length'] += $mouseClickInfo['length'];
21912191

21922192
// mouseOverInteractiveInfo (variable)
2193-
$mouseOverInteractiveInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
2194-
$arrayReturn['length'] += $mouseOverInteractiveInfo['length'];
2193+
$mouseOverInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
2194+
$arrayReturn['length'] += $mouseOverInfo['length'];
21952195

21962196
// placeholderAtom (16 bytes)
21972197
$dataPlaceholderAtom = $this->readRecordPlaceholderAtom($stream, $pos + $arrayReturn['length']);
@@ -2576,7 +2576,7 @@ private function readRecordSlideContainer($stream, $pos)
25762576
$pos += $perSlideHFContainer['length'];
25772577

25782578
// *** rtSlideSyncInfo12 (variable) : optional
2579-
$rtSlideSyncInfo12 = $this->readRecordRoundTripSlideSyncInfo12Container ($stream, $pos);
2579+
$rtSlideSyncInfo12 = $this->readRecordRoundTripSlideSyncInfo12Container($stream, $pos);
25802580
$pos += $rtSlideSyncInfo12['length'];
25812581

25822582
// *** drawing (variable)

0 commit comments

Comments
 (0)