From c712b02990660b26c15d8a9f5dbb8830ad160e5b Mon Sep 17 00:00:00 2001
From: "Adrien Minne (adrm)" <adrm@odoo.com>
Date: Thu, 30 Mar 2023 15:14:35 +0000
Subject: [PATCH] [IMP] xlsx_import: support more date formats
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

We now try to parse and modify the xlsx date formats at import to get a
format supported by o_spreadsheet.

Odoo task 3222986

closes odoo/o-spreadsheet#2293

Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
---
 src/constants.ts                              |   2 +-
 src/xlsx/conversion/format_conversion.ts      |  87 ++++
 src/xlsx/conversion/style_conversion.ts       |  52 +-
 .../__xlsx__/xlsx_demo_data/docProps/app.xml  |   2 +-
 .../__xlsx__/xlsx_demo_data/docProps/core.xml |   2 +-
 .../__xlsx__/xlsx_demo_data/xl/calcChain.xml  |   2 +-
 .../xlsx_demo_data/xl/sharedStrings.xml       |   5 +-
 tests/__xlsx__/xlsx_demo_data/xl/styles.xml   |  35 +-
 .../xlsx_demo_data/xl/tables/table1.xml       |  18 +-
 tests/__xlsx__/xlsx_demo_data/xl/workbook.xml |   8 +-
 .../xl/worksheets/_rels/sheet4.xml.rels       |   4 -
 .../xlsx_demo_data/xl/worksheets/sheet1.xml   |  37 +-
 .../xlsx_demo_data/xl/worksheets/sheet2.xml   |  46 +-
 .../xlsx_demo_data/xl/worksheets/sheet3.xml   |  14 +-
 .../xlsx_demo_data/xl/worksheets/sheet4.xml   | 394 +++++---------
 .../xlsx_demo_data/xl/worksheets/sheet5.xml   | 480 +++++++++---------
 .../xlsx_demo_data/xl/worksheets/sheet6.xml   | 123 +++--
 .../xlsx_demo_data/xl/worksheets/sheet7.xml   | 298 ++++-------
 .../xlsx_demo_data/xl/worksheets/sheet9.xml   |   6 +-
 tests/xlsx_import.test.ts                     |  46 +-
 20 files changed, 703 insertions(+), 958 deletions(-)
 create mode 100644 src/xlsx/conversion/format_conversion.ts
 delete mode 100644 tests/__xlsx__/xlsx_demo_data/xl/worksheets/_rels/sheet4.xml.rels

diff --git a/src/constants.ts b/src/constants.ts
index fb6cd967b6..de87fd1668 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -148,7 +148,7 @@ export const DEFAULT_BORDER_DESC: BorderDescr = ["thin", "#000"];
 export const DEFAULT_FILTER_BORDER_DESC: BorderDescr = ["thin", FILTERS_COLOR];
 
 // DateTimeRegex
-export const DATETIME_FORMAT = /[ymd:]/;
+export const DATETIME_FORMAT = /[ymdhs:]/;
 
 // Ranges
 export const INCORRECT_RANGE_STRING = CellErrorType.InvalidReference;
