Word2007 Reader: Fixed cast of spacing

Progi1984 · Progi1984 · commit 9b3ee4886a7b · 2024-09-05T09:22:05.000+02:00
diff --git a/docs/changes/1.2.0.md b/docs/changes/1.2.0.md
@@ -8,6 +8,8 @@
 
 ## Bug fixes
 
+- Word2007 Reader: Fixed cast of spacing fixing [#729](https://github.com/PHPOffice/PHPPresentation/pull/729), [#796](https://github.com/PHPOffice/PHPPresentation/pull/796) in [#818](https://github.com/PHPOffice/PHPPresentation/pull/818)
+
 ## Miscellaneous
 
 ## BC Breaks
diff --git a/src/PhpPresentation/Reader/PowerPoint2007.php b/src/PhpPresentation/Reader/PowerPoint2007.php
@@ -1205,20 +1205,20 @@ protected function loadParagraph(XMLReader $document, DOMElement $oElement, $oSh
             $oElementLineSpacingPoints = $document->getElement('a:lnSpc/a:spcPts', $oSubElement);
             if ($oElementLineSpacingPoints instanceof DOMElement) {
                 $oParagraph->setLineSpacingMode(Paragraph::LINE_SPACING_MODE_POINT);
-                $oParagraph->setLineSpacing((int) $oElementLineSpacingPoints->getAttribute('val') / 100);
+                $oParagraph->setLineSpacing((int) ((int) $oElementLineSpacingPoints->getAttribute('val') / 100));
             }
             $oElementLineSpacingPercent = $document->getElement('a:lnSpc/a:spcPct', $oSubElement);
             if ($oElementLineSpacingPercent instanceof DOMElement) {
                 $oParagraph->setLineSpacingMode(Paragraph::LINE_SPACING_MODE_PERCENT);
-                $oParagraph->setLineSpacing((int) $oElementLineSpacingPercent->getAttribute('val') / 1000);
+                $oParagraph->setLineSpacing((int) ((int) $oElementLineSpacingPercent->getAttribute('val') / 1000));
             }
             $oElementSpacingBefore = $document->getElement('a:spcBef/a:spcPts', $oSubElement);
             if ($oElementSpacingBefore instanceof DOMElement) {
-                $oParagraph->setSpacingBefore((int) $oElementSpacingBefore->getAttribute('val') / 100);
+                $oParagraph->setSpacingBefore((int) ((int) $oElementSpacingBefore->getAttribute('val') / 100));
             }
             $oElementSpacingAfter = $document->getElement('a:spcAft/a:spcPts', $oSubElement);
             if ($oElementSpacingAfter instanceof DOMElement) {
-                $oParagraph->setSpacingAfter((int) $oElementSpacingAfter->getAttribute('val') / 100);
+                $oParagraph->setSpacingAfter((int) ((int) $oElementSpacingAfter->getAttribute('val') / 100));
             }
 
             $oParagraph->getBulletStyle()->setBulletType(Bullet::TYPE_NONE);
diff --git a/src/PhpPresentation/Shape/RichText/Paragraph.php b/src/PhpPresentation/Shape/RichText/Paragraph.php
@@ -320,7 +320,7 @@ public function getLineSpacing(): int
      *
      * @param int $lineSpacing
      */
-    public function setLineSpacing($lineSpacing): self
+    public function setLineSpacing(int $lineSpacing): self
     {
         $this->lineSpacing = $lineSpacing;
 

Original file line number	Diff line number	Diff line change
`@@ -1205,20 +1205,20 @@ protected function loadParagraph(XMLReader $document, DOMElement $oElement, $oSh`
`1205`	`1205`	`$oElementLineSpacingPoints = $document->getElement('a:lnSpc/a:spcPts', $oSubElement);`
`1206`	`1206`	`if ($oElementLineSpacingPoints instanceof DOMElement) {`
`1207`	`1207`	`$oParagraph->setLineSpacingMode(Paragraph::LINE_SPACING_MODE_POINT);`
`1208`		`- $oParagraph->setLineSpacing((int) $oElementLineSpacingPoints->getAttribute('val') / 100);`
	`1208`	`+ $oParagraph->setLineSpacing((int) ((int) $oElementLineSpacingPoints->getAttribute('val') / 100));`
`1209`	`1209`	`}`
`1210`	`1210`	`$oElementLineSpacingPercent = $document->getElement('a:lnSpc/a:spcPct', $oSubElement);`
`1211`	`1211`	`if ($oElementLineSpacingPercent instanceof DOMElement) {`
`1212`	`1212`	`$oParagraph->setLineSpacingMode(Paragraph::LINE_SPACING_MODE_PERCENT);`
`1213`		`- $oParagraph->setLineSpacing((int) $oElementLineSpacingPercent->getAttribute('val') / 1000);`
	`1213`	`+ $oParagraph->setLineSpacing((int) ((int) $oElementLineSpacingPercent->getAttribute('val') / 1000));`
`1214`	`1214`	`}`
`1215`	`1215`	`$oElementSpacingBefore = $document->getElement('a:spcBef/a:spcPts', $oSubElement);`
`1216`	`1216`	`if ($oElementSpacingBefore instanceof DOMElement) {`
`1217`		`- $oParagraph->setSpacingBefore((int) $oElementSpacingBefore->getAttribute('val') / 100);`
	`1217`	`+ $oParagraph->setSpacingBefore((int) ((int) $oElementSpacingBefore->getAttribute('val') / 100));`
`1218`	`1218`	`}`
`1219`	`1219`	`$oElementSpacingAfter = $document->getElement('a:spcAft/a:spcPts', $oSubElement);`
`1220`	`1220`	`if ($oElementSpacingAfter instanceof DOMElement) {`
`1221`		`- $oParagraph->setSpacingAfter((int) $oElementSpacingAfter->getAttribute('val') / 100);`
	`1221`	`+ $oParagraph->setSpacingAfter((int) ((int) $oElementSpacingAfter->getAttribute('val') / 100));`
`1222`	`1222`	`}`
`1223`	`1223`
`1224`	`1224`	`$oParagraph->getBulletStyle()->setBulletType(Bullet::TYPE_NONE);`
Original file line number	Diff line number	Diff line change
`@@ -320,7 +320,7 @@ public function getLineSpacing(): int`
`320`	`320`	`*`
`321`	`321`	`* @param int $lineSpacing`
`322`	`322`	`*/`
`323`		`- public function setLineSpacing($lineSpacing): self`
	`323`	`+ public function setLineSpacing(int $lineSpacing): self`
`324`	`324`	`{`
`325`	`325`	`$this->lineSpacing = $lineSpacing;`
`326`	`326`