Ods\Writer\Content: added support for xr styles (bold, italic, font family, font size, underline, bg color)

src/PhpSpreadsheet/Writer/Ods/Content.php

@@ -30,6 +30,8 @@ namespace PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Cell;
 use PhpOffice\PhpSpreadsheet\Shared\XMLWriter;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Worksheet;
 use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Writer\Exception;
@@ -47,6 +49,7 @@ class Content extends WriterPart
 {
     const NUMBER_COLS_REPEATED_MAX = 1024;
     const NUMBER_ROWS_REPEATED_MAX = 1048576;
+    const CELL_STYLE_PREFIX = 'ce';
 
     /**
      * Write content.xml to XML format.
@@ -105,7 +108,11 @@ class Content extends WriterPart
 
         $objWriter->writeElement('office:scripts');
         $objWriter->writeElement('office:font-face-decls');
-        $objWriter->writeElement('office:automatic-styles');
+
+        // Styles XF
+        $objWriter->startElement('office:automatic-styles');
+        $this->writeXfStyles($objWriter, $this->getParentWriter()->getSpreadsheet());
+        $objWriter->endElement();
 
         $objWriter->startElement('office:body');
         $objWriter->startElement('office:spreadsheet');
@@ -193,12 +200,20 @@ class Content extends WriterPart
         $prevColumn = -1;
         $cells = $row->getCellIterator();
         while ($cells->valid()) {
+
+            /** @var Cell $cell */
             $cell = $cells->current();
             $column = Cell::columnIndexFromString($cell->getColumn()) - 1;
 
             $this->writeCellSpan($objWriter, $column, $prevColumn);
             $objWriter->startElement('table:table-cell');
 
+            // Style XF
+            $style = $cell->getXfIndex();
+            if($style !== null){
+                $objWriter->writeAttribute('table:style-name', self::CELL_STYLE_PREFIX.$style);
+            }
+
             switch ($cell->getDataType()) {
                 case DataType::TYPE_BOOL:
                     $objWriter->writeAttribute('office:value-type', 'boolean');
@@ -271,4 +286,107 @@ class Content extends WriterPart
             $objWriter->endElement();
         }
     }
+
+    /**
+     * Write XF cell styles
+     *
+     * @param XMLWriter $writer
+     * @param Spreadsheet $spreadsheet
+     */
+    private function writeXfStyles(XMLWriter $writer, Spreadsheet $spreadsheet)
+    {
+        foreach($spreadsheet->getCellXfCollection() as $style) {
+
+            $writer->startElement('style:style');
+            $writer->writeAttribute('style:name', self::CELL_STYLE_PREFIX . $style->getIndex());
+            $writer->writeAttribute('style:family', 'table-cell');
+            $writer->writeAttribute('style:parent-style-name', 'Default');
+
+            /*
+             * style:text-properties
+             */
+
+            // Font
+            $writer->startElement('style:text-properties');
+
+            $font = $style->getFont();
+
+            if($font->getBold()) {
+                $writer->writeAttribute('fo:font-weight', 'bold');
+                $writer->writeAttribute('style:font-weight-complex', 'bold');
+                $writer->writeAttribute('style:font-weight-asian', 'bold');
+            }
+
+            if($font->getItalic()) {
+                $writer->writeAttribute('fo:font-style', 'italic');
+            }
+
+            if($color = $font->getColor()) {
+                $writer->writeAttribute('fo:color', sprintf('#%s', $color->getRGB()));
+            }
+
+            if($family = $font->getName()) {
+                $writer->writeAttribute('fo:font-family', $family);
+            }
+
+            if($size = $font->getSize()) {
+                $writer->writeAttribute('fo:font-size', sprintf('%.1fpt', $size));
+            }
+
+            if($font->getUnderline() && $font->getUnderline() != Font::UNDERLINE_NONE) {
+
+                $writer->writeAttribute('style:text-underline-style', 'solid');
+                $writer->writeAttribute('style:text-underline-width', 'auto');
+                $writer->writeAttribute('style:text-underline-color', 'font-color');
+
+                switch($font->getUnderline()){
+
+                    case Font::UNDERLINE_DOUBLE:
+                        $writer->writeAttribute('style:text-underline-type', 'double');
+                        break;
+
+                    case Font::UNDERLINE_SINGLE:
+                        $writer->writeAttribute('style:text-underline-type', 'single');
+                        break;
+                }
+            }
+
+            $writer->endElement(); // Close style:text-properties
+
+            /*
+             * style:table-cell-properties
+             */
+
+            $writer->startElement('style:table-cell-properties');
+            $writer->writeAttribute('style:rotation-align', 'none');
+
+            // Fill
+            if($fill = $style->getFill()) {
+                switch($fill->getFillType()) {
+
+                    case Fill::FILL_SOLID:
+                        $writer->writeAttribute('fo:background-color', sprintf('#%s',
+                            strtolower($fill->getStartColor()->getRGB())
+                        ));
+                        break;
+
+                    case Fill::FILL_GRADIENT_LINEAR:
+                    case Fill::FILL_GRADIENT_PATH:
+                        /// TODO :: To be implemented
+                        break;
+
+                    case Fill::FILL_NONE:
+                    default:
+                }
+            }
+
+            $writer->endElement(); // Close style:table-cell-properties
+
+            /*
+             * End
+             */
+
+            $writer->endElement(); // Close style:style
+        }
+    }
 }