diff --git a/src/xlsx/conversion/format_conversion.ts b/src/xlsx/conversion/format_conversion.ts
new file mode 100644
index 0000000000..8a624f92f9
--- /dev/null
+++ b/src/xlsx/conversion/format_conversion.ts
@@ -0,0 +1,87 @@
+import { formatValue } from "../../helpers";
+import { XLSXNumFormat } from "../../types/xlsx";
+import { WarningTypes, XLSXImportWarningManager } from "../helpers/xlsx_parser_error_manager";
+import { XLSX_FORMATS_CONVERSION_MAP } from "./conversion_maps";
+
+const XLSX_DATE_FORMAT_REGEX = /^(yy|yyyy|m{1,5}|d{1,4}|h{1,2}|s{1,2}|am\/pm|a\/m|\s|-|\/|\.|:)+$/i;
+
+/**
+ * Convert excel format to o_spreadsheet format
+ *
+ * Excel format are defined in openXML §18.8.31
+ */
+export function convertXlsxFormat(
+  numFmtId: number,
+  formats: XLSXNumFormat[],
+  warningManager: XLSXImportWarningManager
+): string | undefined {
+  if (numFmtId === 0) {
+    return undefined;
+  }
+  // Format is either defined in the imported data, or the formatId is defined in openXML §18.8.30
+  let format =
+    XLSX_FORMATS_CONVERSION_MAP[numFmtId] || formats.find((f) => f.id === numFmtId)?.format;
+
+  if (format) {
+    try {
+      let convertedFormat = format.replace(/(.*?);.*/, "$1"); // only take first part of multi-part format
+      convertedFormat = convertedFormat.replace(/\[(.*)-[A-Z0-9]{3}\]/g, "[$1]"); // remove currency and locale/date system/number system info (ECMA §18.8.31)
+      convertedFormat = convertedFormat.replace(/\[\$\]/g, ""); // remove empty bocks
+
+      // Quotes in format escape sequences of characters. ATM we only support [$...] blocks to escape characters, and only one of them per format
+      const numberOfQuotes = convertedFormat.match(/"/g)?.length || 0;
+      const numberOfOpenBrackets = convertedFormat.match(/\[/g)?.length || 0;
+      if (numberOfQuotes / 2 + numberOfOpenBrackets > 1) {
+        throw new Error("Multiple escaped blocks in format");
+      }
+      convertedFormat = convertedFormat.replace(/"(.*)"/g, "[$$$1]"); // replace '"..."' by '[$...]'
+
+      convertedFormat = convertedFormat.replace(/_.{1}/g, ""); // _ == ignore width of next char for align purposes. Not supported ATM
+      convertedFormat = convertedFormat.replace(/\*.{1}/g, ""); // * == repeat next character enough to fill the line. Not supported ATM
+
+      convertedFormat = convertedFormat.replace(/\\ /g, " "); // unescape spaces
+
+      convertedFormat = convertedFormat.replace(/\\./g, (match) => match[1]); // unescape other characters
+
+      if (isXlsxDateFormat(convertedFormat)) {
+        convertedFormat = convertDateFormat(convertedFormat);
+      }
+
+      if (isFormatSupported(convertedFormat)) {
+        return convertedFormat;
+      }
+    } catch (e) {}
+  }
+
+  warningManager.generateNotSupportedWarning(
+    WarningTypes.NumFmtIdNotSupported,
+    format || `nmFmtId ${numFmtId}`
+  );
+  return undefined;
+}
+
+function isFormatSupported(format: string): boolean {
+  try {
+    formatValue(0, format);
+    return true;
+  } catch (e) {
+    return false;
+  }
+}
+
+function isXlsxDateFormat(format: string): boolean {
+  return format.match(XLSX_DATE_FORMAT_REGEX) !== null;
+}
+
+function convertDateFormat(format: string): string {
+  // Some of these aren't defined neither in the OpenXML spec not the Xlsx extension of OpenXML,
+  // but can still occur and are supported by Excel/Google sheets
+
+  format = format.toLowerCase();
+  format = format.replace(/mmmmm/g, "mmm");
+  format = format.replace(/am\/pm|a\/m/g, "a");
+  format = format.replace(/hhhh/g, "hh");
+  format = format.replace(/\bh\b/g, "hh");
+
+  return format;
+}
diff --git a/src/xlsx/conversion/style_conversion.ts b/src/xlsx/conversion/style_conversion.ts
index b94e41f3c8..d1918faaf4 100644
--- a/src/xlsx/conversion/style_conversion.ts
+++ b/src/xlsx/conversion/style_conversion.ts
@@ -1,5 +1,4 @@
 import { fontSizeMap } from "../../fonts";
-import { formatValue } from "../../helpers";
 import { Border, BorderDescr, Style } from "../../types";
 import {
   XLSXBorder,
@@ -9,7 +8,6 @@ import {
   XLSXFont,
   XLSXHorizontalAlignment,
   XLSXImportData,
-  XLSXNumFormat,
   XLSXVerticalAlignment,
 } from "../../types/xlsx";
 import { arrayToObject } from "../helpers/misc";
@@ -22,8 +20,8 @@ import {
   SUPPORTED_FILL_PATTERNS,
   SUPPORTED_FONTS,
   SUPPORTED_HORIZONTAL_ALIGNMENTS,
-  XLSX_FORMATS_CONVERSION_MAP,
 } from "./conversion_maps";
+import { convertXlsxFormat } from "./format_conversion";
 
 interface StyleStruct {
   fontStyle?: XLSXFont;
@@ -124,54 +122,6 @@ export function convertFormats(
   return arrayToObject(formats, 1);
 }
 
-/**
- * Convert excel format to o_spreadsheet format
- *
- * Excel format are defined in openXML §18.8.31
- */
-export function convertXlsxFormat(
-  numFmtId: number,
-  formats: XLSXNumFormat[],
-  warningManager: XLSXImportWarningManager
-): string | undefined {
-  if (numFmtId === 0) {
-    return undefined;
-  }
-  // Format is either defined in the imported data, or the formatId is defined in openXML §18.8.30
-  let format =
-    XLSX_FORMATS_CONVERSION_MAP[numFmtId] || formats.find((f) => f.id === numFmtId)?.format;
-
-  if (format) {
-    try {
-      let convertedFormat = format.replace(/(.*?);.*/, "$1"); // only take first part of multi-part format
-      convertedFormat = convertedFormat.replace(/\[(.*)-[A-Z0-9]{3}\]/g, "[$1]"); // remove currency and locale/date system/number system info (ECMA §18.8.31)
-      convertedFormat = convertedFormat.replace(/\[\$\]/g, ""); // remove empty bocks
-
-      // Quotes in format escape sequences of characters. ATM we only support [$...] blocks to escape characters, and only one of them per format
-      const numberOfQuotes = convertedFormat.match(/"/g)?.length || 0;
-      const numberOfOpenBrackets = convertedFormat.match(/\[/g)?.length || 0;
-      if (numberOfQuotes / 2 + numberOfOpenBrackets > 1) {
-        throw new Error("Multiple escaped blocks in format");
-      }
-      convertedFormat = convertedFormat.replace(/"(.*)"/g, "[$$$1]"); // replace '"..."' by '[$...]'
-
-      convertedFormat = convertedFormat.replace(/_.{1}/g, ""); // _ == ignore with of next char for align purposes. Not supported ATM
-      convertedFormat = convertedFormat.replace(/\*.{1}/g, ""); // * == repeat next character enough to fill the line. Not supported ATM
-
-      convertedFormat = convertedFormat.replace(/\\ /g, " "); // unescape spaces
-
-      formatValue(0, convertedFormat);
-      return convertedFormat;
-    } catch (e) {}
-  }
-
-  warningManager.generateNotSupportedWarning(
-    WarningTypes.NumFmtIdNotSupported,
-    format || `nmFmtId ${numFmtId}`
-  );
-  return undefined;
-}
-
 /**
  * We currently only support only a set of font sizes, we cannot define new font sizes.
  * This function adapts an arbitrary font size to the closest supported font size.
diff --git a/tests/__xlsx__/xlsx_demo_data/docProps/app.xml b/tests/__xlsx__/xlsx_demo_data/docProps/app.xml
index 6de9966268..c3f76e3cda 100644
--- a/tests/__xlsx__/xlsx_demo_data/docProps/app.xml
+++ b/tests/__xlsx__/xlsx_demo_data/docProps/app.xml
@@ -9,7 +9,7 @@
         <vt:lpstr>Worksheets</vt:lpstr>
       </vt:variant>
       <vt:variant>
-        <vt:i4>10</vt:i4>
+        <vt:i4>11</vt:i4>
       </vt:variant>
     </vt:vector>
   </HeadingPairs>
diff --git a/tests/__xlsx__/xlsx_demo_data/docProps/core.xml b/tests/__xlsx__/xlsx_demo_data/docProps/core.xml
index 91cd0d506c..c5577ad9a4 100644
--- a/tests/__xlsx__/xlsx_demo_data/docProps/core.xml
+++ b/tests/__xlsx__/xlsx_demo_data/docProps/core.xml
@@ -2,5 +2,5 @@
 <cp:coreProperties xmlns:cp="http://schemas.openxmlformats.org/package/2006/metadata/core-properties" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dcterms="http://purl.org/dc/terms/" xmlns:dcmitype="http://purl.org/dc/dcmitype/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <cp:lastModifiedBy>Adrien</cp:lastModifiedBy>
   <dcterms:created xsi:type="dcterms:W3CDTF">2022-02-10T15:47:12Z</dcterms:created>
-  <dcterms:modified xsi:type="dcterms:W3CDTF">2022-10-11T11:39:36Z</dcterms:modified>
+  <dcterms:modified xsi:type="dcterms:W3CDTF">2023-03-28T12:16:40Z</dcterms:modified>
 </cp:coreProperties>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/calcChain.xml b/tests/__xlsx__/xlsx_demo_data/xl/calcChain.xml
index 3e64084422..ea39ba4488 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/calcChain.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/calcChain.xml
@@ -370,5 +370,5 @@
   <c r="D154" i="3"/>
   <c r="D38" i="3"/>
   <c r="D65" i="3"/>
-  <c r="C14" i="1" l="1"/>
+  <c r="C14" i="1"/>
 </calcChain>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/sharedStrings.xml b/tests/__xlsx__/xlsx_demo_data/xl/sharedStrings.xml
index b349fa7873..c6c7a16480 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/sharedStrings.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/sharedStrings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="458" uniqueCount="410">
+<sst xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" count="457" uniqueCount="409">
   <si>
     <t>CF =42</t>
   </si>
@@ -1210,9 +1210,6 @@
   <si>
     <t>#,##0[$ EUR €]</t>
   </si>
-  <si>
-    <t>d/m/yy</t>
-  </si>
   <si>
     <t>not supported: multiple escaped sequences</t>
   </si>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/styles.xml b/tests/__xlsx__/xlsx_demo_data/xl/styles.xml
index a7eb8fa17f..99cc5a7b71 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/styles.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/styles.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <styleSheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:x16r2="http://schemas.microsoft.com/office/spreadsheetml/2015/02/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" mc:Ignorable="x14ac x16r2 xr">
-  <numFmts count="8">
+  <numFmts count="7">
     <numFmt numFmtId="164" formatCode="m/d/yyyy"/>
     <numFmt numFmtId="165" formatCode="m/d/yyyy\ hh:mm:ss"/>
     <numFmt numFmtId="166" formatCode="#,##0.00\ &quot;€&quot;"/>
     <numFmt numFmtId="167" formatCode="[$$-409]#,##0.000"/>
-    <numFmt numFmtId="168" formatCode="d/m/yy;@"/>
     <numFmt numFmtId="169" formatCode="[$₪-40D]\ #,##0"/>
     <numFmt numFmtId="170" formatCode="#,##0&quot; EUR €&quot;"/>
     <numFmt numFmtId="171" formatCode="&quot;€&quot;#,##0.00\ &quot;€&quot;"/>
@@ -700,7 +699,7 @@
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0"/>
     <xf numFmtId="0" fontId="22" fillId="0" borderId="0" applyNumberFormat="0" applyFill="0" applyBorder="0" applyAlignment="0" applyProtection="0"/>
   </cellStyleXfs>
-  <cellXfs count="132">
+  <cellXfs count="110">
     <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="1" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment vertical="center"/>
@@ -765,15 +764,10 @@
     <xf numFmtId="19" fontId="2" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" applyFont="1" applyAlignment="1">
       <alignment vertical="center"/>
     </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyFill="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="11" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment vertical="center"/>
     </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment horizontal="left"/>
     </xf>
@@ -795,7 +789,6 @@
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment horizontal="distributed"/>
     </xf>
-    <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment vertical="top"/>
     </xf>
@@ -808,17 +801,12 @@
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment vertical="distributed"/>
     </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="8" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="8" fillId="0" borderId="21" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="0" fillId="0" borderId="21" xfId="0" applyBorder="1"/>
     <xf numFmtId="0" fontId="8" fillId="0" borderId="23" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="22" xfId="0" applyFont="1" applyBorder="1"/>
-    <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyFill="1" applyBorder="1"/>
     <xf numFmtId="14" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
-    <xf numFmtId="0" fontId="10" fillId="0" borderId="22" xfId="0" applyFont="1" applyFill="1" applyBorder="1"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="10" fillId="5" borderId="0" xfId="0" applyFont="1" applyFill="1"/>
     <xf numFmtId="0" fontId="10" fillId="6" borderId="0" xfId="0" applyFont="1" applyFill="1"/>
     <xf numFmtId="0" fontId="10" fillId="7" borderId="0" xfId="0" applyFont="1" applyFill="1"/>
@@ -848,10 +836,6 @@
     <xf numFmtId="0" fontId="10" fillId="0" borderId="19" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="20" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="12" fillId="0" borderId="0" xfId="0" applyFont="1"/>
-    <xf numFmtId="0" fontId="8" fillId="0" borderId="0" xfId="0" applyFont="1" applyFill="1" applyBorder="1"/>
-    <xf numFmtId="0" fontId="8" fillId="0" borderId="21" xfId="0" applyFont="1" applyFill="1" applyBorder="1"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyBorder="1"/>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="9" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="13" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="14" fillId="0" borderId="0" xfId="0" applyFont="1"/>
@@ -867,21 +851,10 @@
     <xf numFmtId="0" fontId="10" fillId="26" borderId="0" xfId="0" applyFont="1" applyFill="1"/>
     <xf numFmtId="0" fontId="10" fillId="27" borderId="0" xfId="0" applyFont="1" applyFill="1"/>
     <xf numFmtId="0" fontId="17" fillId="0" borderId="0" xfId="0" applyFont="1"/>
-    <xf numFmtId="0" fontId="18" fillId="0" borderId="0" xfId="0" applyFont="1" applyFill="1" applyBorder="1"/>
+    <xf numFmtId="0" fontId="18" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="19" fillId="0" borderId="0" xfId="0" applyFont="1"/>
     <xf numFmtId="0" fontId="20" fillId="0" borderId="0" xfId="0" applyFont="1"/>
-    <xf numFmtId="0" fontId="2" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
-      <alignment vertical="center"/>
-    </xf>
-    <xf numFmtId="0" fontId="2" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
-      <alignment vertical="center"/>
-    </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="22" fillId="0" borderId="0" xfId="2"/>
-    <xf numFmtId="0" fontId="2" fillId="0" borderId="0" xfId="0" applyNumberFormat="1" applyFont="1" applyAlignment="1">
-      <alignment vertical="center"/>
-    </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="8" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="24" xfId="0" applyFont="1" applyBorder="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="25" xfId="0" applyFont="1" applyBorder="1"/>
@@ -889,7 +862,6 @@
     <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyAlignment="1">
       <alignment horizontal="left"/>
     </xf>
-    <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
     <xf numFmtId="0" fontId="0" fillId="0" borderId="0" xfId="0" applyAlignment="1">
       <alignment horizontal="left" indent="1"/>
     </xf>
@@ -902,7 +874,6 @@
     <xf numFmtId="14" fontId="0" fillId="0" borderId="27" xfId="0" applyNumberFormat="1" applyBorder="1"/>
     <xf numFmtId="166" fontId="0" fillId="0" borderId="27" xfId="0" applyNumberFormat="1" applyBorder="1"/>
     <xf numFmtId="167" fontId="0" fillId="0" borderId="27" xfId="0" applyNumberFormat="1" applyBorder="1"/>
-    <xf numFmtId="168" fontId="0" fillId="0" borderId="0" xfId="0" applyNumberFormat="1"/>
     <xf numFmtId="0" fontId="10" fillId="0" borderId="0" xfId="0" applyFont="1" applyAlignment="1">
       <alignment wrapText="1"/>
     </xf>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/tables/table1.xml b/tests/__xlsx__/xlsx_demo_data/xl/tables/table1.xml
index 957f31d5f3..36f7b2ba55 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/tables/table1.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/tables/table1.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="xr xr3" id="3" xr:uid="{09C35CC7-7259-4A97-8FEA-EDB47375DF08}" name="Table3" displayName="Table3" ref="C3:J6" totalsRowCount="1" headerRowDxfId="17" dataDxfId="16">
+<table xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="xr xr3" id="3" xr:uid="{09C35CC7-7259-4A97-8FEA-EDB47375DF08}" name="Table3" displayName="Table3" ref="C3:J6" totalsRowCount="1" headerRowDxfId="43" dataDxfId="42">
   <autoFilter ref="C3:J5" xr:uid="{09C35CC7-7259-4A97-8FEA-EDB47375DF08}">
     <filterColumn colId="0" hiddenButton="1"/>
     <filterColumn colId="1" hiddenButton="1"/>
@@ -11,22 +11,22 @@
     <filterColumn colId="7" hiddenButton="1"/>
   </autoFilter>
   <tableColumns count="8">
-    <tableColumn id="1" xr3:uid="{C4EE018E-238B-42BA-9035-DB01FA5420D3}" name="Name" totalsRowLabel="Total" dataDxfId="15" totalsRowDxfId="14"/>
-    <tableColumn id="2" xr3:uid="{C1F6911F-9482-4C98-BBFB-21D9CAA66DA4}" name="Age" totalsRowFunction="sum" dataDxfId="13" totalsRowDxfId="12"/>
-    <tableColumn id="5" xr3:uid="{3CE9F5DA-0A57-4696-B4E0-53601C3B7798}" name="Rank" totalsRowFunction="sum" dataDxfId="11" totalsRowDxfId="10"/>
-    <tableColumn id="6" xr3:uid="{34912838-665C-4472-B558-25990E5B148D}" name="Rank+Age =E4+D4" totalsRowFunction="sum" dataDxfId="9" totalsRowDxfId="8">
+    <tableColumn id="1" xr3:uid="{C4EE018E-238B-42BA-9035-DB01FA5420D3}" name="Name" totalsRowLabel="Total" dataDxfId="41" totalsRowDxfId="40"/>
+    <tableColumn id="2" xr3:uid="{C1F6911F-9482-4C98-BBFB-21D9CAA66DA4}" name="Age" totalsRowFunction="sum" dataDxfId="39" totalsRowDxfId="38"/>
+    <tableColumn id="5" xr3:uid="{3CE9F5DA-0A57-4696-B4E0-53601C3B7798}" name="Rank" totalsRowFunction="sum" dataDxfId="37" totalsRowDxfId="36"/>
+    <tableColumn id="6" xr3:uid="{34912838-665C-4472-B558-25990E5B148D}" name="Rank+Age =E4+D4" totalsRowFunction="sum" dataDxfId="35" totalsRowDxfId="34">
       <calculatedColumnFormula>Table3[[#This Row],[Rank]]+Table3[[#This Row],[Age]]</calculatedColumnFormula>
     </tableColumn>
-    <tableColumn id="7" xr3:uid="{89D90022-7073-4067-BAF8-1587D27C4AFB}" name="Data =SUM(E4:E5)" totalsRowFunction="sum" dataDxfId="7" totalsRowDxfId="6">
+    <tableColumn id="7" xr3:uid="{89D90022-7073-4067-BAF8-1587D27C4AFB}" name="Data =SUM(E4:E5)" totalsRowFunction="sum" dataDxfId="33" totalsRowDxfId="32">
       <calculatedColumnFormula>SUM(Table3[Rank])</calculatedColumnFormula>
     </tableColumn>
-    <tableColumn id="8" xr3:uid="{B2A7E5BB-A379-492B-9484-72F2FD1FF3A0}" name="All =SUM(E3:E6)" totalsRowFunction="sum" dataDxfId="5" totalsRowDxfId="4">
+    <tableColumn id="8" xr3:uid="{B2A7E5BB-A379-492B-9484-72F2FD1FF3A0}" name="All =SUM(E3:E6)" totalsRowFunction="sum" dataDxfId="31" totalsRowDxfId="30">
       <calculatedColumnFormula>SUM(Table3[[#All],[Rank]])</calculatedColumnFormula>
     </tableColumn>
-    <tableColumn id="9" xr3:uid="{3C532A69-E4BC-4A20-A922-4BCAA0D3FEC9}" name="Totals =E6" totalsRowFunction="sum" dataDxfId="3" totalsRowDxfId="2">
+    <tableColumn id="9" xr3:uid="{3C532A69-E4BC-4A20-A922-4BCAA0D3FEC9}" name="Totals =E6" totalsRowFunction="sum" dataDxfId="29" totalsRowDxfId="28">
       <calculatedColumnFormula>Table3[[#Totals],[Rank]]</calculatedColumnFormula>
     </tableColumn>
-    <tableColumn id="10" xr3:uid="{35E9E9C3-9148-468A-85B6-19290CEB6F00}" name="Headers =E3" totalsRowFunction="sum" dataDxfId="1" totalsRowDxfId="0">
+    <tableColumn id="10" xr3:uid="{35E9E9C3-9148-468A-85B6-19290CEB6F00}" name="Headers =E3" totalsRowFunction="sum" dataDxfId="27" totalsRowDxfId="26">
       <calculatedColumnFormula>Table3[[#Headers],[Rank]]</calculatedColumnFormula>
     </tableColumn>
   </tableColumns>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/workbook.xml b/tests/__xlsx__/xlsx_demo_data/xl/workbook.xml
index 82eeff5aad..ef3f4a6dd0 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/workbook.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/workbook.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <workbook xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x15="http://schemas.microsoft.com/office/spreadsheetml/2010/11/main" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr6="http://schemas.microsoft.com/office/spreadsheetml/2016/revision6" xmlns:xr10="http://schemas.microsoft.com/office/spreadsheetml/2016/revision10" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" mc:Ignorable="x15 xr xr6 xr10 xr2">
-  <fileVersion appName="xl" lastEdited="7" lowestEdited="7" rupBuild="25629"/>
+  <fileVersion appName="xl" lastEdited="7" lowestEdited="7" rupBuild="26130"/>
   <workbookPr defaultThemeVersion="166925"/>
   <mc:AlternateContent xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006">
     <mc:Choice Requires="x15">
-      <x15ac:absPath xmlns:x15ac="http://schemas.microsoft.com/office/spreadsheetml/2010/11/ac" url="C:\code\odoo\spreadsheet\tests\__xlsx__\"/>
+      <x15ac:absPath xmlns:x15ac="http://schemas.microsoft.com/office/spreadsheetml/2010/11/ac" url="C:\Users\Adrien\odoo\spreadsheet\tests\__xlsx__\"/>
     </mc:Choice>
   </mc:AlternateContent>
-  <xr:revisionPtr revIDLastSave="0" documentId="13_ncr:1_{7338CB10-52AC-4917-8A83-3702662B7FBB}" xr6:coauthVersionLast="47" xr6:coauthVersionMax="47" xr10:uidLastSave="{00000000-0000-0000-0000-000000000000}"/>
+  <xr:revisionPtr revIDLastSave="0" documentId="13_ncr:1_{5C3E289D-5566-4571-A4D9-8DD7AA83E399}" xr6:coauthVersionLast="47" xr6:coauthVersionMax="47" xr10:uidLastSave="{00000000-0000-0000-0000-000000000000}"/>
   <bookViews>
-    <workbookView xWindow="-28920" yWindow="-1860" windowWidth="29040" windowHeight="18240" activeTab="5" xr2:uid="{00000000-000D-0000-FFFF-FFFF00000000}"/>
+    <workbookView xWindow="-120" yWindow="-120" windowWidth="29040" windowHeight="15840" activeTab="3" xr2:uid="{00000000-000D-0000-FFFF-FFFF00000000}"/>
   </bookViews>
   <sheets>
     <sheet name="Sheet1" sheetId="1" r:id="rId1"/>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/_rels/sheet4.xml.rels b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/_rels/sheet4.xml.rels
deleted file mode 100644
index f252cca8e6..0000000000
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/_rels/sheet4.xml.rels
+++ /dev/null
@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
-  <Relationship Id="rId1" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/printerSettings" Target="../printerSettings/printerSettings1.bin"/>
-</Relationships>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet1.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet1.xml
index a9026497c0..bc5e7b2c21 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet1.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet1.xml
@@ -16,7 +16,7 @@
   </cols>
   <sheetData>
     <row r="1" spans="1:12" ht="38.25" customHeight="1" x14ac:dyDescent="0.2">
-      <c r="A1" s="24"/>
+      <c r="A1" s="22"/>
       <c r="C1" s="1" t="s">
         <v>0</v>
       </c>
@@ -25,7 +25,7 @@
       </c>
     </row>
     <row r="2" spans="1:12" ht="27.75" x14ac:dyDescent="0.2">
-      <c r="B2" s="25" t="s">
+      <c r="B2" s="23" t="s">
         <v>2</v>
       </c>
       <c r="F2" s="3" t="s">
@@ -34,10 +34,10 @@
       <c r="G2" s="2">
         <v>5</v>
       </c>
-      <c r="H2" s="126" t="s">
+      <c r="H2" s="104" t="s">
         <v>4</v>
       </c>
-      <c r="I2" s="127"/>
+      <c r="I2" s="105"/>
       <c r="K2" s="4"/>
     </row>
     <row r="3" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -47,10 +47,10 @@
       <c r="G3" s="2">
         <v>8</v>
       </c>
-      <c r="H3" s="127"/>
-      <c r="I3" s="127"/>
+      <c r="H3" s="105"/>
+      <c r="I3" s="105"/>
       <c r="J3" s="6"/>
-      <c r="K3" s="128">
+      <c r="K3" s="106">
         <v>5</v>
       </c>
       <c r="L3" s="7"/>
@@ -68,10 +68,10 @@
       <c r="G4" s="2">
         <v>9</v>
       </c>
-      <c r="H4" s="127"/>
-      <c r="I4" s="127"/>
+      <c r="H4" s="105"/>
+      <c r="I4" s="105"/>
       <c r="J4" s="6"/>
-      <c r="K4" s="129"/>
+      <c r="K4" s="107"/>
       <c r="L4" s="7"/>
     </row>
     <row r="5" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -81,10 +81,10 @@
       <c r="G5" s="2">
         <v>15</v>
       </c>
-      <c r="H5" s="127"/>
-      <c r="I5" s="127"/>
+      <c r="H5" s="105"/>
+      <c r="I5" s="105"/>
       <c r="J5" s="6"/>
-      <c r="K5" s="129"/>
+      <c r="K5" s="107"/>
       <c r="L5" s="7"/>
     </row>
     <row r="6" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -92,7 +92,7 @@
         <v>22</v>
       </c>
       <c r="J6" s="6"/>
-      <c r="K6" s="129"/>
+      <c r="K6" s="107"/>
       <c r="L6" s="7"/>
     </row>
     <row r="7" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -100,7 +100,7 @@
         <v>3</v>
       </c>
       <c r="J7" s="6"/>
-      <c r="K7" s="129"/>
+      <c r="K7" s="107"/>
       <c r="L7" s="7"/>
     </row>
     <row r="8" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -108,7 +108,7 @@
         <v>30</v>
       </c>
       <c r="J8" s="6"/>
-      <c r="K8" s="130"/>
+      <c r="K8" s="108"/>
       <c r="L8" s="7"/>
     </row>
     <row r="9" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
@@ -129,7 +129,6 @@
       <c r="D10" s="2" t="s">
         <v>9</v>
       </c>
-      <c r="F10" s="23"/>
     </row>
     <row r="11" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="C11" s="2">
@@ -160,7 +159,6 @@
         <f ca="1">C14</f>
         <v>#CYCLE</v>
       </c>
-      <c r="F14" s="22"/>
     </row>
     <row r="15" spans="1:12" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="C15" s="2" t="s">
@@ -182,7 +180,6 @@
       <c r="C18" s="2" t="s">
         <v>14</v>
       </c>
-      <c r="H18" s="26"/>
     </row>
     <row r="19" spans="1:9" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="E19" s="4"/>
@@ -409,7 +406,7 @@
     <mergeCell ref="K3:K8"/>
   </mergeCells>
   <conditionalFormatting sqref="C1:C100 B21">
-    <cfRule type="cellIs" dxfId="43" priority="1" operator="equal">
+    <cfRule type="cellIs" dxfId="25" priority="1" operator="equal">
       <formula>42</formula>
     </cfRule>
   </conditionalFormatting>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet2.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet2.xml
index 43ea3e4d7b..f9fd1add36 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet2.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet2.xml
@@ -83,11 +83,11 @@
         <f>SUM(H2, I$2)</f>
         <v>1230.7</v>
       </c>
-      <c r="Q2" s="28">
+      <c r="Q2">
         <f>SUM(H2, $I2)</f>
         <v>1230.7</v>
       </c>
-      <c r="R2" s="28">
+      <c r="R2">
         <f>SUM(H2, $I$2)</f>
         <v>1230.7</v>
       </c>
@@ -125,15 +125,15 @@
       <c r="N3" s="2">
         <v>0.4</v>
       </c>
-      <c r="P3" s="28">
+      <c r="P3">
         <f t="shared" ref="P3:P6" si="1">SUM(H3, I$2)</f>
         <v>1217.7</v>
       </c>
-      <c r="Q3" s="28">
+      <c r="Q3">
         <f t="shared" ref="Q3:Q6" si="2">SUM(H3, $I3)</f>
         <v>513.9</v>
       </c>
-      <c r="R3" s="28">
+      <c r="R3">
         <f t="shared" ref="R3:R6" si="3">SUM(H3, $I$2)</f>
         <v>1217.7</v>
       </c>
@@ -171,15 +171,15 @@
       <c r="N4" s="2">
         <v>0.5</v>
       </c>
-      <c r="P4" s="28">
+      <c r="P4">
         <f t="shared" si="1"/>
         <v>1230.7</v>
       </c>
-      <c r="Q4" s="28">
+      <c r="Q4">
         <f t="shared" si="2"/>
         <v>278.39999999999998</v>
       </c>
-      <c r="R4" s="28">
+      <c r="R4">
         <f t="shared" si="3"/>
         <v>1230.7</v>
       </c>
@@ -217,15 +217,15 @@
       <c r="N5" s="2">
         <v>0.6</v>
       </c>
-      <c r="P5" s="28">
+      <c r="P5">
         <f t="shared" si="1"/>
         <v>1246.7</v>
       </c>
-      <c r="Q5" s="28">
+      <c r="Q5">
         <f t="shared" si="2"/>
         <v>4743.3</v>
       </c>
-      <c r="R5" s="28">
+      <c r="R5">
         <f t="shared" si="3"/>
         <v>1246.7</v>
       </c>
@@ -263,15 +263,15 @@
       <c r="N6" s="2" t="s">
         <v>50</v>
       </c>
-      <c r="P6" s="28">
+      <c r="P6">
         <f t="shared" si="1"/>
         <v>1213.7</v>
       </c>
-      <c r="Q6" s="28">
+      <c r="Q6">
         <f t="shared" si="2"/>
         <v>21.1</v>
       </c>
-      <c r="R6" s="28">
+      <c r="R6">
         <f t="shared" si="3"/>
         <v>1213.7</v>
       </c>
@@ -309,7 +309,6 @@
       <c r="N7" s="2" t="b">
         <v>1</v>
       </c>
-      <c r="P7" s="28"/>
     </row>
     <row r="8" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A8" s="2" t="s">
@@ -344,8 +343,6 @@
       <c r="N8" s="2" t="b">
         <v>0</v>
       </c>
-      <c r="P8" s="28"/>
-      <c r="Q8" s="28"/>
     </row>
     <row r="9" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A9" s="2" t="s">
@@ -377,7 +374,6 @@
       <c r="K9" s="2">
         <v>30</v>
       </c>
-      <c r="P9" s="28"/>
     </row>
     <row r="10" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A10" s="2" t="s">
@@ -394,7 +390,6 @@
         <f t="shared" si="0"/>
         <v>1</v>
       </c>
-      <c r="P10" s="28"/>
     </row>
     <row r="11" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A11" s="2" t="s">
@@ -414,8 +409,6 @@
       <c r="G11" s="2" t="s">
         <v>59</v>
       </c>
-      <c r="P11" s="28"/>
-      <c r="Q11" s="28"/>
     </row>
     <row r="12" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A12" s="2" t="s">
@@ -447,7 +440,6 @@
       <c r="K12" s="18" t="s">
         <v>39</v>
       </c>
-      <c r="P12" s="28"/>
     </row>
     <row r="13" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A13" s="2" t="s">
@@ -479,7 +471,6 @@
       <c r="K13" s="2" t="s">
         <v>65</v>
       </c>
-      <c r="P13" s="28"/>
     </row>
     <row r="14" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A14" s="2" t="s">
@@ -496,7 +487,6 @@
         <f t="shared" si="0"/>
         <v>1</v>
       </c>
-      <c r="P14" s="28"/>
     </row>
     <row r="15" spans="1:18" ht="17.25" customHeight="1" x14ac:dyDescent="0.2">
       <c r="A15" s="2" t="s">
@@ -1869,7 +1859,7 @@
       </c>
       <c r="B100" s="20">
         <f ca="1">NOW()</f>
-        <v>44659.691878356483</v>
+        <v>45013.594915277776</v>
       </c>
       <c r="D100" s="2">
         <f ca="1">IF(ISNUMBER(B100),1,0)</f>
@@ -2559,7 +2549,7 @@
       </c>
       <c r="B144" s="19">
         <f ca="1">TODAY()</f>
-        <v>44659</v>
+        <v>45013</v>
       </c>
       <c r="D144" s="2">
         <f ca="1">IF(ISNUMBER(B144),1,0)</f>
@@ -2841,12 +2831,12 @@
     </row>
   </sheetData>
   <conditionalFormatting sqref="D1:D180">
-    <cfRule type="cellIs" dxfId="42" priority="1" operator="equal">
+    <cfRule type="cellIs" dxfId="24" priority="1" operator="equal">
       <formula>1</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="D1:D180">
-    <cfRule type="cellIs" dxfId="41" priority="2" operator="equal">
+    <cfRule type="cellIs" dxfId="23" priority="2" operator="equal">
       <formula>0</formula>
     </cfRule>
   </conditionalFormatting>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet3.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet3.xml
index 8fc7353d3e..296280f783 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet3.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet3.xml
@@ -19,14 +19,14 @@
       <c r="C1" t="s">
         <v>355</v>
       </c>
-      <c r="D1" s="131" t="s">
+      <c r="D1" s="109" t="s">
         <v>358</v>
       </c>
-      <c r="E1" s="131"/>
+      <c r="E1" s="109"/>
       <c r="F1" t="s">
         <v>359</v>
       </c>
-      <c r="H1" s="42" t="s">
+      <c r="H1" s="35" t="s">
         <v>397</v>
       </c>
     </row>
@@ -35,18 +35,18 @@
         <f>SUM(A1)</f>
         <v>0</v>
       </c>
-      <c r="D2" s="131"/>
-      <c r="E2" s="131"/>
+      <c r="D2" s="109"/>
+      <c r="E2" s="109"/>
       <c r="H2" t="str">
         <f>[1]Feuil1!$A$1</f>
         <v>referenced string</v>
       </c>
     </row>
     <row r="3" spans="1:8" x14ac:dyDescent="0.2">
-      <c r="D3" s="104" t="s">
+      <c r="D3" s="86" t="s">
         <v>357</v>
       </c>
-      <c r="F3" s="104" t="s">
+      <c r="F3" s="86" t="s">
         <v>396</v>
       </c>
     </row>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet4.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet4.xml
index 85632f8941..aba547e43f 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet4.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet4.xml
@@ -1,487 +1,373 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="x14ac xr xr2 xr3" xr:uid="{6530EB98-7261-4238-8CE1-B5FC3E802158}">
-  <dimension ref="A1:P30"/>
+  <dimension ref="A1:M30"/>
   <sheetViews>
-    <sheetView zoomScale="145" zoomScaleNormal="145" workbookViewId="0">
-      <selection activeCell="K10" sqref="K10"/>
+    <sheetView tabSelected="1" zoomScale="145" zoomScaleNormal="145" workbookViewId="0">
+      <selection activeCell="L12" sqref="L12"/>
     </sheetView>
   </sheetViews>
   <sheetFormatPr defaultColWidth="9.140625" defaultRowHeight="12.75" x14ac:dyDescent="0.2"/>
   <cols>
-    <col min="1" max="2" width="9.140625" style="27"/>
-    <col min="3" max="3" width="17.7109375" style="27" customWidth="1"/>
-    <col min="4" max="4" width="9.140625" style="27"/>
-    <col min="5" max="5" width="18.28515625" style="27" customWidth="1"/>
-    <col min="6" max="12" width="9.140625" style="27"/>
-    <col min="13" max="13" width="10.42578125" style="27" bestFit="1" customWidth="1"/>
-    <col min="14" max="16384" width="9.140625" style="27"/>
+    <col min="3" max="3" width="17.7109375" customWidth="1"/>
+    <col min="5" max="5" width="18.28515625" customWidth="1"/>
+    <col min="13" max="13" width="10.42578125" bestFit="1" customWidth="1"/>
   </cols>
   <sheetData>
-    <row r="1" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A1" s="80" t="s">
+    <row r="1" spans="1:13" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A1" s="69" t="s">
         <v>304</v>
       </c>
-      <c r="C1" s="42" t="s">
+      <c r="C1" s="35" t="s">
         <v>305</v>
       </c>
-      <c r="E1" s="43" t="s">
+      <c r="E1" s="36" t="s">
         <v>306</v>
       </c>
-      <c r="F1" s="44"/>
-      <c r="H1" s="42" t="s">
+      <c r="F1" s="37"/>
+      <c r="H1" s="35" t="s">
         <v>308</v>
       </c>
-      <c r="J1" s="42" t="s">
+      <c r="J1" s="35" t="s">
         <v>309</v>
       </c>
-      <c r="L1" s="115" t="s">
+      <c r="L1" s="94" t="s">
         <v>392</v>
       </c>
-      <c r="M1" s="44"/>
+      <c r="M1" s="37"/>
     </row>
-    <row r="2" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A2" s="52" t="s">
+    <row r="2" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A2" s="41" t="s">
         <v>239</v>
       </c>
-      <c r="C2" s="107" t="s">
+      <c r="C2" s="87" t="s">
         <v>379</v>
       </c>
-      <c r="E2" s="46" t="s">
+      <c r="E2" s="39" t="s">
         <v>274</v>
       </c>
-      <c r="F2" s="24" t="s">
+      <c r="F2" s="22" t="s">
         <v>226</v>
       </c>
-      <c r="H2" s="88" t="s">
+      <c r="H2" s="73" t="s">
         <v>299</v>
       </c>
-      <c r="J2" s="99" t="s">
+      <c r="J2" s="84" t="s">
         <v>312</v>
       </c>
-      <c r="L2" s="24" t="s">
+      <c r="L2" s="22" t="s">
         <v>395</v>
       </c>
-      <c r="M2" s="116">
+      <c r="M2" s="95">
         <v>10</v>
       </c>
     </row>
-    <row r="3" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A3" s="53" t="s">
+    <row r="3" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A3" s="42" t="s">
         <v>240</v>
       </c>
-      <c r="C3"/>
-      <c r="E3" s="46" t="s">
+      <c r="E3" s="39" t="s">
         <v>15</v>
       </c>
-      <c r="F3" s="29" t="s">
+      <c r="F3" s="24" t="s">
         <v>226</v>
       </c>
-      <c r="H3" s="87" t="s">
+      <c r="H3" s="72" t="s">
         <v>300</v>
       </c>
-      <c r="J3" s="89" t="s">
+      <c r="J3" s="74" t="s">
         <v>381</v>
       </c>
-      <c r="L3" s="24" t="s">
+      <c r="L3" s="22" t="s">
         <v>393</v>
       </c>
-      <c r="M3" s="117">
+      <c r="M3" s="96">
         <v>10</v>
       </c>
     </row>
-    <row r="4" spans="1:16" ht="15" x14ac:dyDescent="0.3">
-      <c r="A4" s="54" t="s">
+    <row r="4" spans="1:13" ht="15" x14ac:dyDescent="0.3">
+      <c r="A4" s="43" t="s">
         <v>241</v>
       </c>
-      <c r="C4" s="68" t="s">
+      <c r="C4" s="57" t="s">
         <v>262</v>
       </c>
-      <c r="E4" s="46" t="s">
+      <c r="E4" s="39" t="s">
         <v>275</v>
       </c>
-      <c r="F4" s="30" t="s">
+      <c r="F4" s="25" t="s">
         <v>226</v>
       </c>
-      <c r="H4" s="42" t="s">
+      <c r="H4" s="35" t="s">
         <v>301</v>
       </c>
-      <c r="J4" s="100" t="s">
+      <c r="J4" s="85" t="s">
         <v>382</v>
       </c>
-      <c r="L4" s="24" t="s">
+      <c r="L4" s="22" t="s">
         <v>394</v>
       </c>
-      <c r="M4" s="118">
+      <c r="M4" s="97">
         <v>10</v>
       </c>
     </row>
-    <row r="5" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A5" s="55" t="s">
+    <row r="5" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A5" s="44" t="s">
         <v>242</v>
       </c>
-      <c r="E5" s="46" t="s">
+      <c r="E5" s="39" t="s">
         <v>276</v>
       </c>
-      <c r="F5" s="31" t="s">
+      <c r="F5" s="26" t="s">
         <v>226</v>
       </c>
-      <c r="H5" s="86" t="s">
+      <c r="H5" s="71" t="s">
         <v>302</v>
       </c>
-      <c r="L5" s="24" t="s">
+      <c r="L5" s="22" t="s">
         <v>401</v>
       </c>
-      <c r="M5" s="119">
+      <c r="M5" s="98">
         <v>10</v>
       </c>
     </row>
-    <row r="6" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A6" s="56" t="s">
+    <row r="6" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A6" s="45" t="s">
         <v>243</v>
       </c>
-      <c r="C6" s="69" t="s">
+      <c r="C6" s="58" t="s">
         <v>263</v>
       </c>
-      <c r="E6" s="46" t="s">
+      <c r="E6" s="39" t="s">
         <v>277</v>
       </c>
-      <c r="F6" s="32" t="s">
+      <c r="F6" s="27" t="s">
         <v>226</v>
       </c>
-      <c r="H6" s="85" t="s">
+      <c r="H6" s="70" t="s">
         <v>303</v>
       </c>
-      <c r="L6" s="24" t="s">
+      <c r="L6" s="22" t="s">
         <v>398</v>
       </c>
-      <c r="M6" s="120">
+      <c r="M6" s="99">
         <v>10</v>
       </c>
     </row>
-    <row r="7" spans="1:16" ht="15.75" x14ac:dyDescent="0.25">
-      <c r="A7" s="57" t="s">
+    <row r="7" spans="1:13" ht="15.75" x14ac:dyDescent="0.25">
+      <c r="A7" s="46" t="s">
         <v>244</v>
       </c>
-      <c r="E7" s="46" t="s">
+      <c r="E7" s="39" t="s">
         <v>278</v>
       </c>
-      <c r="F7" s="33" t="s">
+      <c r="F7" s="28" t="s">
         <v>226</v>
       </c>
-      <c r="H7" s="98" t="s">
+      <c r="H7" s="83" t="s">
         <v>310</v>
       </c>
-      <c r="L7" s="46" t="s">
+      <c r="L7" s="39" t="s">
         <v>400</v>
       </c>
-      <c r="M7" s="123">
+      <c r="M7" s="101">
         <v>10</v>
       </c>
     </row>
-    <row r="8" spans="1:16" ht="21" x14ac:dyDescent="0.35">
-      <c r="A8" s="58" t="s">
+    <row r="8" spans="1:13" ht="21" x14ac:dyDescent="0.35">
+      <c r="A8" s="47" t="s">
         <v>245</v>
       </c>
-      <c r="C8" s="70" t="s">
+      <c r="C8" s="59" t="s">
         <v>264</v>
       </c>
-      <c r="E8" s="46" t="s">
+      <c r="E8" s="39" t="s">
         <v>279</v>
       </c>
-      <c r="F8" s="34" t="s">
+      <c r="F8" s="29" t="s">
         <v>226</v>
       </c>
-      <c r="H8" s="97" t="s">
+      <c r="H8" s="82" t="s">
         <v>311</v>
       </c>
-      <c r="I8"/>
-      <c r="J8"/>
-      <c r="L8" s="49" t="s">
+      <c r="L8" s="39" t="s">
         <v>402</v>
       </c>
-      <c r="M8" s="124">
+      <c r="M8" s="102">
         <v>10</v>
       </c>
-      <c r="N8"/>
-      <c r="O8"/>
-      <c r="P8"/>
     </row>
-    <row r="9" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A9" s="59" t="s">
+    <row r="9" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A9" s="48" t="s">
         <v>246</v>
       </c>
-      <c r="E9" s="46" t="s">
+      <c r="E9" s="39" t="s">
         <v>280</v>
       </c>
-      <c r="F9" s="35" t="s">
+      <c r="F9" s="30" t="s">
         <v>226</v>
       </c>
-      <c r="I9"/>
-      <c r="J9"/>
-      <c r="K9"/>
-      <c r="L9" s="46" t="s">
+      <c r="L9" s="39" t="s">
         <v>403</v>
       </c>
-      <c r="M9" s="121">
+      <c r="M9" s="103">
         <v>10</v>
       </c>
-      <c r="N9"/>
-      <c r="O9"/>
-      <c r="P9"/>
     </row>
-    <row r="10" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="A10" s="60" t="s">
+    <row r="10" spans="1:13" x14ac:dyDescent="0.2">
+      <c r="A10" s="49" t="s">
         <v>247</v>
       </c>
-      <c r="C10" s="71" t="s">
+      <c r="C10" s="60" t="s">
         <v>265</v>
       </c>
-      <c r="D10"/>
-      <c r="E10"/>
-      <c r="I10"/>
-      <c r="J10"/>
-      <c r="K10"/>
-      <c r="L10" s="46" t="s">
-        <v>404</v>
-      </c>
-      <c r="M10" s="125">
-        <v>10</v>
-      </c>
-      <c r="N10"/>
-      <c r="O10"/>
-      <c r="P10"/>
     </row>
-    <row r="11" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A11" s="61" t="s">
+    <row r="11" spans="1:13" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A11" s="50" t="s">
         <v>248</v>
       </c>
-      <c r="E11" s="43" t="s">
+      <c r="E11" s="36" t="s">
         <v>307</v>
       </c>
-      <c r="F11" s="44"/>
-      <c r="I11"/>
-      <c r="J11"/>
-      <c r="K11"/>
-      <c r="L11"/>
-      <c r="M11"/>
-      <c r="N11"/>
-      <c r="O11"/>
-      <c r="P11"/>
+      <c r="F11" s="37"/>
     </row>
-    <row r="12" spans="1:16" ht="18.75" customHeight="1" x14ac:dyDescent="0.2">
-      <c r="A12" s="62" t="s">
+    <row r="12" spans="1:13" ht="18.75" customHeight="1" x14ac:dyDescent="0.2">
+      <c r="A12" s="51" t="s">
         <v>249</v>
       </c>
-      <c r="C12" s="72" t="s">
+      <c r="C12" s="61" t="s">
         <v>266</v>
       </c>
-      <c r="E12" s="46" t="s">
+      <c r="E12" s="39" t="s">
         <v>281</v>
       </c>
-      <c r="F12" s="36" t="s">
+      <c r="F12" s="22" t="s">
         <v>226</v>
       </c>
-      <c r="I12"/>
-      <c r="J12"/>
-      <c r="K12"/>
-      <c r="L12"/>
-      <c r="M12"/>
-      <c r="N12"/>
-      <c r="O12"/>
-      <c r="P12"/>
     </row>
-    <row r="13" spans="1:16" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A13" s="63" t="s">
+    <row r="13" spans="1:13" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A13" s="52" t="s">
         <v>250</v>
       </c>
-      <c r="E13" s="46" t="s">
+      <c r="E13" s="39" t="s">
         <v>16</v>
       </c>
-      <c r="F13" s="37" t="s">
+      <c r="F13" s="31" t="s">
         <v>226</v>
       </c>
-      <c r="I13"/>
-      <c r="J13"/>
-      <c r="K13"/>
-      <c r="N13"/>
-      <c r="O13"/>
-      <c r="P13"/>
     </row>
-    <row r="14" spans="1:16" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A14" s="64" t="s">
+    <row r="14" spans="1:13" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A14" s="53" t="s">
         <v>251</v>
       </c>
-      <c r="C14" s="73" t="s">
+      <c r="C14" s="62" t="s">
         <v>267</v>
       </c>
-      <c r="E14" s="46" t="s">
+      <c r="E14" s="39" t="s">
         <v>275</v>
       </c>
-      <c r="F14" s="38" t="s">
+      <c r="F14" s="32" t="s">
         <v>226</v>
       </c>
-      <c r="I14"/>
-      <c r="J14"/>
-      <c r="K14"/>
-      <c r="N14"/>
-      <c r="O14"/>
-      <c r="P14"/>
     </row>
-    <row r="15" spans="1:16" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A15" s="65" t="s">
+    <row r="15" spans="1:13" ht="18.75" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A15" s="54" t="s">
         <v>252</v>
       </c>
-      <c r="E15" s="46" t="s">
+      <c r="E15" s="39" t="s">
         <v>278</v>
       </c>
-      <c r="F15" s="39" t="s">
+      <c r="F15" s="33" t="s">
         <v>226</v>
       </c>
-      <c r="I15"/>
-      <c r="J15"/>
-      <c r="K15"/>
-      <c r="L15"/>
-      <c r="M15"/>
-      <c r="N15"/>
-      <c r="O15"/>
-      <c r="P15"/>
     </row>
-    <row r="16" spans="1:16" ht="19.5" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A16" s="66" t="s">
+    <row r="16" spans="1:13" ht="19.5" customHeight="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A16" s="55" t="s">
         <v>253</v>
       </c>
-      <c r="C16" s="74" t="s">
+      <c r="C16" s="63" t="s">
         <v>268</v>
       </c>
-      <c r="E16" s="46" t="s">
+      <c r="E16" s="39" t="s">
         <v>280</v>
       </c>
-      <c r="F16" s="40" t="s">
+      <c r="F16" s="34" t="s">
         <v>226</v>
       </c>
-      <c r="I16"/>
-      <c r="J16"/>
-      <c r="K16"/>
-      <c r="L16"/>
-      <c r="M16"/>
-      <c r="N16"/>
-      <c r="O16"/>
-      <c r="P16"/>
     </row>
-    <row r="17" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A17" s="67" t="s">
+    <row r="17" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A17" s="56" t="s">
         <v>254</v>
       </c>
-      <c r="I17"/>
-      <c r="J17"/>
-      <c r="K17"/>
-      <c r="L17"/>
-      <c r="M17"/>
-      <c r="N17"/>
-      <c r="O17"/>
-      <c r="P17"/>
     </row>
-    <row r="18" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A18" s="90" t="s">
+    <row r="18" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A18" s="75" t="s">
         <v>255</v>
       </c>
-      <c r="C18" s="75" t="s">
+      <c r="C18" s="64" t="s">
         <v>269</v>
       </c>
-      <c r="I18"/>
-      <c r="J18"/>
-      <c r="K18"/>
-      <c r="L18"/>
-      <c r="M18"/>
-      <c r="N18"/>
-      <c r="O18"/>
-      <c r="P18"/>
     </row>
-    <row r="19" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A19" s="91" t="s">
+    <row r="19" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A19" s="76" t="s">
         <v>256</v>
       </c>
-      <c r="I19"/>
-      <c r="J19"/>
-      <c r="K19"/>
-      <c r="L19"/>
-      <c r="M19"/>
-      <c r="N19"/>
-      <c r="O19"/>
-      <c r="P19"/>
     </row>
-    <row r="20" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A20" s="92" t="s">
+    <row r="20" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A20" s="77" t="s">
         <v>257</v>
       </c>
-      <c r="C20" s="76" t="s">
+      <c r="C20" s="65" t="s">
         <v>270</v>
       </c>
-      <c r="I20"/>
-      <c r="J20"/>
-      <c r="K20"/>
-      <c r="L20"/>
-      <c r="M20"/>
-      <c r="N20"/>
-      <c r="O20"/>
-      <c r="P20"/>
     </row>
-    <row r="21" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A21" s="93" t="s">
+    <row r="21" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A21" s="78" t="s">
         <v>258</v>
       </c>
-      <c r="I21"/>
-      <c r="J21"/>
-      <c r="K21"/>
-      <c r="L21"/>
-      <c r="M21"/>
-      <c r="N21"/>
-      <c r="O21"/>
-      <c r="P21"/>
     </row>
-    <row r="22" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A22" s="94" t="s">
+    <row r="22" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A22" s="79" t="s">
         <v>259</v>
       </c>
-      <c r="C22" s="77" t="s">
+      <c r="C22" s="66" t="s">
         <v>271</v>
       </c>
-      <c r="E22" s="24"/>
+      <c r="E22" s="22"/>
     </row>
-    <row r="23" spans="1:16" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A23" s="95" t="s">
+    <row r="23" spans="1:5" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A23" s="80" t="s">
         <v>261</v>
       </c>
-      <c r="E23" s="24"/>
+      <c r="E23" s="22"/>
     </row>
-    <row r="24" spans="1:16" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A24" s="96" t="s">
+    <row r="24" spans="1:5" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A24" s="81" t="s">
         <v>260</v>
       </c>
-      <c r="C24" s="78" t="s">
+      <c r="C24" s="67" t="s">
         <v>272</v>
       </c>
-      <c r="E24" s="24"/>
+      <c r="E24" s="22"/>
     </row>
-    <row r="25" spans="1:16" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25"/>
-    <row r="26" spans="1:16" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="C26" s="79" t="s">
+    <row r="25" spans="1:5" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25"/>
+    <row r="26" spans="1:5" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="C26" s="68" t="s">
         <v>273</v>
       </c>
     </row>
-    <row r="27" spans="1:16" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25"/>
-    <row r="28" spans="1:16" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="C28" s="109" t="s">
+    <row r="27" spans="1:5" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25"/>
+    <row r="28" spans="1:5" ht="14.25" thickTop="1" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="C28" s="89" t="s">
         <v>380</v>
       </c>
     </row>
-    <row r="29" spans="1:16" ht="13.5" thickTop="1" x14ac:dyDescent="0.2"/>
-    <row r="30" spans="1:16" x14ac:dyDescent="0.2">
-      <c r="C30" s="108" t="s">
+    <row r="29" spans="1:5" ht="13.5" thickTop="1" x14ac:dyDescent="0.2"/>
+    <row r="30" spans="1:5" x14ac:dyDescent="0.2">
+      <c r="C30" s="88" t="s">
         <v>378</v>
       </c>
     </row>
   </sheetData>
   <pageMargins left="1" right="1" top="1" bottom="1" header="0.5" footer="0.5"/>
-  <pageSetup paperSize="9" orientation="portrait" horizontalDpi="0" verticalDpi="0" r:id="rId1"/>
+  <pageSetup paperSize="9" orientation="portrait" horizontalDpi="0" verticalDpi="0"/>
 </worksheet>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet5.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet5.xml
index dff6d53b01..b4d9bb51d6 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet5.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet5.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="x14ac xr xr2 xr3" xr:uid="{F7CF5882-A593-4D5B-B09A-AA0321448511}">
-  <dimension ref="A1:M39"/>
+  <dimension ref="A1:L39"/>
   <sheetViews>
     <sheetView zoomScaleNormal="100" workbookViewId="0">
       <selection activeCell="D34" sqref="D34"/>
@@ -12,25 +12,25 @@
     <col min="7" max="7" width="15.85546875" customWidth="1"/>
   </cols>
   <sheetData>
-    <row r="1" spans="1:13" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A1" s="45" t="s">
+    <row r="1" spans="1:10" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A1" s="38" t="s">
         <v>347</v>
       </c>
-      <c r="B1" s="43" t="s">
+      <c r="B1" s="36" t="s">
         <v>228</v>
       </c>
-      <c r="C1" s="43" t="s">
+      <c r="C1" s="36" t="s">
         <v>229</v>
       </c>
-      <c r="G1" s="43" t="s">
+      <c r="G1" s="36" t="s">
         <v>318</v>
       </c>
-      <c r="H1" s="44"/>
-      <c r="I1" s="44"/>
-      <c r="J1" s="44"/>
+      <c r="H1" s="37"/>
+      <c r="I1" s="37"/>
+      <c r="J1" s="37"/>
     </row>
-    <row r="2" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A2" s="46" t="s">
+    <row r="2" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A2" s="39" t="s">
         <v>330</v>
       </c>
       <c r="B2">
@@ -39,30 +39,30 @@
       <c r="C2">
         <v>1</v>
       </c>
-      <c r="G2" s="42" t="s">
+      <c r="G2" s="35" t="s">
         <v>313</v>
       </c>
-      <c r="H2" s="24">
+      <c r="H2" s="22">
         <v>5</v>
       </c>
       <c r="I2">
         <v>3</v>
       </c>
-      <c r="J2" s="24">
+      <c r="J2" s="22">
         <v>1</v>
       </c>
     </row>
-    <row r="3" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A3" s="46" t="s">
+    <row r="3" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A3" s="39" t="s">
         <v>340</v>
       </c>
-      <c r="B3" s="24" t="s">
+      <c r="B3" s="22" t="s">
         <v>236</v>
       </c>
-      <c r="C3" s="24" t="s">
+      <c r="C3" s="22" t="s">
         <v>233</v>
       </c>
-      <c r="G3" s="42" t="s">
+      <c r="G3" s="35" t="s">
         <v>314</v>
       </c>
       <c r="H3">
@@ -75,14 +75,14 @@
         <v>1</v>
       </c>
     </row>
-    <row r="4" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A4" s="46" t="s">
+    <row r="4" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A4" s="39" t="s">
         <v>342</v>
       </c>
-      <c r="C4" s="24" t="s">
+      <c r="C4" s="22" t="s">
         <v>230</v>
       </c>
-      <c r="G4" s="42" t="s">
+      <c r="G4" s="35" t="s">
         <v>315</v>
       </c>
       <c r="H4">
@@ -95,8 +95,8 @@
         <v>1</v>
       </c>
     </row>
-    <row r="5" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A5" s="46" t="s">
+    <row r="5" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A5" s="39" t="s">
         <v>344</v>
       </c>
       <c r="B5" t="e">
@@ -106,7 +106,7 @@
       <c r="C5">
         <v>0</v>
       </c>
-      <c r="G5" s="42" t="s">
+      <c r="G5" s="35" t="s">
         <v>317</v>
       </c>
       <c r="H5">
@@ -119,17 +119,17 @@
         <v>1</v>
       </c>
     </row>
-    <row r="6" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A6" s="46" t="s">
+    <row r="6" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A6" s="39" t="s">
         <v>338</v>
       </c>
-      <c r="B6" s="24" t="s">
+      <c r="B6" s="22" t="s">
         <v>235</v>
       </c>
-      <c r="C6" s="24" t="s">
+      <c r="C6" s="22" t="s">
         <v>233</v>
       </c>
-      <c r="G6" s="42" t="s">
+      <c r="G6" s="35" t="s">
         <v>316</v>
       </c>
       <c r="H6">
@@ -142,20 +142,20 @@
         <v>1</v>
       </c>
     </row>
-    <row r="7" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A7" s="46" t="s">
+    <row r="7" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A7" s="39" t="s">
         <v>337</v>
       </c>
-      <c r="B7" s="24" t="s">
+      <c r="B7" s="22" t="s">
         <v>231</v>
       </c>
-      <c r="C7" s="47" t="s">
+      <c r="C7" s="22" t="s">
         <v>232</v>
       </c>
-      <c r="D7" s="47" t="s">
+      <c r="D7" s="22" t="s">
         <v>231</v>
       </c>
-      <c r="G7" s="42" t="s">
+      <c r="G7" s="35" t="s">
         <v>238</v>
       </c>
       <c r="H7">
@@ -168,28 +168,28 @@
         <v>1</v>
       </c>
     </row>
-    <row r="8" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A8" s="46" t="s">
+    <row r="8" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A8" s="39" t="s">
         <v>341</v>
       </c>
-      <c r="B8" s="24" t="s">
+      <c r="B8" s="22" t="s">
         <v>234</v>
       </c>
-      <c r="C8" s="24" t="s">
+      <c r="C8" s="22" t="s">
         <v>233</v>
       </c>
     </row>
-    <row r="9" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A9" s="46" t="s">
+    <row r="9" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A9" s="39" t="s">
         <v>343</v>
       </c>
-      <c r="B9" s="24" t="s">
+      <c r="B9" s="22" t="s">
         <v>230</v>
       </c>
-      <c r="C9" s="24"/>
+      <c r="C9" s="22"/>
     </row>
-    <row r="10" spans="1:13" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="A10" s="46" t="s">
+    <row r="10" spans="1:10" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
+      <c r="A10" s="39" t="s">
         <v>345</v>
       </c>
       <c r="B10">
@@ -199,26 +199,24 @@
         <f>0/0</f>
         <v>#DIV/0!</v>
       </c>
-      <c r="G10" s="43" t="s">
+      <c r="G10" s="36" t="s">
         <v>319</v>
       </c>
-      <c r="H10" s="44"/>
-      <c r="I10" s="44"/>
-      <c r="J10" s="44"/>
-      <c r="L10" s="51"/>
-      <c r="M10" s="51"/>
+      <c r="H10" s="37"/>
+      <c r="I10" s="37"/>
+      <c r="J10" s="37"/>
     </row>
-    <row r="11" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A11" s="46" t="s">
+    <row r="11" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A11" s="39" t="s">
         <v>339</v>
       </c>
-      <c r="B11" s="24" t="s">
+      <c r="B11" s="22" t="s">
         <v>233</v>
       </c>
-      <c r="C11" s="24" t="s">
+      <c r="C11" s="22" t="s">
         <v>234</v>
       </c>
-      <c r="G11" s="81" t="s">
+      <c r="G11" s="35" t="s">
         <v>320</v>
       </c>
       <c r="H11">
@@ -230,22 +228,20 @@
       <c r="J11">
         <v>1</v>
       </c>
-      <c r="L11" s="51"/>
-      <c r="M11" s="51"/>
     </row>
-    <row r="12" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A12" s="46" t="s">
+    <row r="12" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A12" s="39" t="s">
         <v>346</v>
       </c>
-      <c r="B12" s="48">
+      <c r="B12" s="40">
         <f ca="1">TODAY()</f>
-        <v>44659</v>
+        <v>45013</v>
       </c>
-      <c r="C12" s="48">
+      <c r="C12" s="40">
         <f>DATE(2010,10,2)</f>
         <v>40453</v>
       </c>
-      <c r="G12" s="81" t="s">
+      <c r="G12" s="35" t="s">
         <v>323</v>
       </c>
       <c r="H12">
@@ -257,11 +253,9 @@
       <c r="J12">
         <v>1</v>
       </c>
-      <c r="L12" s="51"/>
-      <c r="M12" s="51"/>
     </row>
-    <row r="13" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A13" s="46" t="s">
+    <row r="13" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A13" s="39" t="s">
         <v>335</v>
       </c>
       <c r="B13">
@@ -270,191 +264,191 @@
       <c r="C13">
         <v>5</v>
       </c>
-      <c r="G13" s="42" t="s">
+      <c r="G13" s="35" t="s">
         <v>321</v>
       </c>
-      <c r="H13" s="50">
+      <c r="H13">
         <v>5</v>
       </c>
-      <c r="I13" s="50">
+      <c r="I13">
         <v>3</v>
       </c>
-      <c r="J13" s="50">
+      <c r="J13">
         <v>1</v>
       </c>
     </row>
-    <row r="14" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A14" s="46" t="s">
+    <row r="14" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A14" s="39" t="s">
         <v>336</v>
       </c>
-      <c r="B14" s="24" t="s">
+      <c r="B14" s="22" t="s">
         <v>232</v>
       </c>
-      <c r="C14" s="47" t="s">
+      <c r="C14" s="22" t="s">
         <v>231</v>
       </c>
-      <c r="D14" s="47" t="s">
+      <c r="D14" s="22" t="s">
         <v>231</v>
       </c>
-      <c r="G14" s="81" t="s">
+      <c r="G14" s="35" t="s">
         <v>322</v>
       </c>
-      <c r="H14" s="50">
+      <c r="H14">
         <v>5</v>
       </c>
-      <c r="I14" s="50">
+      <c r="I14">
         <v>3</v>
       </c>
-      <c r="J14" s="50">
+      <c r="J14">
         <v>1</v>
       </c>
     </row>
-    <row r="15" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A15" s="46" t="s">
+    <row r="15" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A15" s="39" t="s">
         <v>331</v>
       </c>
       <c r="B15">
         <v>1</v>
       </c>
-      <c r="G15" s="81" t="s">
+      <c r="G15" s="35" t="s">
         <v>282</v>
       </c>
-      <c r="H15" s="50">
+      <c r="H15">
         <v>5</v>
       </c>
-      <c r="I15" s="50">
+      <c r="I15">
         <v>3</v>
       </c>
-      <c r="J15" s="50">
+      <c r="J15">
         <v>1</v>
       </c>
     </row>
-    <row r="16" spans="1:13" x14ac:dyDescent="0.2">
-      <c r="A16" s="49" t="s">
+    <row r="16" spans="1:10" x14ac:dyDescent="0.2">
+      <c r="A16" s="39" t="s">
         <v>352</v>
       </c>
-      <c r="B16" s="41">
+      <c r="B16">
         <v>2</v>
       </c>
-      <c r="C16" s="41">
+      <c r="C16">
         <v>1</v>
       </c>
-      <c r="G16" s="81" t="s">
+      <c r="G16" s="35" t="s">
         <v>283</v>
       </c>
-      <c r="H16" s="50">
+      <c r="H16">
         <v>5</v>
       </c>
-      <c r="I16" s="50">
+      <c r="I16">
         <v>3</v>
       </c>
-      <c r="J16" s="50">
+      <c r="J16">
         <v>1</v>
       </c>
     </row>
-    <row r="17" spans="1:12" s="50" customFormat="1" x14ac:dyDescent="0.2">
-      <c r="A17" s="49" t="s">
+    <row r="17" spans="1:12" x14ac:dyDescent="0.2">
+      <c r="A17" s="39" t="s">
         <v>353</v>
       </c>
-      <c r="B17" s="41">
+      <c r="B17">
         <v>0</v>
       </c>
-      <c r="C17" s="41">
+      <c r="C17">
         <v>2</v>
       </c>
-      <c r="G17" s="81" t="s">
+      <c r="G17" s="35" t="s">
         <v>284</v>
       </c>
-      <c r="H17" s="50">
+      <c r="H17">
         <v>5</v>
       </c>
-      <c r="I17" s="50">
+      <c r="I17">
         <v>3</v>
       </c>
-      <c r="J17" s="50">
+      <c r="J17">
         <v>1</v>
       </c>
     </row>
     <row r="18" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A18" s="49" t="s">
+      <c r="A18" s="39" t="s">
         <v>348</v>
       </c>
-      <c r="B18" s="84">
+      <c r="B18">
         <v>3</v>
       </c>
-      <c r="C18" s="84">
+      <c r="C18">
         <v>0</v>
       </c>
-      <c r="G18" s="81" t="s">
+      <c r="G18" s="35" t="s">
         <v>285</v>
       </c>
-      <c r="H18" s="83">
+      <c r="H18">
         <v>5</v>
       </c>
-      <c r="I18" s="83">
+      <c r="I18">
         <v>3</v>
       </c>
-      <c r="J18" s="83">
+      <c r="J18">
         <v>1</v>
       </c>
     </row>
     <row r="19" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A19" s="49" t="s">
+      <c r="A19" s="39" t="s">
         <v>349</v>
       </c>
-      <c r="B19" s="84">
+      <c r="B19">
         <v>2</v>
       </c>
-      <c r="C19" s="84">
+      <c r="C19">
         <v>0</v>
       </c>
-      <c r="G19" s="81" t="s">
+      <c r="G19" s="35" t="s">
         <v>287</v>
       </c>
-      <c r="H19" s="83">
+      <c r="H19">
         <v>5</v>
       </c>
-      <c r="I19" s="83">
+      <c r="I19">
         <v>3</v>
       </c>
-      <c r="J19" s="83">
+      <c r="J19">
         <v>1</v>
       </c>
     </row>
     <row r="20" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A20" s="49" t="s">
+      <c r="A20" s="39" t="s">
         <v>350</v>
       </c>
-      <c r="B20" s="84">
+      <c r="B20">
         <v>0</v>
       </c>
-      <c r="C20" s="84">
+      <c r="C20">
         <v>2</v>
       </c>
-      <c r="G20" s="81" t="s">
+      <c r="G20" s="35" t="s">
         <v>288</v>
       </c>
-      <c r="H20" s="83">
+      <c r="H20">
         <v>5</v>
       </c>
-      <c r="I20" s="83">
+      <c r="I20">
         <v>3</v>
       </c>
-      <c r="J20" s="83">
+      <c r="J20">
         <v>1</v>
       </c>
     </row>
     <row r="21" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A21" s="49" t="s">
+      <c r="A21" s="39" t="s">
         <v>351</v>
       </c>
-      <c r="B21" s="84">
+      <c r="B21">
         <v>2</v>
       </c>
-      <c r="C21" s="84">
+      <c r="C21">
         <v>3</v>
       </c>
-      <c r="G21" s="81" t="s">
+      <c r="G21" s="35" t="s">
         <v>289</v>
       </c>
       <c r="H21">
@@ -471,120 +465,114 @@
       </c>
     </row>
     <row r="22" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A22" s="49" t="s">
+      <c r="A22" s="39" t="s">
         <v>332</v>
       </c>
-      <c r="B22" s="84">
+      <c r="B22">
         <v>2</v>
       </c>
-      <c r="C22" s="84">
+      <c r="C22">
         <v>0</v>
       </c>
-      <c r="G22" s="81" t="s">
+      <c r="G22" s="35" t="s">
         <v>290</v>
       </c>
-      <c r="H22" s="51">
+      <c r="H22">
         <v>5</v>
       </c>
-      <c r="I22" s="51">
+      <c r="I22">
         <v>4</v>
       </c>
-      <c r="J22" s="51">
+      <c r="J22">
         <v>3</v>
       </c>
-      <c r="K22" s="51">
+      <c r="K22">
         <v>2</v>
       </c>
     </row>
     <row r="23" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A23" s="49" t="s">
+      <c r="A23" s="39" t="s">
         <v>333</v>
       </c>
-      <c r="B23" s="84">
+      <c r="B23">
         <v>1</v>
       </c>
-      <c r="C23" s="84">
+      <c r="C23">
         <v>2</v>
       </c>
-      <c r="G23" s="81" t="s">
+      <c r="G23" s="35" t="s">
         <v>291</v>
       </c>
-      <c r="H23" s="51">
+      <c r="H23">
         <v>5</v>
       </c>
-      <c r="I23" s="51">
+      <c r="I23">
         <v>4</v>
       </c>
-      <c r="J23" s="51">
+      <c r="J23">
         <v>3</v>
       </c>
-      <c r="K23" s="51">
+      <c r="K23">
         <v>2</v>
       </c>
     </row>
     <row r="24" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A24" s="84"/>
-      <c r="B24" s="84"/>
-      <c r="C24" s="84"/>
-      <c r="G24" s="81" t="s">
+      <c r="G24" s="35" t="s">
         <v>292</v>
       </c>
-      <c r="H24" s="51">
+      <c r="H24">
         <v>5</v>
       </c>
-      <c r="I24" s="51">
+      <c r="I24">
         <v>4</v>
       </c>
-      <c r="J24" s="51">
+      <c r="J24">
         <v>3</v>
       </c>
-      <c r="K24" s="51">
+      <c r="K24">
         <v>2</v>
       </c>
     </row>
     <row r="25" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A25" s="46" t="s">
+      <c r="A25" s="39" t="s">
         <v>334</v>
       </c>
-      <c r="B25" s="84">
+      <c r="B25">
         <v>5</v>
       </c>
-      <c r="C25" s="84">
+      <c r="C25">
         <v>2</v>
       </c>
-      <c r="G25" s="81" t="s">
+      <c r="G25" s="35" t="s">
         <v>293</v>
       </c>
-      <c r="H25" s="51">
+      <c r="H25">
         <v>5</v>
       </c>
-      <c r="I25" s="51">
+      <c r="I25">
         <v>4</v>
       </c>
-      <c r="J25" s="51">
+      <c r="J25">
         <v>3</v>
       </c>
-      <c r="K25" s="51">
+      <c r="K25">
         <v>2</v>
       </c>
     </row>
     <row r="26" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A26" s="84"/>
-      <c r="B26" s="84"/>
-      <c r="C26" s="84"/>
-      <c r="G26" s="81" t="s">
+      <c r="G26" s="35" t="s">
         <v>294</v>
       </c>
-      <c r="H26" s="51">
+      <c r="H26">
         <v>5</v>
       </c>
-      <c r="I26" s="51">
+      <c r="I26">
         <v>4</v>
       </c>
-      <c r="J26" s="51">
+      <c r="J26">
         <v>3</v>
       </c>
-      <c r="K26" s="51">
+      <c r="K26">
         <v>2</v>
       </c>
       <c r="L26">
@@ -592,26 +580,25 @@
       </c>
     </row>
     <row r="27" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A27" s="24" t="s">
+      <c r="A27" s="22" t="s">
         <v>237</v>
       </c>
-      <c r="B27" s="84">
+      <c r="B27">
         <v>2</v>
       </c>
-      <c r="C27" s="84"/>
-      <c r="G27" s="81" t="s">
+      <c r="G27" s="35" t="s">
         <v>295</v>
       </c>
-      <c r="H27" s="51">
+      <c r="H27">
         <v>5</v>
       </c>
-      <c r="I27" s="51">
+      <c r="I27">
         <v>4</v>
       </c>
-      <c r="J27" s="51">
+      <c r="J27">
         <v>3</v>
       </c>
-      <c r="K27" s="51">
+      <c r="K27">
         <v>2</v>
       </c>
       <c r="L27">
@@ -619,19 +606,19 @@
       </c>
     </row>
     <row r="28" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="G28" s="81" t="s">
+      <c r="G28" s="35" t="s">
         <v>296</v>
       </c>
-      <c r="H28" s="51">
+      <c r="H28">
         <v>5</v>
       </c>
-      <c r="I28" s="51">
+      <c r="I28">
         <v>4</v>
       </c>
-      <c r="J28" s="51">
+      <c r="J28">
         <v>3</v>
       </c>
-      <c r="K28" s="51">
+      <c r="K28">
         <v>2</v>
       </c>
       <c r="L28">
@@ -639,19 +626,19 @@
       </c>
     </row>
     <row r="29" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="G29" s="81" t="s">
+      <c r="G29" s="35" t="s">
         <v>297</v>
       </c>
-      <c r="H29" s="51">
+      <c r="H29">
         <v>5</v>
       </c>
-      <c r="I29" s="51">
+      <c r="I29">
         <v>4</v>
       </c>
-      <c r="J29" s="51">
+      <c r="J29">
         <v>3</v>
       </c>
-      <c r="K29" s="51">
+      <c r="K29">
         <v>2</v>
       </c>
       <c r="L29">
@@ -659,19 +646,19 @@
       </c>
     </row>
     <row r="30" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="G30" s="81" t="s">
+      <c r="G30" s="35" t="s">
         <v>298</v>
       </c>
-      <c r="H30" s="51">
+      <c r="H30">
         <v>5</v>
       </c>
-      <c r="I30" s="51">
+      <c r="I30">
         <v>4</v>
       </c>
-      <c r="J30" s="51">
+      <c r="J30">
         <v>3</v>
       </c>
-      <c r="K30" s="51">
+      <c r="K30">
         <v>2</v>
       </c>
       <c r="L30">
@@ -679,173 +666,170 @@
       </c>
     </row>
     <row r="31" spans="1:12" ht="13.5" thickBot="1" x14ac:dyDescent="0.25">
-      <c r="G31" s="82" t="s">
+      <c r="G31" s="36" t="s">
         <v>324</v>
       </c>
-      <c r="H31" s="44">
+      <c r="H31" s="37">
         <v>5</v>
       </c>
-      <c r="I31" s="44">
+      <c r="I31" s="37">
         <v>3</v>
       </c>
-      <c r="J31" s="44">
+      <c r="J31" s="37">
         <v>1</v>
       </c>
     </row>
     <row r="32" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="G32" s="81" t="s">
+      <c r="G32" s="35" t="s">
         <v>286</v>
       </c>
-      <c r="H32" s="50">
+      <c r="H32">
         <v>5</v>
       </c>
-      <c r="I32" s="50">
+      <c r="I32">
         <v>3</v>
       </c>
-      <c r="J32" s="50">
+      <c r="J32">
         <v>1</v>
       </c>
     </row>
     <row r="33" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G33" s="81" t="s">
+      <c r="G33" s="35" t="s">
         <v>325</v>
       </c>
-      <c r="H33" s="50">
+      <c r="H33">
         <v>5</v>
       </c>
-      <c r="I33" s="50">
+      <c r="I33">
         <v>3</v>
       </c>
-      <c r="J33" s="50">
+      <c r="J33">
         <v>1</v>
       </c>
     </row>
     <row r="34" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G34" s="81" t="s">
+      <c r="G34" s="35" t="s">
         <v>326</v>
       </c>
-      <c r="H34" s="50">
+      <c r="H34">
         <v>5</v>
       </c>
-      <c r="I34" s="50">
+      <c r="I34">
         <v>3</v>
       </c>
-      <c r="J34" s="50">
+      <c r="J34">
         <v>1</v>
       </c>
     </row>
     <row r="35" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G35" s="81" t="s">
+      <c r="G35" s="35" t="s">
         <v>327</v>
       </c>
-      <c r="H35" s="50">
+      <c r="H35">
         <v>5</v>
       </c>
-      <c r="I35" s="50">
+      <c r="I35">
         <v>3</v>
       </c>
-      <c r="J35" s="50">
+      <c r="J35">
         <v>1</v>
       </c>
     </row>
     <row r="36" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G36" s="81" t="s">
+      <c r="G36" s="35" t="s">
         <v>328</v>
       </c>
-      <c r="H36" s="50">
+      <c r="H36">
         <v>5</v>
       </c>
-      <c r="I36" s="50">
+      <c r="I36">
         <v>3</v>
       </c>
-      <c r="J36" s="50">
+      <c r="J36">
         <v>1</v>
       </c>
     </row>
     <row r="37" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G37" s="81" t="s">
+      <c r="G37" s="35" t="s">
         <v>329</v>
       </c>
-      <c r="H37" s="50">
+      <c r="H37">
         <v>5</v>
       </c>
-      <c r="I37" s="50">
+      <c r="I37">
         <v>3</v>
       </c>
-      <c r="J37" s="50">
+      <c r="J37">
         <v>1</v>
       </c>
     </row>
     <row r="39" spans="7:10" x14ac:dyDescent="0.2">
-      <c r="G39" s="81"/>
-      <c r="H39" s="50"/>
-      <c r="I39" s="50"/>
-      <c r="J39" s="50"/>
+      <c r="G39" s="35"/>
     </row>
   </sheetData>
   <phoneticPr fontId="21" type="noConversion"/>
   <conditionalFormatting sqref="B3:C3">
-    <cfRule type="beginsWith" dxfId="40" priority="73" operator="beginsWith" text="rule">
+    <cfRule type="beginsWith" dxfId="22" priority="73" operator="beginsWith" text="rule">
       <formula>LEFT(B3,LEN("rule"))="rule"</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B4:C4">
-    <cfRule type="containsBlanks" dxfId="39" priority="71">
+    <cfRule type="containsBlanks" dxfId="21" priority="71">
       <formula>LEN(TRIM(B4))=0</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B5:C5">
-    <cfRule type="containsErrors" dxfId="38" priority="70">
+    <cfRule type="containsErrors" dxfId="20" priority="70">
       <formula>ISERROR(B5)</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B6:C6">
-    <cfRule type="containsText" dxfId="37" priority="69" operator="containsText" text="rule">
+    <cfRule type="containsText" dxfId="19" priority="69" operator="containsText" text="rule">
       <formula>NOT(ISERROR(SEARCH("rule",B6)))</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B8:C8">
-    <cfRule type="endsWith" dxfId="36" priority="67" operator="endsWith" text="rule">
+    <cfRule type="endsWith" dxfId="18" priority="67" operator="endsWith" text="rule">
       <formula>RIGHT(B8,LEN("rule"))="rule"</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B9:C9">
-    <cfRule type="notContainsBlanks" dxfId="35" priority="66">
+    <cfRule type="notContainsBlanks" dxfId="17" priority="66">
       <formula>LEN(TRIM(B9))&gt;0</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B10:C10">
-    <cfRule type="notContainsErrors" dxfId="34" priority="65">
+    <cfRule type="notContainsErrors" dxfId="16" priority="65">
       <formula>NOT(ISERROR(B10))</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B11:C11">
-    <cfRule type="notContainsText" dxfId="33" priority="64" operator="notContains" text="rule">
+    <cfRule type="notContainsText" dxfId="15" priority="64" operator="notContains" text="rule">
       <formula>ISERROR(SEARCH("rule",B11))</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B12:C12">
-    <cfRule type="timePeriod" dxfId="32" priority="63" timePeriod="today">
+    <cfRule type="timePeriod" dxfId="14" priority="63" timePeriod="today">
       <formula>FLOOR(B12,1)=TODAY()</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B15">
-    <cfRule type="expression" dxfId="31" priority="58">
+    <cfRule type="expression" dxfId="13" priority="58">
       <formula>ODD(B15)</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B17:C17">
-    <cfRule type="cellIs" dxfId="30" priority="56" operator="notEqual">
+    <cfRule type="cellIs" dxfId="12" priority="56" operator="notEqual">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B26:B27">
-    <cfRule type="cellIs" dxfId="29" priority="46" operator="equal">
+    <cfRule type="cellIs" dxfId="11" priority="46" operator="equal">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B16:C16">
-    <cfRule type="cellIs" dxfId="28" priority="45" operator="equal">
+    <cfRule type="cellIs" dxfId="10" priority="45" operator="equal">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
@@ -1011,10 +995,10 @@
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B7:D7">
-    <cfRule type="duplicateValues" dxfId="27" priority="82"/>
+    <cfRule type="duplicateValues" dxfId="9" priority="82"/>
   </conditionalFormatting>
   <conditionalFormatting sqref="B14:D14">
-    <cfRule type="uniqueValues" dxfId="26" priority="96"/>
+    <cfRule type="uniqueValues" dxfId="8" priority="96"/>
   </conditionalFormatting>
   <conditionalFormatting sqref="B24:C24">
     <cfRule type="dataBar" priority="100">
@@ -1031,10 +1015,10 @@
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B2:C2">
-    <cfRule type="aboveAverage" dxfId="25" priority="114"/>
+    <cfRule type="aboveAverage" dxfId="7" priority="114"/>
   </conditionalFormatting>
   <conditionalFormatting sqref="B13:C13">
-    <cfRule type="top10" dxfId="24" priority="115" rank="1"/>
+    <cfRule type="top10" dxfId="6" priority="115" rank="1"/>
   </conditionalFormatting>
   <conditionalFormatting sqref="H21:K21">
     <cfRule type="iconSet" priority="18">
@@ -1131,33 +1115,33 @@
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B18:C18">
-    <cfRule type="cellIs" dxfId="23" priority="6" operator="greaterThan">
+    <cfRule type="cellIs" dxfId="5" priority="6" operator="greaterThan">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B19:C19">
-    <cfRule type="cellIs" dxfId="22" priority="5" operator="greaterThanOrEqual">
+    <cfRule type="cellIs" dxfId="4" priority="5" operator="greaterThanOrEqual">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B20:C20">
-    <cfRule type="cellIs" dxfId="21" priority="4" operator="lessThan">
+    <cfRule type="cellIs" dxfId="3" priority="4" operator="lessThan">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B21:C21">
-    <cfRule type="cellIs" dxfId="20" priority="3" operator="lessThanOrEqual">
+    <cfRule type="cellIs" dxfId="2" priority="3" operator="lessThanOrEqual">
       <formula>2</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B22:C22">
-    <cfRule type="cellIs" dxfId="19" priority="2" operator="between">
+    <cfRule type="cellIs" dxfId="1" priority="2" operator="between">
       <formula>2</formula>
       <formula>4</formula>
     </cfRule>
   </conditionalFormatting>
   <conditionalFormatting sqref="B23:C23">
-    <cfRule type="cellIs" dxfId="18" priority="1" operator="notBetween">
+    <cfRule type="cellIs" dxfId="0" priority="1" operator="notBetween">
       <formula>2</formula>
       <formula>4</formula>
     </cfRule>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet6.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet6.xml
index 3d2e95bc71..e1efcad0fa 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet6.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet6.xml
@@ -2,7 +2,7 @@
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="x14ac xr xr2 xr3" xr:uid="{1E6D1E5F-C597-4F2D-A80C-76EFDC57349F}">
   <dimension ref="A1:J32"/>
   <sheetViews>
-    <sheetView tabSelected="1" zoomScale="115" zoomScaleNormal="115" workbookViewId="0">
+    <sheetView zoomScale="115" zoomScaleNormal="115" workbookViewId="0">
       <selection activeCell="E29" sqref="E29"/>
     </sheetView>
   </sheetViews>
@@ -50,96 +50,96 @@
       </c>
     </row>
     <row r="4" spans="1:10" x14ac:dyDescent="0.2">
-      <c r="C4" s="102" t="s">
+      <c r="C4" s="2" t="s">
         <v>41</v>
       </c>
-      <c r="D4" s="102">
+      <c r="D4" s="2">
         <v>26</v>
       </c>
-      <c r="E4" s="102">
+      <c r="E4" s="2">
         <v>5</v>
       </c>
-      <c r="F4" s="102">
+      <c r="F4" s="2">
         <f>Table3[[#This Row],[Rank]]+Table3[[#This Row],[Age]]</f>
         <v>31</v>
       </c>
-      <c r="G4" s="102">
+      <c r="G4" s="2">
         <f>SUM(Table3[Rank])</f>
         <v>12</v>
       </c>
-      <c r="H4" s="102">
+      <c r="H4" s="2">
         <f>SUM(Table3[[#All],[Rank]])</f>
         <v>24</v>
       </c>
-      <c r="I4" s="105">
+      <c r="I4" s="2">
         <f>Table3[[#Totals],[Rank]]</f>
         <v>12</v>
       </c>
-      <c r="J4" s="105" t="str">
+      <c r="J4" s="2" t="str">
         <f>Table3[[#Headers],[Rank]]</f>
         <v>Rank</v>
       </c>
     </row>
     <row r="5" spans="1:10" x14ac:dyDescent="0.2">
-      <c r="C5" s="102" t="s">
+      <c r="C5" s="2" t="s">
         <v>43</v>
       </c>
-      <c r="D5" s="102">
+      <c r="D5" s="2">
         <v>13</v>
       </c>
-      <c r="E5" s="102">
+      <c r="E5" s="2">
         <v>7</v>
       </c>
-      <c r="F5" s="105">
+      <c r="F5" s="2">
         <f>Table3[[#This Row],[Rank]]+Table3[[#This Row],[Age]]</f>
         <v>20</v>
       </c>
-      <c r="G5" s="105">
+      <c r="G5" s="2">
         <f>SUM(Table3[Rank])</f>
         <v>12</v>
       </c>
-      <c r="H5" s="105">
+      <c r="H5" s="2">
         <f>SUM(Table3[[#All],[Rank]])</f>
         <v>24</v>
       </c>
-      <c r="I5" s="105">
+      <c r="I5" s="2">
         <f>Table3[[#Totals],[Rank]]</f>
         <v>12</v>
       </c>
-      <c r="J5" s="105" t="str">
+      <c r="J5" s="2" t="str">
         <f>Table3[[#Headers],[Rank]]</f>
         <v>Rank</v>
       </c>
     </row>
     <row r="6" spans="1:10" x14ac:dyDescent="0.2">
-      <c r="C6" s="102" t="s">
+      <c r="C6" s="2" t="s">
         <v>361</v>
       </c>
-      <c r="D6" s="102">
+      <c r="D6" s="2">
         <f>SUBTOTAL(109,Table3[Age])</f>
         <v>39</v>
       </c>
-      <c r="E6" s="102">
+      <c r="E6" s="2">
         <f>SUBTOTAL(109,Table3[Rank])</f>
         <v>12</v>
       </c>
-      <c r="F6" s="102">
+      <c r="F6" s="2">
         <f>SUBTOTAL(109,Table3[Rank+Age =E4+D4])</f>
         <v>51</v>
       </c>
-      <c r="G6" s="102">
+      <c r="G6" s="2">
         <f>SUBTOTAL(109,Table3[Data =SUM(E4:E5)])</f>
         <v>24</v>
       </c>
-      <c r="H6" s="102">
+      <c r="H6" s="2">
         <f>SUBTOTAL(109,Table3[All =SUM(E3:E6)])</f>
         <v>48</v>
       </c>
-      <c r="I6" s="102">
+      <c r="I6" s="2">
         <f>SUBTOTAL(109,Table3[Totals =E6])</f>
         <v>24</v>
       </c>
-      <c r="J6" s="102">
+      <c r="J6" s="2">
         <f>SUBTOTAL(109,Table3[Headers =E3])</f>
         <v>0</v>
       </c>
@@ -183,139 +183,134 @@
       </c>
     </row>
     <row r="14" spans="1:10" x14ac:dyDescent="0.2">
-      <c r="B14" s="103" t="s">
+      <c r="B14" t="s">
         <v>372</v>
       </c>
-      <c r="C14" s="103">
+      <c r="C14">
         <v>1</v>
       </c>
-      <c r="D14" s="103">
+      <c r="D14">
         <v>2</v>
       </c>
     </row>
     <row r="15" spans="1:10" x14ac:dyDescent="0.2">
-      <c r="B15" s="103"/>
-      <c r="C15" s="103">
+      <c r="C15">
         <v>3</v>
       </c>
-      <c r="D15" s="103">
+      <c r="D15">
         <v>4</v>
       </c>
     </row>
     <row r="17" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B17" s="103" t="s">
+      <c r="B17" t="s">
         <v>373</v>
       </c>
-      <c r="C17" s="103">
+      <c r="C17">
         <v>1</v>
       </c>
-      <c r="D17" s="103">
+      <c r="D17">
         <v>2</v>
       </c>
     </row>
     <row r="18" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B18" s="103"/>
-      <c r="C18" s="103">
+      <c r="C18">
         <v>3</v>
       </c>
-      <c r="D18" s="103">
+      <c r="D18">
         <v>4</v>
       </c>
     </row>
     <row r="20" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B20" s="103" t="s">
+      <c r="B20" t="s">
         <v>375</v>
       </c>
-      <c r="C20" s="103">
+      <c r="C20">
         <v>1</v>
       </c>
-      <c r="D20" s="103">
+      <c r="D20">
         <v>2</v>
       </c>
     </row>
     <row r="21" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B21" s="103"/>
-      <c r="C21" s="103">
+      <c r="C21">
         <v>3</v>
       </c>
-      <c r="D21" s="103">
+      <c r="D21">
         <v>4</v>
       </c>
     </row>
     <row r="23" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B23" s="103" t="s">
+      <c r="B23" t="s">
         <v>376</v>
       </c>
-      <c r="C23" s="103">
+      <c r="C23">
         <v>1</v>
       </c>
-      <c r="D23" s="103">
+      <c r="D23">
         <v>2</v>
       </c>
     </row>
     <row r="24" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B24" s="103"/>
-      <c r="C24" s="103">
+      <c r="C24">
         <v>3</v>
       </c>
-      <c r="D24" s="103">
+      <c r="D24">
         <v>4</v>
       </c>
     </row>
     <row r="26" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B26" s="103" t="s">
+      <c r="B26" t="s">
         <v>374</v>
       </c>
-      <c r="C26" s="103">
+      <c r="C26">
         <v>1</v>
       </c>
-      <c r="D26" s="103">
+      <c r="D26">
         <v>2</v>
       </c>
     </row>
     <row r="27" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="B27" s="103"/>
-      <c r="C27" s="103">
+      <c r="C27">
         <v>3</v>
       </c>
-      <c r="D27" s="103">
+      <c r="D27">
         <v>4</v>
       </c>
     </row>
     <row r="28" spans="2:4" x14ac:dyDescent="0.2">
-      <c r="C28" s="103" t="s">
+      <c r="C28" t="s">
         <v>361</v>
       </c>
-      <c r="D28" s="103">
+      <c r="D28">
         <f>SUBTOTAL(109,Table4910[Column2])</f>
         <v>6</v>
       </c>
     </row>
     <row r="30" spans="2:4" x14ac:dyDescent="0.2">
       <c r="B30" t="s">
-        <v>405</v>
+        <v>404</v>
       </c>
       <c r="C30" t="s">
-        <v>406</v>
+        <v>405</v>
       </c>
       <c r="D30" t="s">
-        <v>407</v>
+        <v>406</v>
       </c>
     </row>
     <row r="31" spans="2:4" hidden="1" x14ac:dyDescent="0.2">
       <c r="C31" t="s">
-        <v>408</v>
+        <v>407</v>
       </c>
       <c r="D31" t="s">
-        <v>408</v>
+        <v>407</v>
       </c>
     </row>
     <row r="32" spans="2:4" x14ac:dyDescent="0.2">
       <c r="C32" t="s">
-        <v>409</v>
+        <v>408</v>
       </c>
       <c r="D32" t="s">
-        <v>409</v>
+        <v>408</v>
       </c>
     </row>
   </sheetData>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet7.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet7.xml
index 58c7e76242..fbcee51bed 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet7.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet7.xml
@@ -28,7 +28,7 @@
   </cols>
   <sheetData>
     <row r="1" spans="1:12" ht="15" x14ac:dyDescent="0.2">
-      <c r="A1" s="114" t="s">
+      <c r="A1" s="93" t="s">
         <v>387</v>
       </c>
       <c r="B1" s="18"/>
@@ -38,386 +38,274 @@
       <c r="F1" s="18"/>
     </row>
     <row r="2" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A2" s="101"/>
-      <c r="B2" s="101"/>
-      <c r="C2" s="101"/>
-      <c r="D2" s="101"/>
-      <c r="E2" s="101"/>
-      <c r="F2" s="101"/>
+      <c r="A2" s="2"/>
+      <c r="B2" s="2"/>
+      <c r="C2" s="2"/>
+      <c r="D2" s="2"/>
+      <c r="E2" s="2"/>
+      <c r="F2" s="2"/>
     </row>
     <row r="3" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A3" s="101"/>
-      <c r="B3" s="101"/>
-      <c r="C3" s="110" t="s">
+      <c r="A3" s="2"/>
+      <c r="B3" s="2"/>
+      <c r="C3" s="90" t="s">
         <v>385</v>
       </c>
-      <c r="D3" s="110" t="s">
+      <c r="D3" s="90" t="s">
         <v>386</v>
       </c>
     </row>
     <row r="4" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A4" s="101"/>
-      <c r="B4" s="101"/>
-      <c r="C4" s="110" t="s">
+      <c r="A4" s="2"/>
+      <c r="B4" s="2"/>
+      <c r="C4" s="90" t="s">
         <v>383</v>
       </c>
-      <c r="D4" s="106">
+      <c r="D4">
         <v>12.1</v>
       </c>
-      <c r="E4" s="106">
+      <c r="E4">
         <v>252.4</v>
       </c>
-      <c r="F4" s="106">
+      <c r="F4">
         <v>500.9</v>
       </c>
-      <c r="G4" s="106">
+      <c r="G4">
         <v>1204.7</v>
       </c>
-      <c r="H4" s="106">
+      <c r="H4">
         <v>4000</v>
       </c>
-      <c r="I4" s="106">
+      <c r="I4">
         <v>4701.3</v>
       </c>
-      <c r="J4" s="106">
+      <c r="J4">
         <v>4890.1000000000004</v>
       </c>
-      <c r="K4" s="106">
+      <c r="K4">
         <v>12052</v>
       </c>
-      <c r="L4" s="106" t="s">
+      <c r="L4" t="s">
         <v>384</v>
       </c>
     </row>
     <row r="5" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A5" s="101"/>
-      <c r="B5" s="101"/>
-      <c r="C5" s="111" t="s">
+      <c r="A5" s="2"/>
+      <c r="B5" s="2"/>
+      <c r="C5" s="91" t="s">
         <v>54</v>
       </c>
-      <c r="D5" s="112"/>
-      <c r="E5" s="112"/>
-      <c r="F5" s="112"/>
-      <c r="G5" s="112"/>
-      <c r="H5" s="112"/>
-      <c r="I5" s="112"/>
-      <c r="J5" s="112"/>
-      <c r="K5" s="112">
+      <c r="K5">
         <v>30</v>
       </c>
-      <c r="L5" s="112">
+      <c r="L5">
         <v>30</v>
       </c>
     </row>
     <row r="6" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A6" s="101"/>
-      <c r="B6" s="101"/>
-      <c r="C6" s="113">
+      <c r="A6" s="2"/>
+      <c r="B6" s="2"/>
+      <c r="C6" s="92">
         <v>256018</v>
       </c>
-      <c r="D6" s="112"/>
-      <c r="E6" s="112"/>
-      <c r="F6" s="112"/>
-      <c r="G6" s="112"/>
-      <c r="H6" s="112"/>
-      <c r="I6" s="112"/>
-      <c r="J6" s="112"/>
-      <c r="K6" s="112">
+      <c r="K6">
         <v>30</v>
       </c>
-      <c r="L6" s="112">
+      <c r="L6">
         <v>30</v>
       </c>
     </row>
     <row r="7" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A7" s="101"/>
-      <c r="B7" s="101"/>
-      <c r="C7" s="111" t="s">
+      <c r="A7" s="2"/>
+      <c r="B7" s="2"/>
+      <c r="C7" s="91" t="s">
         <v>45</v>
       </c>
-      <c r="D7" s="112"/>
-      <c r="E7" s="112">
+      <c r="E7">
         <v>26</v>
       </c>
-      <c r="F7" s="112"/>
-      <c r="G7" s="112"/>
-      <c r="H7" s="112"/>
-      <c r="I7" s="112"/>
-      <c r="J7" s="112"/>
-      <c r="K7" s="112"/>
-      <c r="L7" s="112">
+      <c r="L7">
         <v>26</v>
       </c>
     </row>
     <row r="8" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A8" s="101"/>
-      <c r="B8" s="101"/>
-      <c r="C8" s="113">
+      <c r="A8" s="2"/>
+      <c r="B8" s="2"/>
+      <c r="C8" s="92">
         <v>110120.5</v>
       </c>
-      <c r="D8" s="112"/>
-      <c r="E8" s="112">
+      <c r="E8">
         <v>26</v>
       </c>
-      <c r="F8" s="112"/>
-      <c r="G8" s="112"/>
-      <c r="H8" s="112"/>
-      <c r="I8" s="112"/>
-      <c r="J8" s="112"/>
-      <c r="K8" s="112"/>
-      <c r="L8" s="112">
+      <c r="L8">
         <v>26</v>
       </c>
     </row>
     <row r="9" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A9" s="101"/>
-      <c r="B9" s="101"/>
-      <c r="C9" s="111" t="s">
+      <c r="A9" s="2"/>
+      <c r="B9" s="2"/>
+      <c r="C9" s="91" t="s">
         <v>41</v>
       </c>
-      <c r="D9" s="112"/>
-      <c r="E9" s="112"/>
-      <c r="F9" s="112"/>
-      <c r="G9" s="112">
+      <c r="G9">
         <v>26</v>
       </c>
-      <c r="H9" s="112"/>
-      <c r="I9" s="112"/>
-      <c r="J9" s="112"/>
-      <c r="K9" s="112"/>
-      <c r="L9" s="112">
+      <c r="L9">
         <v>26</v>
       </c>
     </row>
     <row r="10" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="A10" s="101"/>
-      <c r="B10" s="101"/>
-      <c r="C10" s="113">
+      <c r="A10" s="2"/>
+      <c r="B10" s="2"/>
+      <c r="C10" s="92">
         <v>25618</v>
       </c>
-      <c r="D10" s="112"/>
-      <c r="E10" s="112"/>
-      <c r="F10" s="112"/>
-      <c r="G10" s="112">
+      <c r="G10">
         <v>26</v>
       </c>
-      <c r="H10" s="112"/>
-      <c r="I10" s="112"/>
-      <c r="J10" s="112"/>
-      <c r="K10" s="112"/>
-      <c r="L10" s="112">
+      <c r="L10">
         <v>26</v>
       </c>
     </row>
     <row r="11" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C11" s="111" t="s">
+      <c r="C11" s="91" t="s">
         <v>43</v>
       </c>
-      <c r="D11" s="112"/>
-      <c r="E11" s="112"/>
-      <c r="F11" s="112">
+      <c r="F11">
         <v>13</v>
       </c>
-      <c r="G11" s="112"/>
-      <c r="H11" s="112"/>
-      <c r="I11" s="112"/>
-      <c r="J11" s="112"/>
-      <c r="K11" s="112"/>
-      <c r="L11" s="112">
+      <c r="L11">
         <v>13</v>
       </c>
     </row>
     <row r="12" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C12" s="113">
+      <c r="C12" s="92">
         <v>23000</v>
       </c>
-      <c r="D12" s="112"/>
-      <c r="E12" s="112"/>
-      <c r="F12" s="112">
+      <c r="F12">
         <v>13</v>
       </c>
-      <c r="G12" s="112"/>
-      <c r="H12" s="112"/>
-      <c r="I12" s="112"/>
-      <c r="J12" s="112"/>
-      <c r="K12" s="112"/>
-      <c r="L12" s="112">
+      <c r="L12">
         <v>13</v>
       </c>
     </row>
     <row r="13" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C13" s="111" t="s">
+      <c r="C13" s="91" t="s">
         <v>49</v>
       </c>
-      <c r="D13" s="112">
+      <c r="D13">
         <v>9</v>
       </c>
-      <c r="E13" s="112"/>
-      <c r="F13" s="112"/>
-      <c r="G13" s="112"/>
-      <c r="H13" s="112"/>
-      <c r="I13" s="112"/>
-      <c r="J13" s="112"/>
-      <c r="K13" s="112"/>
-      <c r="L13" s="112">
+      <c r="L13">
         <v>9</v>
       </c>
     </row>
     <row r="14" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C14" s="113">
+      <c r="C14" s="92">
         <v>2</v>
       </c>
-      <c r="D14" s="112">
+      <c r="D14">
         <v>9</v>
       </c>
-      <c r="E14" s="112"/>
-      <c r="F14" s="112"/>
-      <c r="G14" s="112"/>
-      <c r="H14" s="112"/>
-      <c r="I14" s="112"/>
-      <c r="J14" s="112"/>
-      <c r="K14" s="112"/>
-      <c r="L14" s="112">
+      <c r="L14">
         <v>9</v>
       </c>
     </row>
     <row r="15" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C15" s="111" t="s">
+      <c r="C15" s="91" t="s">
         <v>47</v>
       </c>
-      <c r="D15" s="112"/>
-      <c r="E15" s="112"/>
-      <c r="F15" s="112"/>
-      <c r="G15" s="112"/>
-      <c r="H15" s="112"/>
-      <c r="I15" s="112">
+      <c r="I15">
         <v>42</v>
       </c>
-      <c r="J15" s="112"/>
-      <c r="K15" s="112"/>
-      <c r="L15" s="112">
+      <c r="L15">
         <v>42</v>
       </c>
     </row>
     <row r="16" spans="1:12" x14ac:dyDescent="0.2">
-      <c r="C16" s="113">
+      <c r="C16" s="92">
         <v>50024</v>
       </c>
-      <c r="D16" s="112"/>
-      <c r="E16" s="112"/>
-      <c r="F16" s="112"/>
-      <c r="G16" s="112"/>
-      <c r="H16" s="112"/>
-      <c r="I16" s="112">
+      <c r="I16">
         <v>42</v>
       </c>
-      <c r="J16" s="112"/>
-      <c r="K16" s="112"/>
-      <c r="L16" s="112">
+      <c r="L16">
         <v>42</v>
       </c>
     </row>
     <row r="17" spans="3:12" x14ac:dyDescent="0.2">
-      <c r="C17" s="111" t="s">
+      <c r="C17" s="91" t="s">
         <v>52</v>
       </c>
-      <c r="D17" s="112"/>
-      <c r="E17" s="112"/>
-      <c r="F17" s="112"/>
-      <c r="G17" s="112"/>
-      <c r="H17" s="112">
+      <c r="H17">
         <v>27</v>
       </c>
-      <c r="I17" s="112"/>
-      <c r="J17" s="112"/>
-      <c r="K17" s="112"/>
-      <c r="L17" s="112">
+      <c r="L17">
         <v>27</v>
       </c>
     </row>
     <row r="18" spans="3:12" x14ac:dyDescent="0.2">
-      <c r="C18" s="113">
+      <c r="C18" s="92">
         <v>189576</v>
       </c>
-      <c r="D18" s="112"/>
-      <c r="E18" s="112"/>
-      <c r="F18" s="112"/>
-      <c r="G18" s="112"/>
-      <c r="H18" s="112">
+      <c r="H18">
         <v>27</v>
       </c>
-      <c r="I18" s="112"/>
-      <c r="J18" s="112"/>
-      <c r="K18" s="112"/>
-      <c r="L18" s="112">
+      <c r="L18">
         <v>27</v>
       </c>
     </row>
     <row r="19" spans="3:12" x14ac:dyDescent="0.2">
-      <c r="C19" s="111" t="s">
+      <c r="C19" s="91" t="s">
         <v>56</v>
       </c>
-      <c r="D19" s="112"/>
-      <c r="E19" s="112"/>
-      <c r="F19" s="112"/>
-      <c r="G19" s="112"/>
-      <c r="H19" s="112"/>
-      <c r="I19" s="112"/>
-      <c r="J19" s="112">
+      <c r="J19">
         <v>37</v>
       </c>
-      <c r="K19" s="112"/>
-      <c r="L19" s="112">
+      <c r="L19">
         <v>37</v>
       </c>
     </row>
     <row r="20" spans="3:12" x14ac:dyDescent="0.2">
-      <c r="C20" s="113">
+      <c r="C20" s="92">
         <v>5000</v>
       </c>
-      <c r="D20" s="112"/>
-      <c r="E20" s="112"/>
-      <c r="F20" s="112"/>
-      <c r="G20" s="112"/>
-      <c r="H20" s="112"/>
-      <c r="I20" s="112"/>
-      <c r="J20" s="112">
+      <c r="J20">
         <v>37</v>
       </c>
-      <c r="K20" s="112"/>
-      <c r="L20" s="112">
+      <c r="L20">
         <v>37</v>
       </c>
     </row>
     <row r="21" spans="3:12" x14ac:dyDescent="0.2">
-      <c r="C21" s="111" t="s">
+      <c r="C21" s="91" t="s">
         <v>384</v>
       </c>
-      <c r="D21" s="112">
+      <c r="D21">
         <v>9</v>
       </c>
-      <c r="E21" s="112">
+      <c r="E21">
         <v>26</v>
       </c>
-      <c r="F21" s="112">
+      <c r="F21">
         <v>13</v>
       </c>
-      <c r="G21" s="112">
+      <c r="G21">
         <v>26</v>
       </c>
-      <c r="H21" s="112">
+      <c r="H21">
         <v>27</v>
       </c>
-      <c r="I21" s="112">
+      <c r="I21">
         <v>42</v>
       </c>
-      <c r="J21" s="112">
+      <c r="J21">
         <v>37</v>
       </c>
-      <c r="K21" s="112">
+      <c r="K21">
         <v>30</v>
       </c>
-      <c r="L21" s="112">
+      <c r="L21">
         <v>210</v>
       </c>
     </row>
diff --git a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet9.xml b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet9.xml
index 55268cf02b..afbb11205a 100644
--- a/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet9.xml
+++ b/tests/__xlsx__/xlsx_demo_data/xl/worksheets/sheet9.xml
@@ -2,14 +2,14 @@
 <worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac" xmlns:xr="http://schemas.microsoft.com/office/spreadsheetml/2014/revision" xmlns:xr2="http://schemas.microsoft.com/office/spreadsheetml/2015/revision2" xmlns:xr3="http://schemas.microsoft.com/office/spreadsheetml/2016/revision3" mc:Ignorable="x14ac xr xr2 xr3" xr:uid="{178A9C2C-69A0-49B9-B110-21B7CBF9C575}">
   <dimension ref="A1"/>
   <sheetViews>
-    <sheetView showGridLines="0" tabSelected="1" workbookViewId="0">
-      <selection activeCell="L29" sqref="L29"/>
+    <sheetView showGridLines="0" workbookViewId="0">
+      <selection activeCell="E29" sqref="E29"/>
     </sheetView>
   </sheetViews>
   <sheetFormatPr defaultRowHeight="12.75" x14ac:dyDescent="0.2"/>
   <sheetData>
     <row r="1" spans="1:1" ht="38.25" x14ac:dyDescent="0.2">
-      <c r="A1" s="122" t="s">
+      <c r="A1" s="100" t="s">
         <v>399</v>
       </c>
     </row>
diff --git a/tests/xlsx_import.test.ts b/tests/xlsx_import.test.ts
index 19bd03e260..4eea921775 100644
--- a/tests/xlsx_import.test.ts
+++ b/tests/xlsx_import.test.ts
@@ -1,12 +1,12 @@
 import { ICON_SETS } from "../src/components/icons/icons";
-import { buildSheetLink, lettersToNumber, markdownLink, toZone } from "../src/helpers";
+import { buildSheetLink, formatValue, lettersToNumber, markdownLink, toZone } from "../src/helpers";
 import { Border, CellIsRule, IconSetRule, Style } from "../src/types";
 import { BarChartDefinition } from "../src/types/chart/bar_chart";
 import { LineChartDefinition } from "../src/types/chart/line_chart";
 import { PieChartDefinition } from "../src/types/chart/pie_chart";
 import { XLSXCfOperatorType, XLSXSharedFormula } from "../src/types/xlsx";
-import { convertXlsxFormat } from "../src/xlsx/conversion";
 import { hexaToInt } from "../src/xlsx/conversion/color_conversion";
+import { convertXlsxFormat } from "../src/xlsx/conversion/format_conversion";
 import { adaptFormula } from "../src/xlsx/conversion/formula_conversion";
 import {
   TABLE_BORDER_STYLE,
@@ -180,8 +180,7 @@ describe("Import xlsx data", () => {
     ["[$$]#,##0.000", "M6"],
     ["[$₪] #,##0", "M7"],
     ["#,##0[$ EUR €]", "M8"],
-    ["d/m/yy", "M9"],
-    ["not supported: multiple escaped sequences", "M10"],
+    ["not supported: multiple escaped sequences", "M9"],
   ])("Can import format %s", (format, cellXc) => {
     const testSheet = getWorkbookSheet("jestStyles", convertedData)!;
     const formattedCell = testSheet.cells[cellXc]!;
@@ -779,24 +778,29 @@ test.each([
 });
 
 test.each([
-  ["0.00", "0.00"],
-  ["0.00;0.00%", "0.00"],
-  ["0.000%", "0.000%"],
-  ["#,##0.00", "#,##0.00"],
-  ["m/d/yyyy", "m/d/yyyy"],
-  ["mmm/dddd/yy", "mmm/dddd/yy"],
-  ["mmmm/ddd/yyyy", "mmmm/ddd/yyyy"],
-  ["mmmmm/dd/yy", "mmmmm/dd/yy"],
-  ["m/d/yyyy\\ hh:mm:ss", "m/d/yyyy hh:mm:ss"],
-  ["hh:mm:ss a", "hh:mm:ss a"],
-  ['#,##0.00 "€"', "#,##0.00 [$€]"],
-  ["[$$-409]#,##0.000", "[$$]#,##0.000"],
-  ["[$-409]0.00", "0.00"],
-  ["d/m/yy;@", "d/m/yy"],
-  ["[$₪-40D] #,##0", "[$₪] #,##0"],
-  ['"€"#,##0.00 "€"', undefined],
-])("convert format", async (excelFormat, convertedFormat) => {
+  ["0.00", "0.00", "0.00"],
+  ["0.00;0.00%", "0.00", "0.00"],
+  ["0.000%", "0.000%", "0.000%"],
+  ["#,##0.00", "#,##0.00", "0.00"],
+  ["m/d/yyyy", "m/d/yyyy", "12/30/1899"],
+  ["M/D/YYYY", "m/d/yyyy", "12/30/1899"],
+  ["mmmmm/dddd/yy", "mmm/dddd/yy", "Dec/Saturday/99"],
+  ["mmmm-ddd-yy", "mmmm-ddd-yy", "December-Sat-99"],
+  ["mmm dd yy", "mmm dd yy", "Dec 30 99"],
+  ["h AM/PM", "hh a", "12 AM"],
+  ["HHHH:MM a/m", "hh:mm a", "12:00 AM"],
+  ["m/d/yyyy\\ hh:mm:ss", "m/d/yyyy hh:mm:ss", "12/30/1899 00:00:00"],
+  ["hh:mm:ss a", "hh:mm:ss a", "12:00:00 AM"],
+  ['#,##0.00 "€"', "#,##0.00 [$€]", "0.00€"],
+  ["[$$-409]#,##0.000", "[$$]#,##0.000", "$0.000"],
+  ["[$-409]0.00", "0.00", "0.00"],
+  ["[$MM/DD/YYYY]0", "[$MM/DD/YYYY]0", "MM/DD/YYYY0"],
+  ["#,##0.00[$MM/DD/YYYY]", "#,##0.00[$MM/DD/YYYY]", "0.00MM/DD/YYYY"],
+  ["[$₪-40D] #,##0.00", "[$₪] #,##0.00", "₪0.00"],
+  ['"€"#,##0.00 "€"', undefined, "0"],
+])("convert format %s", async (excelFormat, convertedFormat, expectedValue) => {
   expect(
     convertXlsxFormat(80, [{ id: 80, format: excelFormat }], new XLSXImportWarningManager())
   ).toEqual(convertedFormat);
+  expect(formatValue(0, convertedFormat)).toEqual(expectedValue);
 });