Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Recognize 'Hidden' Attribute and Other Unsupported Options in Xml Spreadsheet #3567

Merged
merged 8 commits into from
May 18, 2023
Merged

Recognize 'Hidden' Attribute and Other Unsupported Options in Xml Spreadsheet #3567

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
dcab826
Recognize 'Hidden' Attribute in Xml Spreadsheet
oleibman May 14, 2023
7bf4a1d
Add Support for Top Left Cell
oleibman May 15, 2023
ec9b7cd
Font Bold/Italic
oleibman May 15, 2023
e8c1aef
Active Sheet Index
oleibman May 15, 2023
4e92d60
Selected Cells
oleibman May 15, 2023
9f1d942
Worksheet Protection and Style Protection
oleibman May 16, 2023
66b14ff
Column Spans
oleibman May 16, 2023
ccc367f
Merge branch 'master' into issue3566
oleibman May 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Column Spans 
Not really an essential part of Excel, used in Xml to reduce file size.
  • Loading branch information
@oleibman
oleibman committed May 16, 2023
commit 66b14ff81eb49facc307a62995e5be40a0fd4dfc
36 changes: 30 additions & 6 deletions src/PhpSpreadsheet/Reader/Xml.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,18 +336,34 @@ public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet, boo
if (isset($worksheet->Table->Column)) {
foreach ($worksheet->Table->Column as $columnData) {
$columnData_ss = self::getAttributes($columnData, $namespaces['ss']);
$colspan = 0;
if (isset($columnData_ss['Span'])) {
$spanAttr = (string) $columnData_ss['Span'];
if (is_numeric($spanAttr)) {
$colspan = max(0, (int) $spanAttr);
}
}
if (isset($columnData_ss['Index'])) {
$columnID = Coordinate::stringFromColumnIndex((int) $columnData_ss['Index']);
}
$columnWidth = null;
if (isset($columnData_ss['Width'])) {
$columnWidth = $columnData_ss['Width'];
$spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
}
$columnVisible = null;
if (isset($columnData_ss['Hidden'])) {
$columnVisible = ((string) $columnData_ss['Hidden']) !== '1';
$spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setVisible($columnVisible);
}
++$columnID;
while ($colspan >= 0) {
if (isset($columnWidth)) {
$spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setWidth($columnWidth / 5.4);
}
if (isset($columnVisible)) {
$spreadsheet->getActiveSheet()->getColumnDimension($columnID)->setVisible($columnVisible);
}
++$columnID;
--$colspan;
}
}
}

