Refactored the PowerPoint97 Reader for managing the group shape and …

…improving evolutions - @Progi1984 GH-110
PHPOffice · Jul 1, 2015 · 7f6cbfd · 7f6cbfd
1 parent b9ff9fc
commit 7f6cbfd
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 24 deletions.
diff --git a/composer.lock b/composer.lock
diff --git a/src/PhpPowerpoint/Reader/PowerPoint97.php b/src/PhpPowerpoint/Reader/PowerPoint97.php
@@ -1215,13 +1215,13 @@ private function readRecordOfficeArtClientTextbox($stream, $pos)
                     case self::RT_INTERACTIVEINFO:
                         //@link : http://msdn.microsoft.com/en-us/library/dd948623(v=office.12).aspx
                         if ($rhChild['recInstance'] == 0x0000) {
-                            $mouseClickInteractiveInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
-                            $arrayReturn['length'] += $mouseClickInteractiveInfo['length'];
-                            $arrayReturn['hyperlink'][]['id'] = $mouseClickInteractiveInfo['exHyperlinkIdRef'];
+                            $mouseClickInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
+                            $arrayReturn['length'] += $mouseClickInfo['length'];
+                            $arrayReturn['hyperlink'][]['id'] = $mouseClickInfo['exHyperlinkIdRef'];
                         }
                         if ($rhChild['recInstance'] == 0x0001) {
-                            $mouseOverInteractiveInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
-                            $arrayReturn['length'] += $mouseOverInteractiveInfo['length'];
+                            $mouseOverInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
+                            $arrayReturn['length'] += $mouseOverInfo['length'];
                         }
                         break;
                     case self::RT_STYLETEXTPROPATOM:
@@ -2186,12 +2186,12 @@ private function readRecordOfficeArtClientData($stream, $pos)
             $arrayReturn['length'] += $dataAnimationInfo['length'];
 
             // mouseClickInteractiveInfo (variable)
-            $mouseClickInteractiveInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
-            $arrayReturn['length'] += $mouseClickInteractiveInfo['length'];
+            $mouseClickInfo = $this->readRecordMouseClickInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
+            $arrayReturn['length'] += $mouseClickInfo['length'];
 
             // mouseOverInteractiveInfo (variable)
-            $mouseOverInteractiveInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
-            $arrayReturn['length'] += $mouseOverInteractiveInfo['length'];
+            $mouseOverInfo = $this->readRecordMouseOverInteractiveInfoContainer($stream, $pos + $arrayReturn['length']);
+            $arrayReturn['length'] += $mouseOverInfo['length'];
 
             // placeholderAtom (16 bytes)
             $dataPlaceholderAtom = $this->readRecordPlaceholderAtom($stream, $pos + $arrayReturn['length']);
@@ -2576,7 +2576,7 @@ private function readRecordSlideContainer($stream, $pos)
         $pos += $perSlideHFContainer['length'];
 
         // *** rtSlideSyncInfo12 (variable) : optional
-        $rtSlideSyncInfo12 = $this->readRecordRoundTripSlideSyncInfo12Container ($stream, $pos);
+        $rtSlideSyncInfo12 = $this->readRecordRoundTripSlideSyncInfo12Container($stream, $pos);
         $pos += $rtSlideSyncInfo12['length'];
 
         // *** drawing (variable)