Clientbase
/
PhpSpreadsheet
mirror of https://github.com/basemaster/PhpSpreadsheet.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix loading drawing size (#2492)

This commit is contained in:
Igor 2022-01-17 15:59:31 +10:00 committed by GitHub
parent 06ea9ead2b
commit dbaafba6c6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/PhpSpreadsheet/Reader/Xlsx.php
View File

@ -1257,8 +1257,8 @@ class Xlsx extends BaseReader
$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')));
}

28
tests/PhpSpreadsheetTests/Reader/Xlsx/DrawingOneCellAnchorTest.php Normal file
View File

@ -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());
}
}

BIN
tests/data/Reader/XLSX/drawingOneCellAnchor.xlsx Normal file
View File

Binary file not shown.