Expand Down Expand Up @@ -521,9 +537,17 @@ public function loadIntoExisting(string $filename, Spreadsheet $spreadsheet, boo
$rangeCalculated = true;
}
}
if (!$rangeCalculated && isset($xmlX->WorksheetOptions->Panes->Pane->ActiveRow, $xmlX->WorksheetOptions->Panes->Pane->ActiveCol)) {
$activeRow = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveRow;
$activeColumn = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveCol;
if (!$rangeCalculated) {
if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveRow)) {
$activeRow = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveRow;
} else {
$activeRow = 0;
}
if (isset($xmlX->WorksheetOptions->Panes->Pane->ActiveCol)) {
$activeColumn = (string) $xmlX->WorksheetOptions->Panes->Pane->ActiveCol;
} else {
$activeColumn = 0;
}
if (is_numeric($activeRow) && is_numeric($activeColumn)) {
$selectedCell = Coordinate::stringFromColumnIndex((int) $activeColumn + 1) . (string) ($activeRow + 1);
$spreadsheet->getActiveSheet()->setSelectedCells($selectedCell);
Expand Down
92 changes: 92 additions & 0 deletions tests/PhpSpreadsheetTests/Reader/Xml/XmlColSpanTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,92 @@
<?php

namespace PhpOffice\PhpSpreadsheetTests\Reader\Xml;

use PhpOffice\PhpSpreadsheet\Reader\Xml;
use PHPUnit\Framework\TestCase;

class XmlColSpanTest extends TestCase
{
public function testColSpan(): void
{
$xmldata = <<< 'EOT'
<?xml version="1.0"?>
<?mso-application progid="Excel.Sheet"?>
<Workbook xmlns="urn:schemas-microsoft-com:office:spreadsheet"
xmlns:o="urn:schemas-microsoft-com:office:office"
xmlns:x="urn:schemas-microsoft-com:office:excel"
xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet"
xmlns:html="http://www.w3.org/TR/REC-html40">
<DocumentProperties xmlns="urn:schemas-microsoft-com:office:office">
<Version>16.00</Version>
</DocumentProperties>
<OfficeDocumentSettings xmlns="urn:schemas-microsoft-com:office:office">
<AllowPNG/>
</OfficeDocumentSettings>
<ExcelWorkbook xmlns="urn:schemas-microsoft-com:office:excel">
<WindowHeight>6820</WindowHeight>
<WindowWidth>19200</WindowWidth>
<WindowTopX>32767</WindowTopX>
<WindowTopY>32767</WindowTopY>
<ProtectStructure>False</ProtectStructure>
<ProtectWindows>False</ProtectWindows>
</ExcelWorkbook>
<Styles>
<Style ss:ID="Default" ss:Name="Normal">
<Alignment ss:Vertical="Bottom"/>
<Borders/>
<Font ss:FontName="Calibri" x:Family="Swiss" ss:Size="11" ss:Color="#000000"/>
<Interior/>
<NumberFormat/>
<Protection/>
</Style>
</Styles>
<Worksheet ss:Name="Tabelle1">
<Table ss:ExpandedColumnCount="6" ss:ExpandedRowCount="1" x:FullColumns="1"
x:FullRows="1" ss:DefaultColumnWidth="60" ss:DefaultRowHeight="14.5">
<Column ss:AutoFitWidth="0" ss:Width="76.5"/>
<Column ss:AutoFitWidth="0" ss:Width="25.5" ss:Span="3"/>
<Row ss:AutoFitHeight="0">
<Cell><Data ss:Type="String">wide</Data></Cell>
<Cell><Data ss:Type="String">thin</Data></Cell>
<Cell><Data ss:Type="String">thin</Data></Cell>
<Cell><Data ss:Type="String">thin</Data></Cell>
<Cell><Data ss:Type="String">thin</Data></Cell>
<Cell><Data ss:Type="String">normal</Data></Cell>
</Row>
</Table>
<WorksheetOptions xmlns="urn:schemas-microsoft-com:office:excel">
<Unsynced/>
<Selected/>
<Panes>
<Pane>
<Number>3</Number>
<ActiveRow>1</ActiveRow>
</Pane>
</Panes>
<ProtectObjects>False</ProtectObjects>
<ProtectScenarios>False</ProtectScenarios>
</WorksheetOptions>
</Worksheet>
</Workbook>
EOT;
$reader = new Xml();
$spreadsheet = $reader->loadSpreadsheetFromString($xmldata);
self::assertEquals(1, $spreadsheet->getSheetCount());

$sheet = $spreadsheet->getActiveSheet();
self::assertSame('Tabelle1', $sheet->getTitle());
self::assertSame('A2', $sheet->getSelectedCells());
$widthMultiplier = 5.4;
$expectedWidthBtoE = 25.5 / $widthMultiplier;
self::assertEqualsWithDelta($expectedWidthBtoE, $sheet->getColumnDimension('B')->getWidth(), 1E-6, '1st col in span');
self::assertEqualsWithDelta($expectedWidthBtoE, $sheet->getColumnDimension('C')->getWidth(), 1E-6, '2nd col in span');
self::assertEqualsWithDelta($expectedWidthBtoE, $sheet->getColumnDimension('D')->getWidth(), 1E-6, '3rd col in span');
self::assertEqualsWithDelta($expectedWidthBtoE, $sheet->getColumnDimension('E')->getWidth(), 1E-6, '4th col in span');
$expectedWidthA = 76.5 / $widthMultiplier;
self::assertEqualsWithDelta($expectedWidthA, $sheet->getColumnDimension('A')->getWidth(), 1E-6, 'width without span');
self::assertEqualsWithDelta(-1.0, $sheet->getColumnDimension('F')->getWidth(), 1E-6, 'default width');

$spreadsheet->disconnectWorksheets();
}
}