Skip to content

Commit dbaafba

Browse files
authored
Fix loading drawing size (#2492)
1 parent 06ea9ea commit dbaafba

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

src/PhpSpreadsheet/Reader/Xlsx.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1257,8 +1257,8 @@ public function load(string $filename, int $flags = 0): Spreadsheet
12571257
$objDrawing->setOffsetX((int) Drawing::EMUToPixels($oneCellAnchor->from->colOff));
12581258
$objDrawing->setOffsetY(Drawing::EMUToPixels($oneCellAnchor->from->rowOff));
12591259
$objDrawing->setResizeProportional(false);
1260-
$objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem((int) self::getAttributes($oneCellAnchor->ext), 'cx')));
1261-
$objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem((int) self::getAttributes($oneCellAnchor->ext), 'cy')));
1260+
$objDrawing->setWidth(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cx')));
1261+
$objDrawing->setHeight(Drawing::EMUToPixels(self::getArrayItem(self::getAttributes($oneCellAnchor->ext), 'cy')));
12621262
if ($xfrm) {
12631263
$objDrawing->setRotation((int) Drawing::angleToDegrees(self::getArrayItem(self::getAttributes($xfrm), 'rot')));
12641264
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<?php
2+
3+
namespace PhpOffice\PhpSpreadsheetTests\Reader\Xlsx;
4+
5+
use PhpOffice\PhpSpreadsheet\IOFactory;
6+
use PhpOffice\PhpSpreadsheet\Worksheet\BaseDrawing;
7+
use PHPUnit\Framework\TestCase;
8+
9+
class DrawingOneCellAnchorTest extends TestCase
10+
{
11+
public function testGetDrawing(): void
12+
{
13+
$filename = __DIR__ . '/../../../data/Reader/XLSX/drawingOneCellAnchor.xlsx';
14+
$reader = IOFactory::createReader('Xlsx');
15+
$spreadsheet = $reader->load($filename);
16+
$worksheet = $spreadsheet->getActiveSheet();
17+
$collection = $worksheet->getDrawingCollection();
18+
self::assertCount(1, $collection);
19+
20+
/** @var BaseDrawing $drawing */
21+
$drawing = $collection[0];
22+
self::assertEquals('A2', $drawing->getCoordinates());
23+
self::assertEquals(10, $drawing->getOffsetX());
24+
self::assertEquals(10, $drawing->getOffsetY());
25+
self::assertEquals(150, $drawing->getHeight());
26+
self::assertEquals(150, $drawing->getWidth());
27+
}
28+
}
12.9 KB
Binary file not shown.

0 commit comments

Comments
 (0)