Fix loading drawing size (#2492)

PHPOffice · Jan 17, 2022 · dbaafba · dbaafba
1 parent 06ea9ea
commit dbaafba
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 2 deletions.
diff --git a/src/PhpSpreadsheet/Reader/Xlsx.php b/src/PhpSpreadsheet/Reader/Xlsx.php
@@ -1257,8 +1257,8 @@ public function load(string $filename, int $flags = 0): Spreadsheet
                                                     $objDrawing->setOffsetX((int) Drawing::EMUToPixels($oneCellAnchor->from->colOff));
                                                     $objDrawing->setOffsetY(Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
                                                     $objDrawing->setResizeProportional(false);
-                                                    $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem((int) self::getAttributes($oneCellAnchor->ext), 'cx')));
-                                                    $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem((int) self::getAttributes($oneCellAnchor->ext), 'cy')));
+                                                    $objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx')));
+                                                    $objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy')));
                                                     if ($xfrm) {
                                                         $objDrawing->setRotation((int) Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
                                                     }

diff --git a/tests/PhpSpreadsheetTests/Reader/Xlsx/DrawingOneCellAnchorTest.php b/tests/PhpSpreadsheetTests/Reader/Xlsx/DrawingOneCellAnchorTest.php
@@ -0,0 +1,28 @@
+<?php
+
+namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
+
+use PhpOffice\PhpSpreadsheet\IOFactory;
+use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
+use PHPUnit\Framework\TestCase;
+
+class DrawingOneCellAnchorTest extends TestCase
+{
+    public function testGetDrawing(): void
+    {
+        $filename = __DIR__ . '/../../../data/Reader/XLSX/drawingOneCellAnchor.xlsx';
+        $reader = IOFactory::createReader('Xlsx');
+        $spreadsheet = $reader->load($filename);
+        $worksheet = $spreadsheet->getActiveSheet();
+        $collection = $worksheet->getDrawingCollection();
+        self::assertCount(1, $collection);
+
+        /** @var BaseDrawing $drawing */
+        $drawing = $collection[0];
+        self::assertEquals('A2', $drawing->getCoordinates());
+        self::assertEquals(10, $drawing->getOffsetX());
+        self::assertEquals(10, $drawing->getOffsetY());
+        self::assertEquals(150, $drawing->getHeight());
+        self::assertEquals(150, $drawing->getWidth());
+    }
+}
diff --git a/tests/data/Reader/XLSX/drawingOneCellAnchor.xlsx b/tests/data/Reader/XLSX/drawingOneCellAnchor.xlsx