@@ -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 |
@@ -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) |
@@ -104,7 +104,6 @@ discard block |
||
| 104 | 104 | |
| 105 | 105 | /** |
| 106 | 106 | * Define the path for the thumbnail file / preview picture |
| 107 | - * @param string $value |
|
| 108 | 107 | * @return \PhpOffice\PhpPresentation\PresentationProperties |
| 109 | 108 | */ |
| 110 | 109 | public function setThumbnailPath($path = '') |
@@ -118,7 +117,7 @@ discard block |
||
| 118 | 117 | /** |
| 119 | 118 | * Mark a document as final |
| 120 | 119 | * @param bool $state |
| 121 | - * @return PhpPresentation |
|
| 120 | + * @return PresentationProperties |
|
| 122 | 121 | */ |
| 123 | 122 | public function markAsFinal($state = true) |
| 124 | 123 | { |
@@ -139,8 +138,8 @@ discard block |
||
| 139 | 138 | |
| 140 | 139 | /** |
| 141 | 140 | * Set the zoom of the document (in percentage) |
| 142 | - * @param float $zoom |
|
| 143 | - * @return PhpPresentation |
|
| 141 | + * @param integer $zoom |
|
| 142 | + * @return PresentationProperties |
|
| 144 | 143 | */ |
| 145 | 144 | public function setZoom($zoom = 1) |
| 146 | 145 | { |
@@ -172,7 +171,7 @@ discard block |
||
| 172 | 171 | } |
| 173 | 172 | |
| 174 | 173 | /** |
| 175 | - * @return string |
|
| 174 | + * @return boolean |
|
| 176 | 175 | */ |
| 177 | 176 | public function getLastView() |
| 178 | 177 | { |
@@ -192,7 +191,7 @@ discard block |
||
| 192 | 191 | } |
| 193 | 192 | |
| 194 | 193 | /** |
| 195 | - * @return string |
|
| 194 | + * @return boolean |
|
| 196 | 195 | */ |
| 197 | 196 | public function isCommentVisible() |
| 198 | 197 | { |