Merge pull request #2811 from PHPOffice/Ods-Writer-Bugfix-Row-Height

Fix issue with row height styles in Ods Writer

Author: MarkBaker

src/PhpSpreadsheet/Writer/Ods/Cell/Style.php

@@ -199,7 +199,7 @@ protected function writeRowProperties(RowDimension $rowDimension): void
             'style:row-height',
             round($rowDimension->getRowHeight(Dimension::UOM_CENTIMETERS), 3) . 'cm'
         );
-        $this->writer->writeAttribute('style:use-optimal-row-height', 'true');
+        $this->writer->writeAttribute('style:use-optimal-row-height', 'false');
         $this->writer->writeAttribute('fo:break-before', 'auto');
 
         // End

src/PhpSpreadsheet/Writer/Ods/Content.php

@@ -151,25 +151,24 @@ private function writeRows(XMLWriter $objWriter, Worksheet $sheet, int $sheetInd
             $cellIterator = $row->getCellIterator();
             --$numberRowsRepeated;
             if ($cellIterator->valid()) {
+                $objWriter->startElement('table:table-row');
                 if ($span_row) {
-                    $objWriter->startElement('table:table-row');
                     if ($span_row > 1) {
                         $objWriter->writeAttribute('table:number-rows-repeated', $span_row);
                     }
+                    $objWriter->startElement('table:table-cell');
+                    $objWriter->writeAttribute('table:number-columns-repeated', (string) self::NUMBER_COLS_REPEATED_MAX);
+                    $objWriter->endElement();
+                    $span_row = 0;
+                } else {
                     if ($sheet->getRowDimension($row->getRowIndex())->getRowHeight() > 0) {
                         $objWriter->writeAttribute(
-                            'table:style_name',
+                            'table:style-name',
                             sprintf('%s_%d_%d', Style::ROW_STYLE_PREFIX, $sheetIndex, $row->getRowIndex())
                         );
                     }
-                    $objWriter->startElement('table:table-cell');
-                    $objWriter->writeAttribute('table:number-columns-repeated', (string) self::NUMBER_COLS_REPEATED_MAX);
-                    $objWriter->endElement();
-                    $objWriter->endElement();
-                    $span_row = 0;
+                    $this->writeCells($objWriter, $cellIterator);
                 }
-                $objWriter->startElement('table:table-row');
-                $this->writeCells($objWriter, $cellIterator);
                 $objWriter->endElement();
             } else {
                 ++$span_row;