Merge pull request #1352 from troosan/column_width_for_odt

troosan · web-flow · commit 4fa945561f02 · 2018-06-03T23:09:33.000+02:00
write column width in ODT writer
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -36,6 +36,7 @@ v0.15.0 (?? ??? 2018)
 - Fix colspan and rowspan for tables in HTML Writer @mattbolt #1292
 - Fix parsing of Heading and Title formating @troosan @gthomas2 #465
 - Fix Dateformat typo, fix hours casing, add Month-Day-Year formats @ComputerTinker #591
+- Fix missing column width in ODText writer @potofcoffee #413
 
 ### Changed
 - Remove zend-stdlib dependency @Trainmaster #1284
diff --git a/samples/Sample_01_SimpleText.php b/samples/Sample_01_SimpleText.php
@@ -1,6 +1,5 @@
 <?php
 use PhpOffice\PhpWord\Style\Font;
-use PhpOffice\PhpWord\Style\Paragraph;
 
 include_once 'Sample_Header.php';
 
diff --git a/src/PhpWord/Element/Table.php b/src/PhpWord/Element/Table.php
@@ -135,18 +135,40 @@ public function setWidth($width)
     public function countColumns()
     {
         $columnCount = 0;
-        if (is_array($this->rows)) {
-            $rowCount = count($this->rows);
-            for ($i = 0; $i < $rowCount; $i++) {
-                /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
-                $row = $this->rows[$i];
-                $cellCount = count($row->getCells());
-                if ($columnCount < $cellCount) {
-                    $columnCount = $cellCount;
-                }
+
+        $rowCount = count($this->rows);
+        for ($i = 0; $i < $rowCount; $i++) {
+            /** @var \PhpOffice\PhpWord\Element\Row $row Type hint */
+            $row = $this->rows[$i];
+            $cellCount = count($row->getCells());
+            if ($columnCount < $cellCount) {
+                $columnCount = $cellCount;
             }
         }
 
         return $columnCount;
     }
+
+    /**
+     * The first declared cell width for each column
+     *
+     * @return int[]
+     */
+    public function findFirstDefinedCellWidths()
+    {
+        $cellWidths = array();
+
+        foreach ($this->rows as $row) {
+            $cells = $row->getCells();
+            if (count($cells) <= count($cellWidths)) {
+                continue;
+            }
+            $cellWidths = array();
+            foreach ($cells as $cell) {
+                $cellWidths[] = $cell->getWidth();
+            }
+        }
+
+        return $cellWidths;
+    }
 }
diff --git a/src/PhpWord/Style/Table.php b/src/PhpWord/Style/Table.php
@@ -163,6 +163,13 @@ class Table extends Border
     /** @var TblWidthComplexType|null */
     private $indent;
 
+    /**
+     * The width of each column, computed based on the max cell width of each column
+     *
+     * @var int[]
+     */
+    private $columnWidths;
+
     /**
      * Create new table style
      *
@@ -748,4 +755,24 @@ public function setIndent(TblWidthComplexType $indent)
 
         return $this;
     }
+
+    /**
+     * Get the columnWidths
+     *
+     * @return number[]
+     */
+    public function getColumnWidths()
+    {
+        return $this->columnWidths;
+    }
+
+    /**
+     * The column widths
+     *
+     * @param int[] $value
+     */
+    public function setColumnWidths(array $value = null)
+    {
+        $this->columnWidths = $value;
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Element/Table.php b/src/PhpWord/Writer/ODText/Element/Table.php
@@ -17,6 +17,10 @@
 
 namespace PhpOffice\PhpWord\Writer\ODText\Element;
 
+use PhpOffice\Common\XMLWriter;
+use PhpOffice\PhpWord\Element\Row as RowElement;
+use PhpOffice\PhpWord\Element\Table as TableElement;
+
 /**
  * Table element writer
  *
@@ -36,32 +40,59 @@ public function write()
         }
         $rows = $element->getRows();
         $rowCount = count($rows);
-        $colCount = $element->countColumns();
 
         if ($rowCount > 0) {
             $xmlWriter->startElement('table:table');
             $xmlWriter->writeAttribute('table:name', $element->getElementId());
             $xmlWriter->writeAttribute('table:style', $element->getElementId());
 
-            $xmlWriter->startElement('table:table-column');
-            $xmlWriter->writeAttribute('table:number-columns-repeated', $colCount);
-            $xmlWriter->endElement(); // table:table-column
+            // Write columns
+            $this->writeColumns($xmlWriter, $element);
 
+            // Write rows
             foreach ($rows as $row) {
-                $xmlWriter->startElement('table:table-row');
-                /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
-                foreach ($row->getCells() as $cell) {
-                    $xmlWriter->startElement('table:table-cell');
-                    $xmlWriter->writeAttribute('office:value-type', 'string');
-
-                    $containerWriter = new Container($xmlWriter, $cell);
-                    $containerWriter->write();
-
-                    $xmlWriter->endElement(); // table:table-cell
-                }
-                $xmlWriter->endElement(); // table:table-row
+                $this->writeRow($xmlWriter, $row);
             }
             $xmlWriter->endElement(); // table:table
         }
     }
+
+    /**
+     * Write column.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Table $element
+     */
+    private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
+    {
+        $colCount = $element->countColumns();
+
+        for ($i = 0; $i < $colCount; $i++) {
+            $xmlWriter->startElement('table:table-column');
+            $xmlWriter->writeAttribute('table:style-name', $element->getElementId() . '.' . $i);
+            $xmlWriter->endElement();
+        }
+    }
+
+    /**
+     * Write row.
+     *
+     * @param \PhpOffice\Common\XMLWriter $xmlWriter
+     * @param \PhpOffice\PhpWord\Element\Row $row
+     */
+    private function writeRow(XMLWriter $xmlWriter, RowElement $row)
+    {
+        $xmlWriter->startElement('table:table-row');
+        /** @var $row \PhpOffice\PhpWord\Element\Row Type hint */
+        foreach ($row->getCells() as $cell) {
+            $xmlWriter->startElement('table:table-cell');
+            $xmlWriter->writeAttribute('office:value-type', 'string');
+
+            $containerWriter = new Container($xmlWriter, $cell);
+            $containerWriter->write();
+
+            $xmlWriter->endElement(); // table:table-cell
+        }
+        $xmlWriter->endElement(); // table:table-row
+    }
 }
diff --git a/src/PhpWord/Writer/ODText/Part/Content.php b/src/PhpWord/Writer/ODText/Part/Content.php
@@ -239,13 +239,15 @@ private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyl
                 $style->setStyleName('fr' . $element->getMediaIndex());
                 $this->autoStyles['Image'][] = $style;
             } elseif ($element instanceof Table) {
+                /** @var \PhpOffice\PhpWord\Style\Table $style */
                 $style = $element->getStyle();
                 if ($style === null) {
                     $style = new TableStyle();
                 } elseif (is_string($style)) {
                     $style = Style::getStyle($style);
                 }
                 $style->setStyleName($element->getElementId());
+                $style->setColumnWidths($element->findFirstDefinedCellWidths());
                 $this->autoStyles['Table'][] = $style;
             }
         }
