mirror of
https://github.com/PHPOffice/PhpSpreadsheet.git
synced 2026-09-22 16:19:19 +00:00
Merge branch 'master' into odspage
This commit is contained in:
@@ -8,7 +8,6 @@
|
||||
</style:style>
|
||||
<style:style style:name="ce0" style:family="table-cell" style:parent-style-name="Default">
|
||||
<style:table-cell-properties style:vertical-align="bottom" style:rotation-align="none"/>
|
||||
<style:paragraph-properties fo:text-align="start"/>
|
||||
<style:text-properties fo:color="#000000" fo:font-family="Calibri" fo:font-size="11.0pt"/>
|
||||
</style:style>
|
||||
</office:automatic-styles>
|
||||
@@ -24,7 +23,6 @@
|
||||
<table:table-cell table:style-name="ce0" table:number-matrix-columns-spanned="1" table:number-matrix-rows-spanned="2" table:formula="of:=UNIQUE([.A1:.A3])" office:value-type="float" office:value="1">
|
||||
<text:p>1</text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:number-columns-repeated="1022"/>
|
||||
</table:table-row>
|
||||
<table:table-row>
|
||||
<table:table-cell table:style-name="ce0" office:value-type="float" office:value="1">
|
||||
@@ -33,14 +31,11 @@
|
||||
<table:table-cell table:style-name="ce0" office:value-type="float" office:value="3">
|
||||
<text:p>3</text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:number-columns-repeated="1022"/>
|
||||
</table:table-row>
|
||||
<table:table-row>
|
||||
<table:table-cell table:style-name="ce0" office:value-type="float" office:value="3">
|
||||
<text:p>3</text:p>
|
||||
</table:table-cell>
|
||||
<table:table-cell table:style-name="ce0"/>
|
||||
<table:table-cell table:number-columns-repeated="1022"/>
|
||||
</table:table-row>
|
||||
</table:table>
|
||||
<table:named-expressions/>
|
||||
|
||||
Reference in New Issue
Block a user