sc/qa/unit/data/functions/spreadsheet/fods/column.fods | 79 +++++++---
sc/qa/unit/data/functions/spreadsheet/fods/row.fods | 134 +++++++++++++++--
2 files changed, 186 insertions(+), 27 deletions(-)
New commits:
commit 3613990eaae645e0489660be2dab8a61cab8a69c
Author: Winfried Donkers <winfrieddonk...@libreoffice.org>
Date: Mon Jun 18 19:32:22 2018 +0200
tdf#77517 Additions to unit tests.
Change-Id: I2b4035ceeb4cb65de811628100efdda7e3c127ae
Reviewed-on: https://gerrit.libreoffice.org/56056
Tested-by: Jenkins
Reviewed-by: Eike Rathke <er...@redhat.com>
diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/column.fods
b/sc/qa/unit/data/functions/spreadsheet/fods/column.fods
index 3a80f565b09e..09ab211bc32c 100644
--- a/sc/qa/unit/data/functions/spreadsheet/fods/column.fods
+++ b/sc/qa/unit/data/functions/spreadsheet/fods/column.fods
@@ -7224,34 +7224,75 @@
<table:table-cell table:number-columns-repeated="3"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell table:style-name="ce12"/>
- <table:table-cell/>
- <table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce23"/>
+ <table:table-cell table:style-name="ce12"
table:formula="of:=COLUMN(['file:///fake_path/filename'#$Sheet3.B3])"
office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="2"
calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce47"
table:formula="of:=[.A19]=[.B19]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce23"
table:formula="of:=FORMULA([.A19])" office:value-type="string"
office:string-value="=COLUMN('file:///fake_path/filename'#$Sheet3.B3)"
calcext:value-type="string">
+
<text:p>=COLUMN('file:///fake_path/filename'#$Sheet3.B3)</text:p>
+ </table:table-cell>
<table:table-cell table:number-columns-repeated="19"/>
<table:table-cell table:style-name="ce8"/>
<table:table-cell table:number-columns-repeated="5"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell table:style-name="ce12"/>
- <table:table-cell/>
- <table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce23"/>
+ <table:table-cell table:style-name="ce12" table:formula="of:=[.F21]"
office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="2"
calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce47"
table:formula="of:=[.A20]=[.B20]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce23"
table:formula="of:=FORMULA([.F21])" office:value-type="string"
office:string-value="{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}</text:p>
+ </table:table-cell>
<table:table-cell table:number-columns-repeated="25"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell/>
- <table:table-cell table:style-name="ce4"/>
- <table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce23"/>
- <table:table-cell table:style-name="ce4"/>
- <table:table-cell table:number-columns-repeated="24"/>
+ <table:table-cell table:formula="of:=[.G21]" office:value-type="float"
office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="3"
calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce47"
table:formula="of:=[.A21]=[.B21]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce23"
table:formula="of:=FORMULA([.G21])" office:value-type="string"
office:string-value="{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce35"/>
+ <table:table-cell table:number-matrix-columns-spanned="3"
table:number-matrix-rows-spanned="1"
table:formula="of:=COLUMN(['file:///fake_path/filename'#$Sheet3.B3:.D8])"
office:value-type="float" office:value="2" calcext:value-type="float">
+ <text:p>2</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="3"
calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="4"
calcext:value-type="float">
+ <text:p>4</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="21"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell/>
- <table:table-cell table:style-name="ce4"/>
- <table:table-cell table:style-name="ce17"/>
- <table:table-cell table:style-name="ce23"/>
+ <table:table-cell table:formula="of:=[.H21]" office:value-type="float"
office:value="4" calcext:value-type="float">
+ <text:p>4</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="4"
calcext:value-type="float">
+ <text:p>4</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce47"
table:formula="of:=[.A22]=[.B22]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce23"
table:formula="of:=FORMULA([.H21])" office:value-type="string"
office:string-value="{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=COLUMN('file:///fake_path/filename'#$Sheet3.B3:D8)}</text:p>
+ </table:table-cell>
<table:table-cell table:style-name="ce25"/>
<table:table-cell table:number-columns-repeated="24"/>
</table:table-row>
@@ -7374,4 +7415,4 @@
</table:named-expressions>
</office:spreadsheet>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
diff --git a/sc/qa/unit/data/functions/spreadsheet/fods/row.fods
b/sc/qa/unit/data/functions/spreadsheet/fods/row.fods
index 37c0108c5405..cd69c66ed553 100644
--- a/sc/qa/unit/data/functions/spreadsheet/fods/row.fods
+++ b/sc/qa/unit/data/functions/spreadsheet/fods/row.fods
@@ -3293,9 +3293,18 @@
<table:table-cell table:style-name="ce47"/>
</table:table-row>
<table:table-row table:style-name="ro6">
- <table:table-cell table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce16"/>
- <table:table-cell table:style-name="ce21"/>
+ <table:table-cell
table:formula="of:=ROW(['file:///fake_path/filename'#$Sheet1.B3])"
office:value-type="float" office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="3"
calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A18]=[.B18]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A18])" office:value-type="string"
office:string-value="=ROW('file:///fake_path/filename'#$Sheet1.B3)"
calcext:value-type="string">
+ <text:p>=ROW('file:///fake_path/filename'#$Sheet1.B3)</text:p>
+ </table:table-cell>
<table:table-cell/>
<table:table-cell table:style-name="ce5"
table:number-columns-repeated="4"/>
<table:table-cell table:number-columns-repeated="13"/>
@@ -3305,10 +3314,119 @@
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce47"/>
</table:table-row>
- <table:table-row table:style-name="ro6" table:number-rows-repeated="6">
- <table:table-cell table:number-columns-repeated="2"/>
- <table:table-cell table:style-name="ce16"/>
- <table:table-cell table:style-name="ce21"/>
+ <table:table-row table:style-name="ro6">
+ <table:table-cell table:number-matrix-columns-spanned="1"
table:number-matrix-rows-spanned="6"
table:formula="of:=ROW(['file:///fake_path/filename'#$Sheet1.B3:.D8])"
office:value-type="float" office:value="3" calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="3"
calcext:value-type="float">
+ <text:p>3</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A19]=[.B19]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A19])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="18"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ <table:table-cell/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro6">
+ <table:table-cell office:value-type="float" office:value="4"
calcext:value-type="float">
+ <text:p>4</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="4"
calcext:value-type="float">
+ <text:p>4</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A20]=[.B20]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A20])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="18"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ <table:table-cell/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell office:value-type="float" office:value="5"
calcext:value-type="float">
+ <text:p>5</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="5"
calcext:value-type="float">
+ <text:p>5</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A21]=[.B21]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A21])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="18"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ <table:table-cell/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell office:value-type="float" office:value="6"
calcext:value-type="float">
+ <text:p>6</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="6"
calcext:value-type="float">
+ <text:p>6</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A22]=[.B22]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A22])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="18"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ <table:table-cell/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell office:value-type="float" office:value="7"
calcext:value-type="float">
+ <text:p>7</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="7"
calcext:value-type="float">
+ <text:p>7</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A23]=[.B23]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A23])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
+ <table:table-cell table:number-columns-repeated="18"/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ <table:table-cell/>
+ <table:table-cell table:style-name="ce33"/>
+ <table:table-cell table:style-name="ce47"/>
+ </table:table-row>
+ <table:table-row table:style-name="ro2">
+ <table:table-cell office:value-type="float" office:value="8"
calcext:value-type="float">
+ <text:p>8</text:p>
+ </table:table-cell>
+ <table:table-cell office:value-type="float" office:value="8"
calcext:value-type="float">
+ <text:p>8</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce62"
table:formula="of:=[.A24]=[.B24]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
+ <text:p>TRUE</text:p>
+ </table:table-cell>
+ <table:table-cell table:style-name="ce21"
table:formula="of:=FORMULA([.A24])" office:value-type="string"
office:string-value="{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}"
calcext:value-type="string">
+
<text:p>{=ROW('file:///fake_path/filename'#$Sheet1.B3:D8)}</text:p>
+ </table:table-cell>
<table:table-cell table:number-columns-repeated="18"/>
<table:table-cell table:style-name="ce33"/>
<table:table-cell table:style-name="ce47"/>
@@ -4009,4 +4127,4 @@
</table:named-expressions>
</office:spreadsheet>
</office:body>
-</office:document>
\ No newline at end of file
+</office:document>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
