Merge pull request #365 from Progi1984/issue347

#347 : PowerPoint2007 Writer : Margins in table cell

Author: Progi1984

CHANGELOG.md

@@ -2,6 +2,9 @@
 
 ## 0.9.0 - WIP
 
+### Bugfix
+- PowerPoint2007 Writer : Margins in table cell - @Progi1984 GH-347
+
 ### Changes
 - PowerPoint2007 Writer : Write percentage values with a trailing percent sign instead of formatted as 1000th of a percent to comply with the standard - @k42b3 GH-307
 

docs/shapes_table.rst

@@ -51,6 +51,7 @@ You can access cell object directly.
 Define margins of a cell
 ~~~~~~~~~~~~~~~~~~~~~~~~
 Margins of cells are defined by margins of the first paragraph of cell.
+Margins of cells are defined in pixels.
 
 For defining margins of cell, you can use the `setMargin*` method of a Alignment object of the active paragraph of a Cell object.
 

samples/Sample_04_Table.php

@@ -61,10 +61,13 @@
                ->setRotation(90)
                ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFFFFFFF'));
-$row->nextCell()->createTextRun('R1C1')->getFont()->setBold(true);
-$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(20);
-$row->nextCell()->createTextRun('R1C2')->getFont()->setBold(true);
-$row->nextCell()->createTextRun('R1C3')->getFont()->setBold(true);
+$oCell = $row->nextCell();
+$oCell->createTextRun('R1C1')->getFont()->setBold(true);
+$oCell->getActiveParagraph()->getAlignment()->setMarginLeft(20);
+$oCell = $row->nextCell();
+$oCell->createTextRun('R1C2')->getFont()->setBold(true);
+$oCell = $row->nextCell();
+$oCell->createTextRun('R1C3')->getFont()->setBold(true);
 
 foreach ($row->getCells() as $cell) {
     $cell->getBorders()->getTop()->setLineWidth(4)
@@ -78,23 +81,34 @@
 $row->getFill()->setFillType(Fill::FILL_SOLID)
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
-$row->nextCell()->createTextRun('R2C1');
-$row->getCell()->getActiveParagraph()->getAlignment()
+$oCell = $row->nextCell();
+$oCell->createTextRun('R2C1');
+$oCell->getActiveParagraph()->getAlignment()
 	->setMarginLeft(30)
 	->setTextDirection(\PhpOffice\PhpPresentation\Style\Alignment::TEXT_DIRECTION_VERTICAL_270);
-$row->nextCell()->createTextRun('R2C2');
-$row->nextCell()->createTextRun('R2C3');
+$oCell = $row->nextCell();
+$oCell->createTextRun('R2C2');
+$oCell->getActiveParagraph()->getAlignment()
+	->setMarginBottom(10)
+	->setMarginTop(20)
+	->setMarginRight(30)
+	->setMarginLeft(40);
+$oCell = $row->nextCell();
+$oCell->createTextRun('R2C3');
 
 // Add row
 echo date('H:i:s') . ' Add row'.EOL;
 $row = $shape->createRow();
 $row->getFill()->setFillType(Fill::FILL_SOLID)
 			   ->setStartColor(new Color('FFE06B20'))
                ->setEndColor(new Color('FFE06B20'));
-$row->nextCell()->createTextRun('R3C1');
-$row->getCell()->getActiveParagraph()->getAlignment()->setMarginLeft(40);
-$row->nextCell()->createTextRun('R3C2');
-$row->nextCell()->createTextRun('R3C3');
+$oCell = $row->nextCell();
+$oCell->createTextRun('R3C1');
+$oCell->getActiveParagraph()->getAlignment()->setMarginLeft(40);
+$oCell = $row->nextCell();
+$oCell->createTextRun('R3C2');
+$oCell = $row->nextCell();
+$oCell->createTextRun('R3C3');
 
 // Add row
 echo date('H:i:s') . ' Add row'.EOL;

src/PhpPresentation/Writer/PowerPoint2007/AbstractSlide.php

@@ -451,10 +451,10 @@ protected function writeShapeTable(XMLWriter $objWriter, ShapeTable $shape, $sha
                 }
 
                 // Margins
-                $objWriter->writeAttribute('marL', $firstParagraphAlignment->getMarginLeft());
-                $objWriter->writeAttribute('marR', $firstParagraphAlignment->getMarginRight());
-                $objWriter->writeAttribute('marT', $firstParagraphAlignment->getMarginTop());
-                $objWriter->writeAttribute('marB', $firstParagraphAlignment->getMarginBottom());
+                $objWriter->writeAttribute('marL', CommonDrawing::pixelsToEmu($firstParagraphAlignment->getMarginLeft()));
+                $objWriter->writeAttribute('marR', CommonDrawing::pixelsToEmu($firstParagraphAlignment->getMarginRight()));
+                $objWriter->writeAttribute('marT', CommonDrawing::pixelsToEmu($firstParagraphAlignment->getMarginTop()));
+                $objWriter->writeAttribute('marB', CommonDrawing::pixelsToEmu($firstParagraphAlignment->getMarginBottom()));
 
                 // Determine borders
                 $borderLeft = $currentCell->getBorders()->getLeft();

tests/PhpPresentation/Tests/Writer/PowerPoint2007/PptSlidesTest.php

@@ -724,10 +724,10 @@ public function testTableWithCellMargin()
 
         $element = '/p:sld/p:cSld/p:spTree/p:graphicFrame/a:graphic/a:graphicData/a:tbl/a:tr/a:tc/a:tcPr';
         $this->assertZipXmlElementExists('ppt/slides/slide1.xml', $element);
-        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marB', 10);
-        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marL', 20);
-        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marR', 30);
-        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marT', 40);
+        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marB', Drawing::pixelsToEmu(10));
+        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marL', Drawing::pixelsToEmu(20));
+        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marR', Drawing::pixelsToEmu(30));
+        $this->assertZipXmlAttributeEquals('ppt/slides/slide1.xml', $element, 'marT', Drawing::pixelsToEmu(40));
     }
 
     public function testTableWithColspan()