@@ -455,7 +455,6 @@ |
||
| 455 | 455 | |
| 456 | 456 | /** |
| 457 | 457 | * Read Paragraph Item |
| 458 | - * @param RichText $oShape |
|
| 459 | 458 | * @param \DOMElement $oNodeParent |
| 460 | 459 | */ |
| 461 | 460 | protected function readParagraphItem(Paragraph $oParagraph, \DOMElement $oNodeParent) |
@@ -319,7 +319,7 @@ |
||
| 319 | 319 | * Write picture |
| 320 | 320 | * |
| 321 | 321 | * @param \PhpOffice\Common\XMLWriter $objWriter |
| 322 | - * @param \PhpOffice\PhpPresentation\Shape\AbstractDrawing $shape |
|
| 322 | + * @param ShapeDrawing\AbstractDrawingAdapter $shape |
|
| 323 | 323 | */ |
| 324 | 324 | public function writeShapeDrawing(XMLWriter $objWriter, ShapeDrawing\AbstractDrawingAdapter $shape) |
| 325 | 325 | { |
@@ -5,7 +5,6 @@ |
||
| 5 | 5 | use PhpOffice\Common\Drawing as CommonDrawing; |
| 6 | 6 | use PhpOffice\Common\Text; |
| 7 | 7 | use PhpOffice\Common\XMLWriter; |
| 8 | -use PhpOffice\PhpPresentation\Shape\AbstractDrawing; |
|
| 9 | 8 | use PhpOffice\PhpPresentation\Shape\Chart as ShapeChart; |
| 10 | 9 | use PhpOffice\PhpPresentation\Shape\Comment; |
| 11 | 10 | use PhpOffice\PhpPresentation\Shape\Drawing as ShapeDrawing; |
@@ -118,7 +118,7 @@ discard block |
||
| 118 | 118 | /** |
| 119 | 119 | * Mark a document as final |
| 120 | 120 | * @param bool $state |
| 121 | - * @return PhpPresentation |
|
| 121 | + * @return PresentationProperties |
|
| 122 | 122 | */ |
| 123 | 123 | public function markAsFinal($state = true) |
| 124 | 124 | { |
@@ -139,8 +139,8 @@ discard block |
||
| 139 | 139 | |
| 140 | 140 | /** |
| 141 | 141 | * Set the zoom of the document (in percentage) |
| 142 | - * @param float $zoom |
|
| 143 | - * @return PhpPresentation |
|
| 142 | + * @param integer $zoom |
|
| 143 | + * @return PresentationProperties |
|
| 144 | 144 | */ |
| 145 | 145 | public function setZoom($zoom = 1) |
| 146 | 146 | { |
@@ -192,7 +192,7 @@ discard block |
||
| 192 | 192 | } |
| 193 | 193 | |
| 194 | 194 | /** |
| 195 | - * @return string |
|
| 195 | + * @return boolean |
|
| 196 | 196 | */ |
| 197 | 197 | public function isCommentVisible() |
| 198 | 198 | { |
@@ -246,7 +246,7 @@ discard block |
||
| 246 | 246 | /** |
| 247 | 247 | * Extract all MasterSlides |
| 248 | 248 | * @param XMLReader $xmlReader |
| 249 | - * @param $fileRels |
|
| 249 | + * @param string $fileRels |
|
| 250 | 250 | */ |
| 251 | 251 | protected function loadMasterSlides(XMLReader $xmlReader, $fileRels) |
| 252 | 252 | { |
@@ -352,6 +352,9 @@ discard block |
||
| 352 | 352 | } |
| 353 | 353 | } |
| 354 | 354 | |
| 355 | + /** |
|
| 356 | + * @param string $baseFile |
|
| 357 | + */ |
|
| 355 | 358 | private function loadMasterSlide($sPart, $baseFile) |
| 356 | 359 | { |
| 357 | 360 | $xmlReader = new XMLReader(); |
@@ -402,6 +405,9 @@ discard block |
||
| 402 | 405 | } |
| 403 | 406 | } |
| 404 | 407 | |
| 408 | + /** |
|
| 409 | + * @param string $baseFile |
|
| 410 | + */ |
|
| 405 | 411 | private function loadLayoutSlide($sPart, $baseFile, SlideMaster $oSlideMaster) |
| 406 | 412 | { |
| 407 | 413 | $xmlReader = new XMLReader(); |
@@ -759,8 +765,8 @@ discard block |
||
| 759 | 765 | |
| 760 | 766 | /** |
| 761 | 767 | * @param $oSlide |
| 762 | - * @param $oElements |
|
| 763 | - * @param $xmlReader |
|
| 768 | + * @param \DOMNodeList $oElements |
|
| 769 | + * @param XMLReader $xmlReader |
|
| 764 | 770 | * @internal param $baseFile |
| 765 | 771 | */ |
| 766 | 772 | private function loadSlideShapes($oSlide, $oElements, $xmlReader) |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | |
| 66 | 66 | /** |
| 67 | 67 | * @param mixed $type |
| 68 | - * @return string |
|
| 68 | + * @return Placeholder |
|
| 69 | 69 | */ |
| 70 | 70 | public function setType($type) |
| 71 | 71 | { |
@@ -21,9 +21,6 @@ |
||
| 21 | 21 | use PhpOffice\Common\Adapter\Zip\ZipArchiveAdapter; |
| 22 | 22 | use PhpOffice\PhpPresentation\HashTable; |
| 23 | 23 | use PhpOffice\PhpPresentation\PhpPresentation; |
| 24 | -use PhpOffice\PhpPresentation\Shape\AbstractDrawing; |
|
| 25 | -use PhpOffice\PhpPresentation\Shape\Chart as ChartShape; |
|
| 26 | -use PhpOffice\PhpPresentation\Shape\Table; |
|
| 27 | 24 | use PhpOffice\PhpPresentation\Writer\PowerPoint2007\LayoutPack\AbstractLayoutPack; |
| 28 | 25 | use PhpOffice\PhpPresentation\Writer\PowerPoint2007\LayoutPack\PackDefault; |
| 29 | 26 | |
@@ -3,11 +3,7 @@ |
||
| 3 | 3 | |
| 4 | 4 | use PhpOffice\Common\Drawing as CommonDrawing; |
| 5 | 5 | use PhpOffice\Common\XMLWriter; |
| 6 | -use PhpOffice\PhpPresentation\Shape\AbstractDrawing; |
|
| 7 | -use PhpOffice\PhpPresentation\Shape\Chart as ShapeChart; |
|
| 8 | -use PhpOffice\PhpPresentation\Shape\Comment; |
|
| 9 | 6 | use PhpOffice\PhpPresentation\Shape\RichText; |
| 10 | -use PhpOffice\PhpPresentation\Shape\Table as ShapeTable; |
|
| 11 | 7 | use PhpOffice\PhpPresentation\Slide; |
| 12 | 8 | use PhpOffice\PhpPresentation\Slide\SlideMaster; |
| 13 | 9 | use PhpOffice\PhpPresentation\Style\SchemeColor; |
@@ -190,7 +190,6 @@ discard block |
||
| 190 | 190 | * Find specific slide layout id. |
| 191 | 191 | * |
| 192 | 192 | * @param string $name |
| 193 | - * @param int $masterId |
|
| 194 | 193 | * @return int |
| 195 | 194 | * @throws \Exception |
| 196 | 195 | */ |
@@ -209,7 +208,6 @@ discard block |
||
| 209 | 208 | * Find specific slide layout name. |
| 210 | 209 | * |
| 211 | 210 | * @param int $idLayout |
| 212 | - * @param int $masterId |
|
| 213 | 211 | * @return int |
| 214 | 212 | * @throws \Exception |
| 215 | 213 | */ |