diff --git a/src/PhpWord/Writer/ODText/Style/Table.php b/src/PhpWord/Writer/ODText/Style/Table.php
@@ -45,5 +45,19 @@ public function write()
         $xmlWriter->writeAttribute('table:align', 'center');
         $xmlWriter->endElement(); // style:table-properties
         $xmlWriter->endElement(); // style:style
+
+        $cellWidths = $style->getColumnWidths();
+        $countCellWidths = count($cellWidths);
+
+        for ($i = 0; $i < $countCellWidths; $i++) {
+            $width = $cellWidths[$i];
+            $xmlWriter->startElement('style:style');
+            $xmlWriter->writeAttribute('style:name', $style->getStyleName() . '.' . $i);
+            $xmlWriter->writeAttribute('style:family', 'table-column');
+            $xmlWriter->startElement('style:table-column-properties');
+            $xmlWriter->writeAttribute('style:column-width', number_format($width * 0.0017638889, 2, '.', '') . 'cm');
+            $xmlWriter->endElement(); // style:table-column-properties
+            $xmlWriter->endElement(); // style:style
+        }
     }
 }
diff --git a/src/PhpWord/Writer/Word2007/Element/Table.php b/src/PhpWord/Writer/Word2007/Element/Table.php
@@ -76,21 +76,7 @@ public function write()
      */
     private function writeColumns(XMLWriter $xmlWriter, TableElement $element)
     {
-        $rows = $element->getRows();
-        $rowCount = count($rows);
-
-        $cellWidths = array();
-        for ($i = 0; $i < $rowCount; $i++) {
-            $row = $rows[$i];
-            $cells = $row->getCells();
-            if (count($cells) <= count($cellWidths)) {
-                continue;
-            }
-            $cellWidths = array();
-            foreach ($cells as $cell) {
-                $cellWidths[] = $cell->getWidth();
-            }
-        }
+        $cellWidths = $element->findFirstDefinedCellWidths();
 
         $xmlWriter->startElement('w:tblGrid');
         foreach ($cellWidths as $width) {
diff --git a/tests/PhpWord/Style/PaperTest.php b/tests/PhpWord/Style/PaperTest.php
@@ -17,7 +17,6 @@
 
 namespace PhpOffice\PhpWord\Style;
 
-use PhpOffice\PhpWord\PhpWord;
 use PhpOffice\PhpWord\TestHelperDOCX;
 
 /**
diff --git a/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php b/tests/PhpWord/Writer/Word2007/Part/SettingsTest.php
@@ -20,7 +20,6 @@
 use PhpOffice\PhpWord\ComplexType\ProofState;
 use PhpOffice\PhpWord\ComplexType\TrackChangesView;
 use PhpOffice\PhpWord\PhpWord;
-use PhpOffice\PhpWord\Settings;
 use PhpOffice\PhpWord\Shared\Microsoft\PasswordEncoder;
 use PhpOffice\PhpWord\SimpleType\Zoom;
 use PhpOffice\PhpWord\Style\Language;

Original file line number	Diff line number	Diff line change
`@@ -239,13 +239,15 @@ private function getContainerStyle($container, &$paragraphStyleCount, &$fontStyl`
`239`	`239`	`$style->setStyleName('fr' . $element->getMediaIndex());`
`240`	`240`	`$this->autoStyles['Image'][] = $style;`
`241`	`241`	`} elseif ($element instanceof Table) {`
	`242`	`+ /** @var \PhpOffice\PhpWord\Style\Table $style */`
`242`	`243`	`$style = $element->getStyle();`
`243`	`244`	`if ($style === null) {`
`244`	`245`	`$style = new TableStyle();`
`245`	`246`	`} elseif (is_string($style)) {`
`246`	`247`	`$style = Style::getStyle($style);`
`247`	`248`	`}`
`248`	`249`	`$style->setStyleName($element->getElementId());`
	`250`	`+ $style->setColumnWidths($element->findFirstDefinedCellWidths());`
`249`	`251`	`$this->autoStyles['Table'][] = $style;`
`250`	`252`	`}`
`251`	`253`	`}`