tests/PhpSpreadsheetTests/Writer/Ods/ContentTest.php

@@ -6,6 +6,8 @@ use PhpOffice\PhpSpreadsheet\Cell\DataType;
 use PhpOffice\PhpSpreadsheet\Shared\Date;
 use PhpOffice\PhpSpreadsheet\Spreadsheet;
 use PhpOffice\PhpSpreadsheet\Style\Color;
+use PhpOffice\PhpSpreadsheet\Style\Fill;
+use PhpOffice\PhpSpreadsheet\Style\Font;
 use PhpOffice\PhpSpreadsheet\Style\NumberFormat;
 use PhpOffice\PhpSpreadsheet\Writer\Ods;
 use PhpOffice\PhpSpreadsheet\Writer\Ods\Content;
@@ -46,6 +48,20 @@ class ContentTest extends \PHPUnit_Framework_TestCase
             ->getNumberFormat()
             ->setFormatCode(NumberFormat::FORMAT_DATE_DATETIME);
 
+        // Styles
+        $worksheet1->getStyle('A1')->getFont()->setBold(true);
+        $worksheet1->getStyle('B1')->getFont()->setItalic(true);
+        $worksheet1->getStyle('C1')->getFont()->setName("Courier");
+        $worksheet1->getStyle('C1')->getFont()->setSize(14);
+        $worksheet1->getStyle('C1')->getFont()->setColor(new Color(Color::COLOR_BLUE));
+
+        $worksheet1->getStyle('C1')->getFill()->setFillType(Fill::FILL_SOLID);
+        $worksheet1->getStyle('C1')->getFill()->setStartColor(new Color(Color::COLOR_RED));
+
+        $worksheet1->getStyle('C1')->getFont()->setUnderline(Font::UNDERLINE_SINGLE);
+        $worksheet1->getStyle('C2')->getFont()->setUnderline(Font::UNDERLINE_DOUBLE);
+        $worksheet1->getStyle('D2')->getFont()->setUnderline(Font::UNDERLINE_NONE);
+
         // Worksheet 2
         $worksheet2 = $workbook->createSheet();
         $worksheet2->setTitle('New Worksheet');

tests/data/Writer/Ods/content-empty.xml

@@ -2,7 +2,12 @@
 <office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
     <office:scripts />
     <office:font-face-decls />
-    <office:automatic-styles />
+    <office:automatic-styles>
+        <style:style style:name="ce0" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+    </office:automatic-styles>
     <office:body>
         <office:spreadsheet>
             <table:calculation-settings />
@@ -10,7 +15,7 @@
                 <office:forms />
                 <table:table-column table:number-columns-repeated="1024" />
                 <table:table-row>
-                    <table:table-cell />
+                    <table:table-cell table:style-name="ce0" />
                     <table:table-cell table:number-columns-repeated="1023" />
                 </table:table-row>
             </table:table>

tests/data/Writer/Ods/content-with-data.xml

@@ -2,7 +2,52 @@
 <office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2">
     <office:scripts />
     <office:font-face-decls />
