sc/qa/unit/data/functions/date_time/fods/months.fods | 16 +++++++-------
sc/qa/unit/data/functions/date_time/fods/networkdays.fods | 10 ++++----
sc/qa/unit/data/functions/date_time/fods/weeks.fods | 10 ++++----
sc/qa/unit/data/functions/date_time/fods/workday.fods | 10 ++++----
sc/qa/unit/data/functions/date_time/fods/years.fods | 10 ++++----
sc/qa/unit/data/ods/functions.ods |binary
6 files changed, 28 insertions(+), 28 deletions(-)
New commits:
commit 424de44cd0eba254368d3b867bc440c99b548168
Author: Luboš Luňák <l.lu...@collabora.com>
AuthorDate: Mon Feb 28 20:40:05 2022 +0100
Commit: Luboš Luňák <l.lu...@collabora.com>
CommitDate: Mon Feb 28 22:27:33 2022 +0100
make named ranges in tests work with 16k columns
References like 'day1' are valid cell addresses with 16k columns,
since they go up to XFD1. Since addresses currently take precedence
over names, rename ranges to not conflict.
Change-Id: Iab63947565ed176c98bc541de6189d7ee9e8d255
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/130728
Tested-by: Jenkins
Reviewed-by: Luboš Luňák <l.lu...@collabora.com>
diff --git a/sc/qa/unit/data/functions/date_time/fods/months.fods
b/sc/qa/unit/data/functions/date_time/fods/months.fods
index 7857ad15b91a..538c8a60a3b4 100644
--- a/sc/qa/unit/data/functions/date_time/fods/months.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/months.fods
@@ -670,7 +670,7 @@
<table:table-cell table:number-columns-repeated="4"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell table:formula="of:=ORG.OPENOFFICE.MONTHS(day1; day2;
1)" office:value-type="float" office:value="1" calcext:value-type="float">
+ <table:table-cell table:formula="of:=ORG.OPENOFFICE.MONTHS(day1ref;
day2ref; 1)" office:value-type="float" office:value="1"
calcext:value-type="float">
<text:p>1</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="1"
calcext:value-type="float">
@@ -679,15 +679,15 @@
<table:table-cell table:style-name="ce14" table:formula="of:=[.A8]=[.B8]"
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="ce11"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=MONTHS(day1, day2, 1)" calcext:value-type="string">
- <text:p>=MONTHS(day1, day2, 1)</text:p>
+ <table:table-cell table:style-name="ce11"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=MONTHS(day1ref, day2ref, 1)" calcext:value-type="string">
+ <text:p>=MONTHS(day1ref, day2ref, 1)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="5"/>
<table:table-cell table:style-name="ce20"/>
<table:table-cell table:number-columns-repeated="5"/>
</table:table-row>
<table:table-row table:style-name="ro2">
- <table:table-cell table:formula="of:=ORG.OPENOFFICE.MONTHS(day1; day2;
8999)" office:value-type="string" office:string-value=""
calcext:value-type="error">
+ <table:table-cell table:formula="of:=ORG.OPENOFFICE.MONTHS(day1ref;
day2ref; 8999)" office:value-type="string" office:string-value=""
calcext:value-type="error">
<text:p>Err:502</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
@@ -696,8 +696,8 @@
<table:table-cell table:style-name="ce14"
table:formula="of:=ISERROR([.A9])" 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="ce11"
table:formula="of:=FORMULA([.A9])" office:value-type="string"
office:string-value="=MONTHS(day1, day2, 8999)" calcext:value-type="string">
- <text:p>=MONTHS(day1, day2, 8999)</text:p>
+ <table:table-cell table:style-name="ce11"
table:formula="of:=FORMULA([.A9])" office:value-type="string"
office:string-value="=MONTHS(day1ref, day2ref, 8999)"
calcext:value-type="string">
+ <text:p>=MONTHS(day1ref, day2ref, 8999)</text:p>
</table:table-cell>
<table:table-cell office:value-type="string" calcext:value-type="string">
<text:p>Tdf#100440 </text:p>
@@ -921,8 +921,8 @@
</table:table-row>
</table:table>
<table:named-expressions>
- <table:named-range table:name="day1"
table:base-cell-address="$Sheet2.$J$7" table:cell-range-address="$Sheet2.$J$7"/>
- <table:named-range table:name="day2"
table:base-cell-address="$Sheet2.$K$7" table:cell-range-address="$Sheet2.$K$7"/>
+ <table:named-range table:name="day1ref"
table:base-cell-address="$Sheet2.$J$7" table:cell-range-address="$Sheet2.$J$7"/>
+ <table:named-range table:name="day2ref"
table:base-cell-address="$Sheet2.$K$7" table:cell-range-address="$Sheet2.$K$7"/>
</table:named-expressions>
</office:spreadsheet>
</office:body>
diff --git a/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
b/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
index ade367258633..c23d0c52e7e5 100644
--- a/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
@@ -880,7 +880,7 @@
<table:table-cell table:number-columns-repeated="3"/>
</table:table-row>
<table:table-row table:style-name="ro5">
- <table:table-cell table:formula="of:=NETWORKDAYS(day1;day2;days)"
office:value-type="float" office:value="17" calcext:value-type="float">
+ <table:table-cell table:formula="of:=NETWORKDAYS(day1ref;day2ref;days)"
office:value-type="float" office:value="17" calcext:value-type="float">
<text:p>17</text:p>
</table:table-cell>
<table:table-cell office:value-type="float" office:value="17"
calcext:value-type="float">
@@ -889,8 +889,8 @@
<table:table-cell table:style-name="ce14"
table:formula="of:=[.A12]=[.B12]" office:value-type="boolean"
office:boolean-value="true" calcext:value-type="boolean">
<text:p>PRAVDA</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce18"
table:formula="of:=FORMULA([.A12])" office:value-type="string"
office:string-value="=NETWORKDAYS(day1;day2;days)" calcext:value-type="string">
- <text:p>=NETWORKDAYS(day1;day2;days)</text:p>
+ <table:table-cell table:style-name="ce18"
table:formula="of:=FORMULA([.A12])" office:value-type="string"
office:string-value="=NETWORKDAYS(day1ref;day2ref;days)"
calcext:value-type="string">
+ <text:p>=NETWORKDAYS(day1ref;day2ref;days)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="6"/>
<table:table-cell office:value-type="float" office:value="17"
calcext:value-type="float">
@@ -1005,8 +1005,8 @@
</table:table-row>
</table:table>
<table:named-expressions>
- <table:named-range table:name="day1"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
- <table:named-range table:name="day2"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
+ <table:named-range table:name="day1ref"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
+ <table:named-range table:name="day2ref"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
<table:named-range table:name="days"
table:base-cell-address="$Sheet2.$K$4"
table:cell-range-address="$Sheet2.$K$4:.$K$6"/>
</table:named-expressions>
</office:spreadsheet>
diff --git a/sc/qa/unit/data/functions/date_time/fods/weeks.fods
b/sc/qa/unit/data/functions/date_time/fods/weeks.fods
index c59113ce768f..37eb7ff18c68 100644
--- a/sc/qa/unit/data/functions/date_time/fods/weeks.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/weeks.fods
@@ -827,7 +827,7 @@
<table:table-cell table:style-name="ce27"/>
</table:table-row>
<table:table-row table:style-name="ro5">
- <table:table-cell table:formula="of:=ORG.OPENOFFICE.WEEKS(day1;day2;one)"
office:value-type="float" office:value="4" calcext:value-type="float">
+ <table:table-cell
table:formula="of:=ORG.OPENOFFICE.WEEKS(day1ref;day2ref;one)"
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">
@@ -836,8 +836,8 @@
<table:table-cell table:style-name="ce17" table:formula="of:=[.A8]=[.B8]"
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="ce26"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=WEEKS(day1,day2,one)" calcext:value-type="string">
- <text:p>=WEEKS(day1,day2,one)</text:p>
+ <table:table-cell table:style-name="ce26"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=WEEKS(day1ref,day2ref,one)" calcext:value-type="string">
+ <text:p>=WEEKS(day1ref,day2ref,one)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="6"/>
<table:table-cell table:style-name="ce29" office:value-type="date"
office:date-value="2001-12-25" calcext:value-type="date">
@@ -1682,8 +1682,8 @@
</table:table-row>
</table:table>
<table:named-expressions>
- <table:named-range table:name="day1"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
- <table:named-range table:name="day2"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
+ <table:named-range table:name="day1ref"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
+ <table:named-range table:name="day2ref"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
<table:named-range table:name="days"
table:base-cell-address="$Sheet2.$K$4"
table:cell-range-address="$Sheet2.$K$4:.$K$6"/>
<table:named-range table:name="one" table:base-cell-address="$Sheet2.$M$1"
table:cell-range-address="$Sheet2.$M$1"/>
</table:named-expressions>
diff --git a/sc/qa/unit/data/functions/date_time/fods/workday.fods
b/sc/qa/unit/data/functions/date_time/fods/workday.fods
index 549c0e6a3d0e..f20be0b337f1 100644
--- a/sc/qa/unit/data/functions/date_time/fods/workday.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/workday.fods
@@ -756,7 +756,7 @@
<table:table-cell/>
</table:table-row>
<table:table-row table:style-name="ro5">
- <table:table-cell table:style-name="ce11"
table:formula="of:=WORKDAY(day1;day2;days)" office:value-type="date"
office:date-value="2014-11-07" calcext:value-type="date">
+ <table:table-cell table:style-name="ce11"
table:formula="of:=WORKDAY(day1ref;day2ref;days)" office:value-type="date"
office:date-value="2014-11-07" calcext:value-type="date">
<text:p>07.11.2014</text:p>
</table:table-cell>
<table:table-cell table:style-name="ce11" office:value-type="date"
office:date-value="2014-11-07" calcext:value-type="date">
@@ -765,8 +765,8 @@
<table:table-cell table:style-name="ce16" table:formula="of:=[.A7]=[.B7]"
office:value-type="boolean" office:boolean-value="true"
calcext:value-type="boolean">
<text:p>PRAVDA</text:p>
</table:table-cell>
- <table:table-cell table:style-name="ce20"
table:formula="of:=FORMULA([.A7])" office:value-type="string"
office:string-value="=WORKDAY(day1;day2;days)" calcext:value-type="string">
- <text:p>=WORKDAY(day1;day2;days)</text:p>
+ <table:table-cell table:style-name="ce20"
table:formula="of:=FORMULA([.A7])" office:value-type="string"
office:string-value="=WORKDAY(day1ref;day2ref;days)"
calcext:value-type="string">
+ <text:p>=WORKDAY(day1ref;day2ref;days)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="5"/>
<table:table-cell table:style-name="ce21"/>
@@ -915,8 +915,8 @@
</table:table-row>
</table:table>
<table:named-expressions>
- <table:named-range table:name="day1"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
- <table:named-range table:name="day2"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
+ <table:named-range table:name="day1ref"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
+ <table:named-range table:name="day2ref"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
<table:named-range table:name="days"
table:base-cell-address="$Sheet2.$K$4"
table:cell-range-address="$Sheet2.$K$4:.$K$6"/>
</table:named-expressions>
</office:spreadsheet>
diff --git a/sc/qa/unit/data/functions/date_time/fods/years.fods
b/sc/qa/unit/data/functions/date_time/fods/years.fods
index 968cda1f43cd..e02a77c4c211 100644
--- a/sc/qa/unit/data/functions/date_time/fods/years.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/years.fods
@@ -847,7 +847,7 @@
<table:table-cell table:style-name="ce28"/>
</table:table-row>
<table:table-row table:style-name="ro5">
- <table:table-cell table:formula="of:=ORG.OPENOFFICE.YEARS(day1;day2;one)"
office:value-type="float" office:value="3" calcext:value-type="float">
+ <table:table-cell
table:formula="of:=ORG.OPENOFFICE.YEARS(day1ref;day2ref;one)"
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">
@@ -856,8 +856,8 @@
<table:table-cell table:style-name="ce17" table:formula="of:=[.A8]=[.B8]"
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="ce27"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=YEARS(day1,day2,one)" calcext:value-type="string">
- <text:p>=YEARS(day1,day2,one)</text:p>
+ <table:table-cell table:style-name="ce27"
table:formula="of:=FORMULA([.A8])" office:value-type="string"
office:string-value="=YEARS(day1ref,day2ref,one)" calcext:value-type="string">
+ <text:p>=YEARS(day1ref,day2ref,one)</text:p>
</table:table-cell>
<table:table-cell table:number-columns-repeated="6"/>
<table:table-cell table:style-name="ce30" office:value-type="date"
office:date-value="2001-12-25" calcext:value-type="date">
@@ -1122,8 +1122,8 @@
</table:table-row>
</table:table>
<table:named-expressions>
- <table:named-range table:name="day1"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
- <table:named-range table:name="day2"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
+ <table:named-range table:name="day1ref"
table:base-cell-address="$Sheet2.$K$2" table:cell-range-address="$Sheet2.$K$2"/>
+ <table:named-range table:name="day2ref"
table:base-cell-address="$Sheet2.$K$3" table:cell-range-address="$Sheet2.$K$3"/>
<table:named-range table:name="days"
table:base-cell-address="$Sheet2.$K$4"
table:cell-range-address="$Sheet2.$K$4:.$K$6"/>
<table:named-range table:name="one" table:base-cell-address="$Sheet2.$M$1"
table:cell-range-address="$Sheet2.$M$1"/>
</table:named-expressions>
diff --git a/sc/qa/unit/data/ods/functions.ods
b/sc/qa/unit/data/ods/functions.ods
index 2585b0afc530..04c6e6ed1274 100644
Binary files a/sc/qa/unit/data/ods/functions.ods and
b/sc/qa/unit/data/ods/functions.ods differ
