|
23 | 23 | use PhpOffice\PhpPowerpoint\Shape\MemoryDrawing;
|
24 | 24 | use PhpOffice\PhpPowerpoint\Style\Alignment;
|
25 | 25 | use PhpOffice\PhpPowerpoint\Style\Color;
|
26 |
| -use PhpOffice\PhpPowerpoint\Shape\RichText\Paragraph; |
27 | 26 | use PhpOffice\PhpPowerpoint\Shape\RichText;
|
28 | 27 | use PhpOffice\PhpPowerpoint\AbstractShape;
|
29 | 28 | use PhpOffice\PhpPowerpoint\Style\Bullet;
|
@@ -1174,7 +1173,6 @@ private function readRecordOfficeArtClientAnchor($stream, $pos)
|
1174 | 1173 | break;
|
1175 | 1174 | case 0x00000010:
|
1176 | 1175 | throw new \Exception('PowerPoint97 Reader : record OfficeArtClientAnchor (0x00000010)');
|
1177 |
| - break; |
1178 | 1176 | }
|
1179 | 1177 | }
|
1180 | 1178 |
|
@@ -1405,10 +1403,10 @@ private function readRecordOfficeArtSpContainer($stream, $pos)
|
1405 | 1403 | if (is_object($this->oCurrentGroup)) {
|
1406 | 1404 | if (!$this->bFirstShapeGroup) {
|
1407 | 1405 | if ($clientAnchor['length'] > 0) {
|
1408 |
| - $this->oCurrentGroup->setOffsetX($clientAnchor['left']); |
1409 |
| - $this->oCurrentGroup->setOffsetY($clientAnchor['top']); |
1410 |
| - $this->oCurrentGroup->setHeight($clientAnchor['height']); |
1411 |
| - $this->oCurrentGroup->setWidth($clientAnchor['width']); |
| 1406 | + // $this->oCurrentGroup->setOffsetX($clientAnchor['left']); |
| 1407 | + // $this->oCurrentGroup->setOffsetY($clientAnchor['top']); |
| 1408 | + // $this->oCurrentGroup->setHeight($clientAnchor['height']); |
| 1409 | + // $this->oCurrentGroup->setWidth($clientAnchor['width']); |
1412 | 1410 | }
|
1413 | 1411 | $bIsGroup = true;
|
1414 | 1412 | $this->bFirstShapeGroup = true;
|
@@ -2238,6 +2236,8 @@ private function readRecordOfficeArtClientData($stream, $pos)
|
2238 | 2236 | /**
|
2239 | 2237 | * An atom record that specifies a persist object directory. Each persist object identifier specified MUST be unique in that persist object directory.
|
2240 | 2238 | * @link http://msdn.microsoft.com/en-us/library/dd952680(v=office.12).aspx
|
| 2239 | + * @param string $stream |
| 2240 | + * @param integer $pos |
2241 | 2241 | * @throws \Exception
|
2242 | 2242 | */
|
2243 | 2243 | private function readRecordPersistDirectoryAtom($stream, $pos)
|
@@ -2735,6 +2735,8 @@ private function readRecordSlideShowSlideInfoAtom($stream, $pos)
|
2735 | 2735 | /**
|
2736 | 2736 | * UserEditAtom
|
2737 | 2737 | * @link http://msdn.microsoft.com/en-us/library/dd945746(v=office.12).aspx
|
| 2738 | + * @param string $stream |
| 2739 | + * @param integer $pos |
2738 | 2740 | * @throws \Exception
|
2739 | 2741 | */
|
2740 | 2742 | private function readRecordUserEditAtom($stream, $pos)
|
@@ -2860,15 +2862,15 @@ private function readStructureTextCFRun($stream, $pos, $strLenRT)
|
2860 | 2862 | $arrayReturn['fontName'] = isset($this->arrayFonts[$data]) ? $this->arrayFonts[$data] : '';
|
2861 | 2863 | }
|
2862 | 2864 | if ($masksData['oldEATypeface'] == 1) {
|
2863 |
| - $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
| 2865 | + // $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
2864 | 2866 | $arrayReturn['length'] += 2;
|
2865 | 2867 | }
|
2866 | 2868 | if ($masksData['ansiTypeface'] == 1) {
|
2867 |
| - $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
| 2869 | + // $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
2868 | 2870 | $arrayReturn['length'] += 2;
|
2869 | 2871 | }
|
2870 | 2872 | if ($masksData['symbolTypeface'] == 1) {
|
2871 |
| - $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
| 2873 | + // $data = self::getInt2d($stream, $pos + $arrayReturn['length']); |
2872 | 2874 | $arrayReturn['length'] += 2;
|
2873 | 2875 | }
|
2874 | 2876 | if ($masksData['size'] == 1) {
|
@@ -2903,7 +2905,7 @@ private function readStructureTextCFRun($stream, $pos, $strLenRT)
|
2903 | 2905 | /**
|
2904 | 2906 | * A structure that specifies the paragraph-level formatting of a run of text.
|
2905 | 2907 | * @param string $stream
|
2906 |
| - * @param itn $pos |
| 2908 | + * @param integer $pos |
2907 | 2909 | * @link https://msdn.microsoft.com/en-us/library/dd923535(v=office.12).aspx
|
2908 | 2910 | */
|
2909 | 2911 | private function readStructureTextPFRun($stream, $pos, $strLenRT)
|
@@ -3068,7 +3070,7 @@ private function readStructureTextPFRun($stream, $pos, $strLenRT)
|
3068 | 3070 | /**
|
3069 | 3071 | * A structure that specifies language and spelling information for a run of text.
|
3070 | 3072 | * @param string $stream
|
3071 |
| - * @param itn $pos |
| 3073 | + * @param integer $pos |
3072 | 3074 | * @link https://msdn.microsoft.com/en-us/library/dd909603(v=office.12).aspx
|
3073 | 3075 | */
|
3074 | 3076 | private function readStructureTextSIRun($stream, $pos, $strLenRT)
|
@@ -3127,7 +3129,7 @@ private function readStructureTextSIRun($stream, $pos, $strLenRT)
|
3127 | 3129 | /**
|
3128 | 3130 | * A structure that specifies tabbing, margins, and indentation for text.
|
3129 | 3131 | * @param string $stream
|
3130 |
| - * @param int $pos |
| 3132 | + * @param integer $pos |
3131 | 3133 | * @link https://msdn.microsoft.com/en-us/library/dd922749(v=office.12).aspx
|
3132 | 3134 | */
|
3133 | 3135 | private function readStructureTextRuler($stream, $pos)
|
|
0 commit comments