-    <office:automatic-styles />
+    <office:automatic-styles>
+        <style:style style:name="ce0" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce1" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce2" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:font-weight="bold" style:font-weight-complex="bold" style:font-weight-asian="bold" fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce3" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:font-style="italic" fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce4" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Courier" fo:font-size="11.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce5" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Courier" fo:font-size="14.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce6" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#0000FF" fo:font-family="Courier" fo:font-size="14.0pt" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+        <style:style style:name="ce7" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#0000FF" fo:font-family="Courier" fo:font-size="14.0pt" />
+            <style:table-cell-properties style:rotation-align="none" fo:background-color="#ffffff" />
+        </style:style>
+        <style:style style:name="ce8" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#0000FF" fo:font-family="Courier" fo:font-size="14.0pt" />
+            <style:table-cell-properties style:rotation-align="none" fo:background-color="#ff0000" />
+        </style:style>
+        <style:style style:name="ce9" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#0000FF" fo:font-family="Courier" fo:font-size="14.0pt" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" style:text-underline-type="single" />
+            <style:table-cell-properties style:rotation-align="none" fo:background-color="#ff0000" />
+        </style:style>
+        <style:style style:name="ce10" style:family="table-cell" style:parent-style-name="Default">
+            <style:text-properties fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" style:text-underline-type="double" />
+            <style:table-cell-properties style:rotation-align="none" />
+        </style:style>
+    </office:automatic-styles>
     <office:body>
         <office:spreadsheet>
             <table:calculation-settings />
@@ -10,37 +55,37 @@
                 <office:forms />
                 <table:table-column table:number-columns-repeated="1024" />
                 <table:table-row>
-                    <table:table-cell office:value-type="float" office:value="1">
+                    <table:table-cell table:style-name="ce2" office:value-type="float" office:value="1">
                         <text:p>1</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="float" office:value="12345.6789">
+                    <table:table-cell table:style-name="ce3" office:value-type="float" office:value="12345.6789">
                         <text:p>12345.6789</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="float" office:value="1">
+                    <table:table-cell table:style-name="ce9" office:value-type="float" office:value="1">
                         <text:p>1</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="string">
+                    <table:table-cell table:style-name="ce0" office:value-type="string">
                         <text:p>01234</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="string">
+                    <table:table-cell table:style-name="ce0" office:value-type="string">
                         <text:p>Lorem ipsum</text:p>
                     </table:table-cell>
                     <table:table-cell table:number-columns-repeated="1019" />
                 </table:table-row>
                 <table:table-row>
-                    <table:table-cell office:value-type="boolean" office:value="1">
+                    <table:table-cell table:style-name="ce0" office:value-type="boolean" office:value="1">
                         <text:p>1</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="boolean" office:value="">
+                    <table:table-cell table:style-name="ce0" office:value-type="boolean" office:value="">
                         <text:p></text:p>
                     </table:table-cell>
-                    <table:table-cell table:formula="of:=IF(A3, CONCATENATE(A1, &quot; &quot;, A2), CONCATENATE(A2, &quot; &quot;, A1))" office:value-type="string" office:value="1 TRUE">
+                    <table:table-cell table:style-name="ce10" table:formula="of:=IF(A3, CONCATENATE(A1, &quot; &quot;, A2), CONCATENATE(A2, &quot; &quot;, A1))" office:value-type="string" office:value="1 TRUE">
                         <text:p>1 TRUE</text:p>
                     </table:table-cell>
-                    <table:table-cell office:value-type="float" office:value="42798.572060185">
+                    <table:table-cell table:style-name="ce1" office:value-type="float" office:value="42798.572060185">
                         <text:p>42798.572060185</text:p>
                     </table:table-cell>
-                    <table:table-cell />
+                    <table:table-cell table:style-name="ce0" />
                     <table:table-cell table:number-columns-repeated="1019" />
                 </table:table-row>
             </table:table>
@@ -48,7 +93,7 @@
                 <office:forms />
                 <table:table-column table:number-columns-repeated="1024" />
                 <table:table-row>
-                    <table:table-cell office:value-type="float" office:value="2">
+                    <table:table-cell table:style-name="ce0" office:value-type="float" office:value="2">
                         <text:p>2</text:p>
                     </table:table-cell>
                     <table:table-cell table:number-columns-repeated="1023" />