@@ -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) |
@@ -21,14 +21,12 @@ |
||
21 | 21 | use PhpOffice\Common\XMLReader; |
22 | 22 | use PhpOffice\Common\Drawing as CommonDrawing; |
23 | 23 | use PhpOffice\PhpPresentation\PhpPresentation; |
24 | -use PhpOffice\PhpPresentation\Shape\Hyperlink; |
|
25 | 24 | use PhpOffice\PhpPresentation\Shape\MemoryDrawing; |
26 | 25 | use PhpOffice\PhpPresentation\Style\Bullet; |
27 | 26 | use PhpOffice\PhpPresentation\Style\Color; |
28 | 27 | use PhpOffice\PhpPresentation\Style\Font; |
29 | 28 | use PhpOffice\PhpPresentation\Style\Shadow; |
30 | 29 | use PhpOffice\PhpPresentation\Style\Alignment; |
31 | -use PhpOffice\PhpPresentation\Style\PhpOffice\PhpPresentation\Style; |
|
32 | 30 | use PhpOffice\PhpPresentation\Shape\RichText; |
33 | 31 | use PhpOffice\PhpPresentation\Shape\RichText\Paragraph; |
34 | 32 | use PhpOffice\Common\PhpOffice\Common; |
@@ -425,6 +425,9 @@ |
||
425 | 425 | $this->oPhpPresentation->getActiveSlide()->addShape($oShape); |
426 | 426 | } |
427 | 427 | |
428 | + /** |
|
429 | + * @param string $baseFile |
|
430 | + */ |
|
428 | 431 | protected function loadShapeRichText(XMLReader $document, \DOMElement $node, $baseFile) |
429 | 432 | { |
430 | 433 | // Core |
@@ -74,7 +74,6 @@ discard block |
||
74 | 74 | |
75 | 75 | /** |
76 | 76 | * Define the path for the thumbnail file / preview picture |
77 | - * @param string $value |
|
78 | 77 | * @return \PhpOffice\PhpPresentation\PresentationProperties |
79 | 78 | */ |
80 | 79 | public function setThumbnailPath($path = '') |
@@ -88,7 +87,7 @@ discard block |
||
88 | 87 | /** |
89 | 88 | * Mark a document as final |
90 | 89 | * @param bool $state |
91 | - * @return PhpPresentation |
|
90 | + * @return PresentationProperties |
|
92 | 91 | */ |
93 | 92 | public function markAsFinal($state = true) |
94 | 93 | { |
@@ -109,8 +108,8 @@ discard block |
||
109 | 108 | |
110 | 109 | /** |
111 | 110 | * Set the zoom of the document (in percentage) |
112 | - * @param float $zoom |
|
113 | - * @return PhpPresentation |
|
111 | + * @param integer $zoom |
|
112 | + * @return PresentationProperties |
|
114 | 113 | */ |
115 | 114 | public function setZoom($zoom = 1) |
116 | 115 | { |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | /** |
109 | 109 | * Set Document Layout |
110 | 110 | * |
111 | - * @param array|string $pValue |
|
111 | + * @param string $pValue |
|
112 | 112 | * @param boolean $isLandscape |
113 | 113 | * @return \PhpOffice\PhpPresentation\DocumentLayout |
114 | 114 | */ |
@@ -174,7 +174,7 @@ discard block |
||
174 | 174 | * |
175 | 175 | * @param float $value |
176 | 176 | * @param float $unit |
177 | - * @return integer |
|
177 | + * @return DocumentLayout |
|
178 | 178 | */ |
179 | 179 | public function setCX($value, $unit = self::UNIT_EMU) |
180 | 180 | { |
@@ -188,7 +188,7 @@ discard block |
||
188 | 188 | * |
189 | 189 | * @param float $value |
190 | 190 | * @param float $unit |
191 | - * @return integer |
|
191 | + * @return DocumentLayout |
|
192 | 192 | */ |
193 | 193 | public function setCY($value, $unit = self::UNIT_EMU) |
194 | 194 | { |
@@ -291,7 +291,7 @@ |
||
291 | 291 | * |
292 | 292 | * @param \PhpOffice\Common\XMLWriter $objWriter XML Writer |
293 | 293 | * @param boolean $isReference |
294 | - * @param mixed $value |
|
294 | + * @param string $value |
|
295 | 295 | * @param string $reference |
296 | 296 | */ |
297 | 297 | protected function writeSingleValueOrReference($objWriter, $isReference, $value, $reference) |
@@ -539,7 +539,7 @@ |
||
539 | 539 | /** |
540 | 540 | * Write Comment |
541 | 541 | * @param XMLWriter $objWriter |
542 | - * @param Comment $shape |
|
542 | + * @param Comment $oShape |
|
543 | 543 | */ |
544 | 544 | public function writeShapeComment(XMLWriter $objWriter, Comment $oShape) |
545 | 545 | { |
@@ -29,7 +29,6 @@ |
||
29 | 29 | use PhpOffice\PhpPresentation\Shape\Chart\Type\Bar; |
30 | 30 | use PhpOffice\PhpPresentation\Shape\Chart\Type\Bar3D; |
31 | 31 | use PhpOffice\PhpPresentation\Shape\Chart\Type\Line; |
32 | -use PhpOffice\PhpPresentation\Shape\Chart\Type\Pie; |
|
33 | 32 | use PhpOffice\PhpPresentation\Shape\Chart\Type\Pie3D; |
34 | 33 | use PhpOffice\PhpPresentation\Shape\Chart\Type\Scatter; |
35 | 34 | use PhpOffice\PhpPresentation\Style\Fill; |
@@ -285,6 +285,11 @@ |
||
285 | 285 | } |
286 | 286 | } |
287 | 287 | |
288 | + /** |
|
289 | + * @param Chart\Gridlines $oGridlines |
|
290 | + * @param string $styleName |
|
291 | + * @param string $chartClass |
|
292 | + */ |
|
288 | 293 | protected function writeGridline($oGridlines, $styleName, $chartClass) |
289 | 294 | { |
290 | 295 | if (!($oGridlines instanceof Chart\Gridlines)) { |