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.lunak@collabora.com>

6 files changed, 28 insertions, 28 deletions

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 8999a94ef792..26e4c844af1e 100644
--- a/sc/qa/unit/data/functions/date_time/fods/months.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/months.fods
@@ -802,7 +802,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">
@@ -811,15 +811,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">
@@ -828,8 +828,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>
@@ -1053,8 +1053,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 e2170bffe8ad..406557f13ec9 100644
--- a/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/networkdays.fods
@@ -1024,7 +1024,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">
@@ -1033,8 +1033,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">
@@ -1149,8 +1149,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 f05803ea6684..8c8960d90fda 100644
--- a/sc/qa/unit/data/functions/date_time/fods/weeks.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/weeks.fods
@@ -973,7 +973,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">
@@ -982,8 +982,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">
@@ -1828,8 +1828,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 8037db8f0913..de6418641c86 100644
--- a/sc/qa/unit/data/functions/date_time/fods/workday.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/workday.fods
@@ -898,7 +898,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">
@@ -907,8 +907,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"/>
@@ -1057,8 +1057,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 724ee3476163..171e45102c6a 100644
--- a/sc/qa/unit/data/functions/date_time/fods/years.fods
+++ b/sc/qa/unit/data/functions/date_time/fods/years.fods
@@ -992,7 +992,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">
@@ -1001,8 +1001,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">
@@ -1267,8 +1267,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
--- a/sc/qa/unit/data/ods/functions.ods
+++ b/sc/qa/unit/data/ods/functions.ods