Word2007 Reader : Support for table cell borders and margins

PHPOffice · Sep 7, 2023 · 5370f1e · 5370f1e
1 parent c17c4c7
commit 5370f1e
Show file tree

Hide file tree

Showing 5 changed files with 232 additions and 173 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -13,6 +13,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Improved TextDirection for styling a cell by @terryzwt in #2429
 - Word2007 Reader : Added option to disable loading images by @aelliott1485 in #2450
 - HTML Writer : Added border-spacing to default styles for table by @kernusr in #2451
+- Word2007 Reader : Support for table cell borders and margins by @kernusr in #2454
 
 ### Bug fixes
 

diff --git a/src/PhpWord/Reader/Word2007/AbstractPart.php b/src/PhpWord/Reader/Word2007/AbstractPart.php
@@ -385,9 +385,8 @@ protected function readTable(XMLReader $xmlReader, DOMElement $domNode, $parent,
  } elseif ('w:tc' == $rowNode->nodeName) { // Cell
  $cellWidth = $xmlReader->getAttribute('w:w', $rowNode, 'w:tcPr/w:tcW');
  $cellStyle = null;
- $cellStyleNode = $xmlReader->getElement('w:tcPr', $rowNode);
- if (null !== $cellStyleNode) {
- $cellStyle = $this->readCellStyle($xmlReader, $cellStyleNode);
+ if ($xmlReader->elementExists('w:tcPr', $rowNode)) {
+ $cellStyle = $this->readCellStyle($xmlReader, $rowNode);
  }
 
  $cell = $row->addCell($cellWidth, $cellStyle);
@@ -573,7 +572,7 @@ private function readTableIndent(XMLReader $xmlReader, DOMElement $domNode)
  /**
  * Read w:tcPr.
  *
- * @return array
+ * @return null|array
  */
  private function readCellStyle(XMLReader $xmlReader, DOMElement $domNode)
  {
@@ -585,8 +584,24 @@ private function readCellStyle(XMLReader $xmlReader, DOMElement $domNode)
  'bgColor' => [self::READ_VALUE, 'w:shd', 'w:fill'],
  'noWrap' => [self::READ_VALUE, 'w:noWrap', null, null, true],
  ];
+ $style = null;
 
- return $this->readStyleDefs($xmlReader, $domNode, $styleDefs);
+ if ($xmlReader->elementExists('w:tcPr', $domNode)) {
+ $styleNode = $xmlReader->getElement('w:tcPr', $domNode);
+
+ $borders = ['top', 'left', 'bottom', 'right'];
+ foreach ($borders as $side) {
+ $ucfSide = ucfirst($side);
+
+ $styleDefs['border' . $ucfSide . 'Size'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:sz'];
+ $styleDefs['border' . $ucfSide . 'Color'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:color'];
+ $styleDefs['border' . $ucfSide . 'Style'] = [self::READ_VALUE, 'w:tcBorders/w:' . $side, 'w:val'];
+ }
+
+ $style = $this->readStyleDefs($xmlReader, $styleNode, $styleDefs);
+ }
+
+ return $style;
  }
 
  /**

diff --git a/src/PhpWord/Style/Border.php b/src/PhpWord/Style/Border.php
@@ -22,6 +22,8 @@
  */
 class Border extends AbstractStyle
 {
+ const DEFAULT_MARGIN = 1440; // In twips.
+
  /**
  * Border Top Size.
  *
@@ -106,6 +108,34 @@ class Border extends AbstractStyle
  */
  protected $borderBottomStyle;
 
+ /**
+ * Top margin spacing.
+ *
+ * @var float|int
+ */
+ protected $marginTop = self::DEFAULT_MARGIN;
+
+ /**
+ * Left margin spacing.
+ *
+ * @var float|int
+ */
+ protected $marginLeft = self::DEFAULT_MARGIN;
+
+ /**
+ * Right margin spacing.
+ *
+ * @var float|int
+ */
+ protected $marginRight = self::DEFAULT_MARGIN;
+
+ /**
+ * Bottom margin spacing.
+ *
+ * @var float|int
+ */
+ protected $marginBottom = self::DEFAULT_MARGIN;
+
  /**
  * Get border size.
  *
@@ -501,4 +531,100 @@ public function hasBorder()
 
  return $borders !== array_filter($borders, 'is_null');
  }
+
+ /**
+ * Get Margin Top.
+ *
+ * @return float|int
+ */
+ public function getMarginTop()
+ {
+ return $this->marginTop;
+ }
+
+ /**
+ * Set Margin Top.
+ *
+ * @param float|int $value
+ *
+ * @return self
+ */
+ public function setMarginTop($value = null)
+ {
+ $this->marginTop = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+ return $this;
+ }
+
+ /**
+ * Get Margin Left.
+ *
+ * @return float|int
+ */
+ public function getMarginLeft()
+ {
+ return $this->marginLeft;
+ }
+
+ /**
+ * Set Margin Left.
+ *
+ * @param float|int $value
+ *
+ * @return self
+ */
+ public function setMarginLeft($value = null)
+ {
+ $this->marginLeft = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+ return $this;
+ }
+
+ /**
+ * Get Margin Right.
+ *
+ * @return float|int
+ */
+ public function getMarginRight()
+ {
+ return $this->marginRight;
+ }
+
+ /**
+ * Set Margin Right.
+ *
+ * @param float|int $value
+ *
+ * @return self
+ */
+ public function setMarginRight($value = null)
+ {
+ $this->marginRight = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+ return $this;
+ }
+
+ /**
+ * Get Margin Bottom.
+ *
+ * @return float|int
+ */
+ public function getMarginBottom()
+ {
+ return $this->marginBottom;
+ }
+
+ /**
+ * Set Margin Bottom.
+ *
+ * @param float|int $value
+ *
+ * @return self
+ */
+ public function setMarginBottom($value = null)
+ {
+ $this->marginBottom = $this->setNumericVal($value, self::DEFAULT_MARGIN);
+
+ return $this;
+ }
 }
diff --git a/src/PhpWord/Style/Section.php b/src/PhpWord/Style/Section.php
@@ -40,7 +40,6 @@ class Section extends Border
  */
  const DEFAULT_WIDTH = 11905.511811024; // In twips.
  const DEFAULT_HEIGHT = 16837.79527559; // In twips.
- const DEFAULT_MARGIN = 1440; // In twips.
  const DEFAULT_GUTTER = 0; // In twips.
  const DEFAULT_HEADER_HEIGHT = 720; // In twips.
  const DEFAULT_FOOTER_HEIGHT = 720; // In twips.
@@ -77,34 +76,6 @@ class Section extends Border
  */
  private $pageSizeH = self::DEFAULT_HEIGHT;
 
- /**
- * Top margin spacing.
- *
- * @var float|int
- */
- private $marginTop = self::DEFAULT_MARGIN;
-
- /**
- * Left margin spacing.
- *
- * @var float|int
- */
- private $marginLeft = self::DEFAULT_MARGIN;
-
- /**
- * Right margin spacing.
- *
- * @var float|int
- */
- private $marginRight = self::DEFAULT_MARGIN;
-
- /**
- * Bottom margin spacing.
- *
- * @var float|int
- */
- private $marginBottom = self::DEFAULT_MARGIN;
-
  /**
  * Page gutter spacing.
  *
@@ -344,102 +315,6 @@ public function setPageSizeH($value = null)
  return $this;
  }
 
- /**
- * Get Margin Top.
- *
- * @return float|int
- */
- public function getMarginTop()
- {
- return $this->marginTop;
- }
-
- /**
- * Set Margin Top.
- *
- * @param float|int $value
- *
- * @return self
- */
- public function setMarginTop($value = null)
- {
- $this->marginTop = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
- return $this;
- }
-
- /**
- * Get Margin Left.
- *
- * @return float|int
- */
- public function getMarginLeft()
- {
- return $this->marginLeft;
- }
-
- /**
- * Set Margin Left.
- *
- * @param float|int $value
- *
- * @return self
- */
- public function setMarginLeft($value = null)
- {
- $this->marginLeft = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
- return $this;
- }
-
- /**
- * Get Margin Right.
- *
- * @return float|int
- */
- public function getMarginRight()
- {
- return $this->marginRight;
- }
-
- /**
- * Set Margin Right.
- *
- * @param float|int $value
- *
- * @return self
- */
- public function setMarginRight($value = null)
- {
- $this->marginRight = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
- return $this;
- }
-
- /**
- * Get Margin Bottom.
- *
- * @return float|int
- */
- public function getMarginBottom()
- {
- return $this->marginBottom;
- }
-
- /**
- * Set Margin Bottom.
- *
- * @param float|int $value
- *
- * @return self
- */
- public function setMarginBottom($value = null)
- {
- $this->marginBottom = $this->setNumericVal($value, self::DEFAULT_MARGIN);
-
- return $this;
- }
-
  /**
  * Get gutter.
  *