igniteui-webcomponents-excel 4.0.4 → 4.2.2

package/esm2015/lib/WorkbookLoadManagerExcel2007_combined.js

@@ -197,6 +197,7 @@ import { AttributeValue } from "./AttributeValue";
 import { LegacyShapeData } from "./LegacyShapeData";
 import { WorksheetRow } from "./WorksheetRow";
 import { Regex } from "igniteui-webcomponents-core";
+import { CustomView } from "./CustomView";
 import { PrintOptions } from "./PrintOptions";
 import { HorizontalPageBreakCollection } from "./HorizontalPageBreakCollection";
 import { VerticalPageBreakCollection } from "./VerticalPageBreakCollection";
@@ -204,7 +205,6 @@ import { HorizontalPageBreak } from "./HorizontalPageBreak";
 import { VerticalPageBreak } from "./VerticalPageBreak";
 import { MathUtilities } from "./MathUtilities";
 import { UnknownShape } from "./UnknownShape";
-import { CustomView } from "./CustomView";
 import { CustomViewCollection } from "./CustomViewCollection";
 import { DisplayOptions } from "./DisplayOptions";
 import { ObjectModelWorksheetPartManager_DVInfo } from "./ObjectModelWorksheetPartManager_DVInfo";
@@ -826,7 +826,7 @@ export let ObjectModelExcelDocumentManager = /*@__PURE__*/ (() => {
                         let d = _rest[1];
                         let e = _rest[2];
                         let f = _rest[3];
-                        super(c._b, c._al, c._am, d, e, true, f);
+                        super(c._b, c._am, c._an, d, e, true, f);
                         this._b6 = null;
                         this._b8 = null;
                         this._b3 = null;
@@ -1178,19 +1178,19 @@ export let FormatInfo = /*@__PURE__*/ (() => {
             let l = ExcelUtils.by(f, 32);
             if (e._b1 != 1) {
                 let m = 0;
-                if (this.p.hasValue && this.p.value < a._bd.count) {
+                if (this.p.hasValue && this.p.value < a._be.count) {
                     m = this.p.value;
                 }
-                let n = a._bd._inner[m];
+                let n = a._be._inner[m];
                 let o;
-                if (((() => { let p = a._a7.tryGetValue(m, o); o = p.p1; return p.ret; })()) == false) {
+                if (((() => { let p = a._a8.tryGetValue(m, o); o = p.p1; return p.ret; })()) == false) {
                     let p;
                     let q = 1;
                     do {
                         p = stringFormat("Style {0}", q++);
                     } while (d._styles$i._item1(p) != null);
                     o = d._styles$i._addUserDefinedStyle(n.g, p);
-                    a._a7.addItem(m, o);
+                    a._a8.addItem(m, o);
                 }
                 e.style = o;
                 if (g == false && (Base.equalsStatic(this.b, n.b) == false)) {
@@ -1239,12 +1239,12 @@ export let FormatInfo = /*@__PURE__*/ (() => {
                     AlignmentInfo.f.ai(e, false);
                 }
             }
-            if ((h || c) && nullableNotEquals(this.o, null) && this.o.value < a._bb.count) {
-                let u = a._bb._inner[this.o.value];
+            if ((h || c) && nullableNotEquals(this.o, null) && this.o.value < a._bc.count) {
+                let u = a._bc._inner[this.o.value];
                 u.x(e, a);
             }
-            if ((i || c) && nullableNotEquals(this.r, null) && this.r.value < a._bf.count) {
-                let v = a._bf._inner[this.r.value];
+            if ((i || c) && nullableNotEquals(this.r, null) && this.r.value < a._bg.count) {
+                let v = a._bg._inner[this.r.value];
                 v.h(e, a);
             }
             e._dt(f);
@@ -1482,14 +1482,14 @@ export let ObjectModelCommonPartHelpers = /*@__PURE__*/ (() => {
             x.name = e;
             x._v = n;
             x.comment = g;
-            let y = WorkbookLoadManagerExcel2007._bs(f);
+            let y = WorkbookLoadManagerExcel2007._bt(f);
             f = y.p0;
-            let z = Formula._k(f, c.cellReferenceMode, 3, c.currentFormat, CultureInfo.invariantCulture, b._b7._bi);
+            let z = Formula._k(f, c.cellReferenceMode, 3, c.currentFormat, CultureInfo.invariantCulture, b._b7._bj);
             x._bb(z, false);
             let aa = new WorkbookLoadManagerExcel2007_NamedReferenceInfo();
             aa.b = m;
             aa.a = x;
-            b._b7._bh.add(aa);
+            b._b7._bi.add(aa);
         }
         static n(a, b, c, d) {
             let e;
@@ -1514,8 +1514,8 @@ export let ObjectModelCommonPartHelpers = /*@__PURE__*/ (() => {
             }
             let m;
             let n;
-            if (false == ((() => { let o = Formula._a0(f, 1, 4, c.currentFormat, CultureInfo.invariantCulture, b._b7._bi, m, n); m = o.p6; n = o.p7; return o.ret; })())) {
-                m = Formula._k("=#REF!", 1, 4, c.currentFormat, CultureInfo.invariantCulture, b._b7._bi);
+            if (false == ((() => { let o = Formula._a0(f, 1, 4, c.currentFormat, CultureInfo.invariantCulture, b._b7._bj, m, n); m = o.p6; n = o.p7; return o.ret; })())) {
+                m = Formula._k("=#REF!", 1, 4, c.currentFormat, CultureInfo.invariantCulture, b._b7._bj);
             }
             for (let o = 0; o < m._e.length; o++) {
                 let p = typeCast(ReferenceToken.$, m._e[o]);
@@ -1789,10 +1789,10 @@ export let ObjectModelCommonPartHelpers = /*@__PURE__*/ (() => {
             let f = null;
             switch (c) {
                 case 1:
-                    f = e._al;
+                    f = e._am;
                     break;
                 case 2:
-                    f = e._am;
+                    f = e._an;
                     break;
                 case 0: break;
                 default: break;
@@ -1893,7 +1893,7 @@ export let ObjectModelCommonPartHelpers = /*@__PURE__*/ (() => {
                 }
                 let g = null;
                 if (d._j != null) {
-                    g = ObjectModelCommonPartHelpers.b(a)._b9._cv(d._j);
+                    g = ObjectModelCommonPartHelpers.b(a)._b9._cw(d._j);
                 }
                 SpreadsheetMLMain.aay(a, g, c, d.comment, void 0, void 0, void 0, void 0, e, d._p, d._v);
                 a.ad.k();
@@ -2116,7 +2116,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             if (g.hasValue) {
                 l = a._b7._g._inner[g.value]._bu();
             }
-            a._b7._ad($t, b, c, d, j, k, l, ...h);
+            a._b7._ae($t, b, c, d, j, k, l, ...h);
         }
         static bd(a) {
             let b;
@@ -2139,7 +2139,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             d = e.p2;
             let f = ObjectModelTablePartManager.a9(a);
             let g = f._by;
-            b._setColumnFormula1(ObjectModelTablePartManager.a7(g, c, d, f._b7._bi), false);
+            b._setColumnFormula1(ObjectModelTablePartManager.a7(g, c, d, f._b7._bj), false);
         }
         static bf(a) {
             let b = a.s.a(ObjectModelTablePartManager_FilterColumnElementContext.$);
@@ -2153,10 +2153,10 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             d = e.p2;
             let f = ObjectModelTablePartManager.a9(a)._b7._g._inner[c.value];
             if (d) {
-                b.b = FillFilter._p(null, f);
+                b.b = FillFilter._q(null, f);
             }
             else {
-                b.b = FontColorFilter._n(null, f);
+                b.b = FontColorFilter._o(null, f);
             }
         }
         static bg(a) {
@@ -2236,7 +2236,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
                 e = h.p1;
                 f = h.p2;
                 g = h.p3;
-                b.b = DynamicValuesFilter._l(d, null, e, f, g);
+                b.b = DynamicValuesFilter._m(d, null, e, f, g);
             }
             else {
                 let i;
@@ -2246,7 +2246,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
                 f = k.p2;
                 i = k.p3;
                 j = k.p4;
-                b.b = DynamicValuesFilter._k(null, e, f, i, j);
+                b.b = DynamicValuesFilter._l(null, e, f, i, j);
             }
         }
         static bn(a) {
@@ -2563,7 +2563,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             d = g.p2;
             e = g.p3;
             f = g.p4;
-            let h = TopOrBottomFilter._t(e, d);
+            let h = TopOrBottomFilter._u(e, d);
             b.b = new TopOrBottomFilter(2, null, h, truncate(c), f.getValueOrDefault());
         }
         static by(a) {
@@ -2578,7 +2578,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             d = e.p2;
             let f = ObjectModelTablePartManager.a9(a);
             let g = f._by;
-            b.totalFormula = ObjectModelTablePartManager.a7(g, c, d, f._b7._bi);
+            b.totalFormula = ObjectModelTablePartManager.a7(g, c, d, f._b7._bj);
         }
         static a7(a, b, c, d) {
             if (c) {
@@ -2709,10 +2709,10 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
                 e = toNullable(Number_$type, i.average);
             }
             if (b._z == 0) {
-                SpreadsheetMLMain.aa6(a, c._m, !nullableIsNull(e) ? e : (nullableEquals(f, null) ? toNullable(Number_$type, null) : ExcelCalcValue._dateTimeToExcelDate(d, f.value)), nullableEquals(g, null) ? toNullable(Number_$type, null) : ExcelCalcValue._dateTimeToExcelDate(d, g.value));
+                SpreadsheetMLMain.aa6(a, c._n, !nullableIsNull(e) ? e : (nullableEquals(f, null) ? toNullable(Number_$type, null) : ExcelCalcValue._dateTimeToExcelDate(d, f.value)), nullableEquals(g, null) ? toNullable(Number_$type, null) : ExcelCalcValue._dateTimeToExcelDate(d, g.value));
             }
             else {
-                SpreadsheetMLMain.aa7(a, c._m, e, f, g);
+                SpreadsheetMLMain.aa7(a, c._n, e, f, g);
             }
             a.ad.k();
         }
@@ -2766,7 +2766,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             a.ad.k();
         }
         static b8(a, b) {
-            SpreadsheetMLMain.ab5(a, b._m, b._p);
+            SpreadsheetMLMain.ab5(a, b._n, b._q);
         }
         b9(a, b) {
             SpreadsheetMLMain.adv(this, b._bs._toString2(1, false, true, true), void 0, b.sortSettings.caseSensitive, b.sortSettings._n ? XlsxUtilities.a5(b.sortSettings._i) : 0);
@@ -2813,11 +2813,11 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
                 let n = c._ck(d);
                 SpreadsheetMLMain.ad3(this, d._a9, void 0, ObjectModelCommonPartHelpers.e(d.name, "_x000a_"), n, ObjectModelCommonPartHelpers.e(d.totalLabel, "_x000a_"), toNullable(Number_$type, null), i, f, l, h, e, k);
                 if (d.columnFormula != null) {
-                    SpreadsheetMLMain.zj(this, a._cv(d.columnFormula), typeCast(ArrayFormula.$, d.columnFormula) !== null);
+                    SpreadsheetMLMain.zj(this, a._cw(d.columnFormula), typeCast(ArrayFormula.$, d.columnFormula) !== null);
                     this.ad.k();
                 }
                 if (n == 9) {
-                    SpreadsheetMLMain.aeg(this, a._cv(d.totalFormula), typeCast(ArrayFormula.$, d.totalFormula) !== null);
+                    SpreadsheetMLMain.aeg(this, a._cw(d.totalFormula), typeCast(ArrayFormula.$, d.totalFormula) !== null);
                     this.ad.k();
                 }
                 this.ad.k();
@@ -2829,7 +2829,7 @@ export let ObjectModelTablePartManager = /*@__PURE__*/ (() => {
             this.ad.k();
         }
         static cc(a, b) {
-            SpreadsheetMLMain.aee(a, b.value, b._x, b._w, toNullable(Number_$type, b._z));
+            SpreadsheetMLMain.aee(a, b.value, b._y, b._x, toNullable(Number_$type, b._aa));
             a.ad.k();
         }
         get a8() {
@@ -3744,11 +3744,11 @@ export let ConditionFactory_XLSX = /*@__PURE__*/ (() => {
             c._bw = b.ae.hasValue ? a.c._g._inner[b.ae.value] : null;
         }
         static q(a, b, c) {
-            let d = WorkbookLoadManagerExcel2007._bs(a);
+            let d = WorkbookLoadManagerExcel2007._bt(a);
             a = d.p0;
             let e = c.regions.item(0);
             let f = c._s();
-            return ConditionBase._n(a, e.worksheet.workbook, toNullable(CellReferenceMode_$type, 1), 7, f.o, f.m, b.c._bi);
+            return ConditionBase._n(a, e.worksheet.workbook, toNullable(CellReferenceMode_$type, 1), 7, f.o, f.m, b.c._bj);
         }
         static r(a) {
             return FormulaConditionalFormat._b9(a);
@@ -3836,14 +3836,14 @@ export let ConditionValueExtensions = /*@__PURE__*/ (() => {
                     case 1:
                     case 2:
                         if (a.formula != null && isNaN_(a.value)) {
-                            j = c._cv(a.formula);
+                            j = c._cw(a.formula);
                         }
                         else {
                             j = ConditionalFormattingSerializer.u(a.value);
                         }
                         break;
                     case 3:
-                        j = c._cv(a.formula);
+                        j = c._cw(a.formula);
                         break;
                 }
                 if (stringIsNullOrEmpty(j) == false) {
@@ -3858,13 +3858,13 @@ export let ConditionValueExtensions = /*@__PURE__*/ (() => {
                     case 4:
                     case 5: break;
                     case 3:
-                        j = c._cv(a.formula);
+                        j = c._cw(a.formula);
                         break;
                     case 0:
                     case 1:
                     case 2:
                         if (a.formula != null && isNaN_(a.value)) {
-                            j = c._cv(a.formula);
+                            j = c._cw(a.formula);
                         }
                         else {
                             j = ConditionalFormattingSerializer.u(a.value);
@@ -4337,7 +4337,7 @@ export let SparklineExtensions = /*@__PURE__*/ (() => {
             a._sparklines$i.clear();
             for (let e of fromEnum(b.ae)) {
                 let f = new Sparkline();
-                SparklineExtensions.g(f, e, c, d._bi);
+                SparklineExtensions.g(f, e, c, d._bj);
                 a._sparklines$i._s(a._sparklines$i.count, f, f.location, f.dataRegion, f.dataRegionName, false);
             }
         }
@@ -4632,7 +4632,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             this.br = new Dictionary$2(String_$type, Formula.$, 0);
             let a = this.bh;
             let b = a._d.uri.toString();
-            this.bl = a._b7._ap(b);
+            this.bl = a._b7._aq(b);
             if (this.bl == null) {
                 return null;
             }
@@ -4751,7 +4751,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                         let o = typeCast(Tuple$2.$.specialize(SingleTargetFormula.$, String_$type), a.n);
                         if (o != null) {
                             let p = this.bh._b9;
-                            let q = p._cv(o.c);
+                            let q = p._cw(o.c);
                             for (let r = 0; r < a.j.count; r++) {
                                 let s = a.j._inner[r];
                                 if (s.a.f == "val") {
@@ -4767,7 +4767,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                         let t = typeCast(Tuple$2.$.specialize(SingleTargetFormula.$, String_$type), a.n);
                         if (t != null) {
                             let u = this.bh._b9;
-                            a.p = u._cv(t.c);
+                            a.p = u._cw(t.c);
                         }
                     }
                     break;
@@ -4901,7 +4901,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 g = k.p8;
                 h = k.p9;
                 let l = new WorksheetRegionAddress(1, e, g, f, h);
-                b.bl.filterSettings._setRegion1(l._ah(false, false, i._o, 1), 1);
+                let m = a.s.a(CustomView.$);
+                let n = m != null ? m._e(b.bl, true) : b.bl.filterSettings;
+                n._setRegion1(l._ah(false, false, i._o, 1), 1);
                 b.bn = true;
             }
         }
@@ -4977,8 +4979,8 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 j.bv = ++b._cells$i._u;
             }
             let m;
-            if (d < k._b7._be.count) {
-                m = k._b7._be._inner[d].g;
+            if (d < k._b7._bf.count) {
+                m = k._b7._bf._inner[d].g;
             }
             else {
                 m = k._by._ca._p;
@@ -5048,8 +5050,8 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 o = true;
             }
             let p = null;
-            if (d < l._b7._be.count) {
-                let q = l._b7._be._inner[d].g;
+            if (d < l._b7._bf.count) {
+                let q = l._b7._bf._inner[d].g;
                 if (q._ca(m._ca._p) == false) {
                     p = q;
                     o = true;
@@ -5567,10 +5569,10 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 g.b = true;
             }
             let h;
-            if (((() => { let i = f._b7._a5.tryGetValue(b, h); h = i.p1; return i.ret; })()) == false) {
+            if (((() => { let i = f._b7._a6.tryGetValue(b, h); h = i.p1; return i.ret; })()) == false) {
                 h = new UnknownShape(1);
                 h._cn = b;
-                f._b7._a5.addItem(b, h);
+                f._b7._a6.addItem(b, h);
             }
             h._ef = g;
             a.s.k(h);
@@ -5613,9 +5615,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
         static c5(a, b, c, d, e) {
             let f = ObjectModelWorksheetPartManager.bi(a);
             let g = f._by;
-            let h = WorkbookLoadManagerExcel2007._bs(c);
+            let h = WorkbookLoadManagerExcel2007._bt(c);
             c = h.p0;
-            e(Formula._k(c, 1, d, g.currentFormat, CultureInfo.invariantCulture, f._b7._bi), b._toString1(b.worksheet._c, false));
+            e(Formula._k(c, 1, d, g.currentFormat, CultureInfo.invariantCulture, f._b7._bj), b._toString1(b.worksheet._c, false));
         }
         static c7(a) {
             a.c6();
@@ -5669,6 +5671,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             if (y == null) {
                 return;
             }
+            this.s.k(y);
             let z = y.getPrintOptions(this.bl, true);
             if (z != null) {
                 this.s.k(z);
@@ -5682,6 +5685,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             if (c != 64) {
                 aa._a3 = false;
             }
+            aa._by = m;
             aa._a9 = c;
             aa.showFormulasInCells = e;
             aa.showGridlines = f;
@@ -5863,9 +5867,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             let d = c._b7;
             let e = PackageUtilities.ak(c._g(a)).originalString;
             let f;
-            if (((() => { let g = d._a6.tryGetValue(e, f); f = g.p1; return g.ret; })())) {
+            if (((() => { let g = d._a7.tryGetValue(e, f); f = g.p1; return g.ret; })())) {
                 for (let g of fromEnum(f)) {
-                    d._bp(this.bl, g);
+                    d._bq(this.bl, g);
                 }
             }
             else {
@@ -5935,18 +5939,18 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 }
             }
             let aa = f == null ? null : ExcelUtils.aj(f, r, CultureInfo.invariantCulture);
-            let ab = WorkbookLoadManagerExcel2007._bs(p);
+            let ab = WorkbookLoadManagerExcel2007._bt(p);
             p = ab.p0;
             let ac;
             switch (d) {
                 case 3:
                     if (p != null) {
                         let ad;
-                        ac = ((() => { let ae = FormulaParser.e(p, 1, 2, t.currentFormat, CultureInfo.invariantCulture, s._b7._bi, c.index, b.bv, ad); ad = ae.p8; return ae.ret; })());
+                        ac = ((() => { let ae = FormulaParser.e(p, 1, 2, t.currentFormat, CultureInfo.invariantCulture, s._b7._bj, c.index, b.bv, ad); ad = ae.p8; return ae.ret; })());
                         if (ad != null) {
                             throw ad;
                         }
-                        ac = Formula._k(p, 1, 0, t.currentFormat, CultureInfo.invariantCulture, s._b7._bi);
+                        ac = Formula._k(p, 1, 0, t.currentFormat, CultureInfo.invariantCulture, s._b7._bj);
                         ac = ac._x(c.index, b.bv, t.currentFormat);
                         if (m) {
                             ac._an = m;
@@ -5971,11 +5975,11 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                     if (p != null) {
                         let ae = 0;
                         let af = FormulaParser.l(s._by, r, c, b.bv, CultureInfo.invariantCulture, 1, ae);
-                        if (s._b7._au && ((() => { let ag = b.br.tryGetValue(p, ac); ac = ag.p1; return ag.ret; })())) {
+                        if (s._b7._av && ((() => { let ag = b.br.tryGetValue(p, ac); ac = ag.p1; return ag.ret; })())) {
                             ac = ac._g();
                         }
                         else {
-                            ac = Formula._o(p, ae, af, s._b7._bi);
+                            ac = Formula._o(p, ae, af, s._b7._bj);
                             b.br.item(p, ac);
                         }
                         if (m) {
@@ -5986,7 +5990,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                     break;
                 case 1:
                     if (p != null) {
-                        ac = Formula._k(p, 1, 1, s._by.currentFormat, CultureInfo.invariantCulture, s._b7._bi);
+                        ac = Formula._k(p, 1, 1, s._by.currentFormat, CultureInfo.invariantCulture, s._b7._bj);
                         if (m) {
                             ac._an = m;
                         }
@@ -6051,10 +6055,12 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             else if (b.b == null) {
                 return;
             }
-            let d = new WorksheetColumnFilter(1, c, b.d);
-            d._g(b.b);
-            b.b._j(d);
-            c.filterSettings._a3(d);
+            let d = a.s.a(CustomView.$);
+            let e = d != null ? d._e(c, true) : c.filterSettings;
+            let f = new WorksheetColumnFilter(1, e, b.d);
+            f._h(b.b);
+            b.b._k(f);
+            e._a4(f);
         }
         static dx(a) {
             let b = a.s.a(ObjectModelWorksheetPartManager_DVInfo.$);
@@ -6197,7 +6203,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 return;
             }
             let f = PackageUtilities.ak(d).originalString;
-            if (c._b7._a4.removeItem(f) == false) {
+            if (c._b7._a5.removeItem(f) == false) {
             }
             let g = null;
             for (let h of fromEnum(c._d.getRelationships())) {
@@ -6244,7 +6250,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                     }
                     t._eg = k;
                     this.b5(t, k);
-                    c._b7._a5.item(t._cn, t);
+                    c._b7._a6.item(t._cn, t);
                     r._add3(t);
                 }
             }
@@ -6267,9 +6273,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             }
             let f = PackageUtilities.ak(d).originalString;
             let g;
-            if (((() => { let h = c._b7._a4.tryGetValue(f, g); g = h.p1; return h.ret; })())) {
+            if (((() => { let h = c._b7._a5.tryGetValue(f, g); g = h.p1; return h.ret; })())) {
                 this.bl._g3 = new LegacyDrawingHFInfo(g, e);
-                c._b7._a4.removeItem(f);
+                c._b7._a5.removeItem(f);
             }
             else {
             }
@@ -6636,8 +6642,8 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 o = p.item(p._u);
             }
             if (d) {
-                if (c < n._b7._be.count) {
-                    o.cellFormat.setFormatting(n._b7._be._inner[c].g);
+                if (c < n._b7._bf.count) {
+                    o.cellFormat.setFormatting(n._b7._bf._inner[c].g);
                 }
                 else {
                 }
@@ -7054,10 +7060,12 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 return;
             }
             if (b.bn) {
-                if (c.filterSettings.region == null) {
+                let v = a.s.a(CustomView.$);
+                let w = v != null ? v._e(c, true) : c.filterSettings;
+                if (w.region == null) {
                 }
                 else {
-                    c.filterSettings.sortSettings._sortConditions$i._addItem$i(new RelativeIndex(p - c.filterSettings.region._v), u);
+                    w.sortSettings._sortConditions$i._addItem$i(new RelativeIndex(p - w.region._v), u);
                 }
             }
             else {
@@ -7085,24 +7093,26 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             let h = b.bl;
             let i = h.workbook;
             if (b.bn) {
-                h.filterSettings.sortSettings.caseSensitive = e;
-                h.filterSettings.sortSettings._i = f;
+                let j = a.s.a(CustomView.$);
+                let k = j != null ? j._e(h, true) : h.filterSettings;
+                k.sortSettings.caseSensitive = e;
+                k.sortSettings._i = f;
             }
             else {
                 h.sortSettings.sortType = d ? 1 : 0;
                 h.sortSettings.caseSensitive = e;
                 h.sortSettings._i = f;
-                let j;
-                let k;
                 let l;
                 let m;
-                let n = ExcelUtils.fz(c, i.currentFormat, 1, CultureInfo.invariantCulture, null, -1, j, k, l, m);
-                j = n.p6;
-                k = n.p7;
-                l = n.p8;
-                m = n.p9;
-                let o = new WorksheetRegionAddress(1, j, l, k, m);
-                h.sortSettings._setRegion1(o._ah(false, false, i.currentFormat, 1), 1);
+                let n;
+                let o;
+                let p = ExcelUtils.fz(c, i.currentFormat, 1, CultureInfo.invariantCulture, null, -1, l, m, n, o);
+                l = p.p6;
+                m = p.p7;
+                n = p.p8;
+                o = p.p9;
+                let q = new WorksheetRegionAddress(1, l, n, m, o);
+                h.sortSettings._setRegion1(q._ah(false, false, i.currentFormat, 1), 1);
             }
         }
         static fp(a) {
@@ -7229,23 +7239,26 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 }
             }
         }
-        f2(a) {
-            let b = this.bl.filterSettings.region;
-            if (b == null || !b._h._n) {
+        f2(a, b, c) {
+            let d = b.region;
+            if (d == null || !d._h._n) {
                 return;
             }
-            SpreadsheetMLMain.za(this, b._toString2(1, false, true, true));
-            for (let c = 0; c < b._ad; c++) {
-                let d = this.bl.filterSettings.getFilter(c);
-                if (d == null) {
+            if (c && b.sortSettings._sortConditions$i.count == 0 && b._au == 0) {
+                return;
+            }
+            SpreadsheetMLMain.za(this, d._toString2(1, false, true, true));
+            for (let e = 0; e < d._ad; e++) {
+                let f = b.getFilter(e);
+                if (f == null) {
                     continue;
                 }
-                SpreadsheetMLMain.abq(this, intSToU(c));
-                ObjectModelTablePartManager.b6(this, this.bh, a, d);
+                SpreadsheetMLMain.abq(this, intSToU(e));
+                ObjectModelTablePartManager.b6(this, this.bh, a, f);
                 this.ad.k();
             }
-            if (this.bl.filterSettings.sortSettings._sortConditions$i.count > 0) {
-                this.g6(a, b, this.bl.filterSettings.sortSettings, true);
+            if (b.sortSettings._sortConditions$i.count > 0) {
+                this.g6(a, d, b.sortSettings, true);
             }
             this.ad.k();
         }
@@ -7271,7 +7284,7 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             }
             let j;
             let k;
-            let l = WorkbookSaveManagerExcel2007._c0(i, j, k);
+            let l = WorkbookSaveManagerExcel2007._c1(i, j, k);
             j = l.p1;
             k = l.p2;
             SpreadsheetMLMain.zk(this, this.b4(e.r) + d, a._a8(e.j), j);
@@ -7323,9 +7336,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             this.ad.k();
         }
         f8(a) {
-            if (a._ce != null) {
+            if (a._cf != null) {
                 let b = null;
-                if (((() => { let c = a._ce.tryGetValue(this.bl, b); b = c.p1; return c.ret; })())) {
+                if (((() => { let c = a._cf.tryGetValue(this.bl, b); b = c.p1; return c.ret; })())) {
                     b.x(this, a, this.ad);
                 }
             }
@@ -7363,112 +7376,118 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             if (g == null) {
                 return;
             }
-            d(this, a._cv(g));
+            d(this, a._cw(g));
             this.ad.k();
         }
-        ga(a) {
-            let b = a.getDisplayOptions(this.bl, false);
-            if (b == null) {
+        ga(a, b) {
+            let c = a.getDisplayOptions(this.bl, false);
+            if (c == null) {
                 return;
             }
-            let c = a.getHiddenRows(this.bl, false);
-            let d = a.getHiddenColumns(this.bl, false);
-            let e = CellAddress.u(b.unfrozenPaneSettings.firstRowInTopPane, b.unfrozenPaneSettings.firstColumnInLeftPane);
-            SpreadsheetMLMain.aal(this, ST_Guid.a(a._t), intSToU(b.magnificationInCurrentView), intSToU(b._a9), void 0, b.showFormulasInCells, b.showGridlines, b.showRowAndColumnHeaders, b.showOutlineSymbols, b.showZeroValues, void 0, void 0, void 0, void 0, c != null && c.count > 0, d != null && d.count > 0, XlsxUtilities.a3(b.visibility), void 0, XlsxUtilities.a4(b.view), b.showRulerInPageLayoutView, e);
-            if (b._am() || b._an()) {
-                this.gt(b);
+            let d = a.getHiddenRows(this.bl, false);
+            let e = a.getHiddenColumns(this.bl, false);
+            let f = a._e(this.bl, false);
+            let g = CellAddress.u(c.unfrozenPaneSettings.firstRowInTopPane, c.unfrozenPaneSettings.firstColumnInLeftPane);
+            (((h, i, j, k, l, m, n, o, p, q, r, s, t, u, v, w, x) => SpreadsheetMLMain.aal(h, i, j, k, void 0, l, m, n, o, p, void 0, void 0, w, v, q, r, s, void 0, t, u, x))(this, ST_Guid.a(a._v), intSToU(c.magnificationInCurrentView), intSToU(c._a9), c.showFormulasInCells, c.showGridlines, c.showRowAndColumnHeaders, c.showOutlineSymbols, c.showZeroValues, d != null && d.count > 0, e != null && e.count > 0, XlsxUtilities.a3(c.visibility), XlsxUtilities.a4(c.view), c.showRulerInPageLayoutView, c._by, f != null && f._au > 0, g));
+            if (c._am() || c._an()) {
+                this.gt(c);
             }
-            this.gz(b);
+            this.gz(c);
             if (a.savePrintOptions) {
-                let f = a.getPrintOptions(this.bl, false);
+                let y = a.getPrintOptions(this.bl, false);
+                if (y != null) {
+                    this.gy(y);
+                    this.f5(y);
+                    ObjectModelWorksheetPartManager.gq(this, y);
+                    this.gv(y);
+                    ObjectModelWorksheetPartManager.gr(this, y);
+                    ObjectModelWorksheetPartManager.gi(this, y);
+                }
+            }
+            if (a.saveHiddenRowsAndColumns) {
                 if (f != null) {
-                    this.gy(f);
-                    this.f5(f);
-                    ObjectModelWorksheetPartManager.gq(this, f);
-                    this.gv(f);
-                    ObjectModelWorksheetPartManager.gr(this, f);
-                    ObjectModelWorksheetPartManager.gi(this, f);
+                    this.f2(b, f, true);
                 }
             }
             this.ad.k();
         }
-        gb() {
-            let a = this.bh._by;
-            if (a._cq == false) {
+        gb(y) {
+            let z = this.bh._by;
+            if (z._cq == false) {
                 return;
             }
-            if (Enumerable.d(CustomView.$, a._customViews$i, (b) => b.getDisplayOptions(this.bl, false) != null) == false) {
+            if (Enumerable.d(CustomView.$, z._customViews$i, (aa) => aa.getDisplayOptions(this.bl, false) != null) == false) {
                 return;
             }
             SpreadsheetMLMain.aam(this);
-            ExcelUtils.fq(CustomView.$, a._customViews$i, runOn(this, this.ga));
+            ExcelUtils.fq(CustomView.$, z._customViews$i, (aa) => this.ga(aa, y));
             this.ad.k();
         }
-        gc(a, b, c) {
-            let d = b.key;
-            let e = b.value;
-            let f = false;
-            let g = typeCast(ListDataValidationRule.$, d);
-            if (g != null) {
-                f = (g.showDropdown == false);
+        gc(y, z, aa) {
+            let ab = z.key;
+            let ac = z.value;
+            let ad = false;
+            let ae = typeCast(ListDataValidationRule.$, ab);
+            if (ae != null) {
+                ad = (ae.showDropdown == false);
             }
-            let h = e._toString1(1);
-            if (c) {
-                (((i, j, k, l, m, n, o, p, q, r, s, t, u) => SpreadsheetML2009Main.dh(i, j, k, l, m, o, n, p, q, r, s, t, u))(this, XlsxUtilities.au(d._m), XlsxUtilities.ar(d.errorStyle), XlsxUtilities.as(d.imeMode), XlsxUtilities.at(d._l), f, d._r, d.showInputMessage, d.showErrorMessageForInvalidValue, d.errorMessageTitle, ObjectModelWorksheetPartManager.b1(d.errorMessageDescription), d.inputMessageTitle, ObjectModelWorksheetPartManager.b1(d.inputMessageDescription)));
-                if (d._n(null) != null) {
+            let af = ac._toString1(1);
+            if (aa) {
+                (((ag, ah, ai, aj, ak, al, am, an, ao, ap, aq, ar, as) => SpreadsheetML2009Main.dh(ag, ah, ai, aj, ak, am, al, an, ao, ap, aq, ar, as))(this, XlsxUtilities.au(ab._m), XlsxUtilities.ar(ab.errorStyle), XlsxUtilities.as(ab.imeMode), XlsxUtilities.at(ab._l), ad, ab._r, ab.showInputMessage, ab.showErrorMessageForInvalidValue, ab.errorMessageTitle, ObjectModelWorksheetPartManager.b1(ab.errorMessageDescription), ab.inputMessageTitle, ObjectModelWorksheetPartManager.b1(ab.inputMessageDescription)));
+                if (ab._n(null) != null) {
                     SpreadsheetML2009Main.dj(this);
-                    this.f9(a, runOn(d, d._n), e, Excel2006Main.av);
+                    this.f9(y, runOn(ab, ab._n), ac, Excel2006Main.av);
                     this.ad.k();
                 }
-                if (d._o(null) != null) {
+                if (ab._o(null) != null) {
                     SpreadsheetML2009Main.dk(this);
-                    this.f9(a, runOn(d, d._o), e, Excel2006Main.av);
+                    this.f9(y, runOn(ab, ab._o), ac, Excel2006Main.av);
                     this.ad.k();
                 }
-                Excel2006Main.aw(this, h);
+                Excel2006Main.aw(this, af);
                 this.ad.k();
                 this.ad.k();
             }
             else {
-                SpreadsheetMLMain.aar(this, h, XlsxUtilities.au(d._m), XlsxUtilities.ar(d.errorStyle), XlsxUtilities.as(d.imeMode), XlsxUtilities.at(d._l), d._r, f, d.showInputMessage, d.showErrorMessageForInvalidValue, d.errorMessageTitle, ObjectModelWorksheetPartManager.b1(d.errorMessageDescription), d.inputMessageTitle, ObjectModelWorksheetPartManager.b1(d.inputMessageDescription));
-                this.f9(a, runOn(d, d._n), e, SpreadsheetMLMain.abx);
-                this.f9(a, runOn(d, d._o), e, SpreadsheetMLMain.aby);
+                SpreadsheetMLMain.aar(this, af, XlsxUtilities.au(ab._m), XlsxUtilities.ar(ab.errorStyle), XlsxUtilities.as(ab.imeMode), XlsxUtilities.at(ab._l), ab._r, ad, ab.showInputMessage, ab.showErrorMessageForInvalidValue, ab.errorMessageTitle, ObjectModelWorksheetPartManager.b1(ab.errorMessageDescription), ab.inputMessageTitle, ObjectModelWorksheetPartManager.b1(ab.inputMessageDescription));
+                this.f9(y, runOn(ab, ab._n), ac, SpreadsheetMLMain.abx);
+                this.f9(y, runOn(ab, ab._o), ac, SpreadsheetMLMain.aby);
                 this.ad.k();
             }
         }
-        gd(v, w) {
-            if (w == null || w.count == 0) {
+        gd(at, au) {
+            if (au == null || au.count == 0) {
                 return;
             }
-            SpreadsheetMLMain.aas(this, void 0, toNullable(Number_$type, null), toNullable(Number_$type, null), toNullable(Number_$type, intSToU(w.count)));
-            w.q((x) => this.gc(v, x, false));
+            SpreadsheetMLMain.aas(this, void 0, toNullable(Number_$type, null), toNullable(Number_$type, null), toNullable(Number_$type, intSToU(au.count)));
+            au.q((av) => this.gc(at, av, false));
             this.ad.k();
         }
-        ge(v, w) {
-            let x = this.bl._cx(w.p, w.n, Math.max(0, w.q - 1), Math.max(0, w.o - 1));
-            if (x == null) {
+        ge(at, au) {
+            let av = this.bl._cx(au.p, au.n, Math.max(0, au.q - 1), Math.max(0, au.o - 1));
+            if (av == null) {
                 return;
             }
-            let y = x._u ? x._k._c7(x._v, 1, false, true, true) : x._toString2(1, false, true, true);
-            SpreadsheetMLMain.aa1(this, y);
+            let aw = av._u ? av._k._c7(av._v, 1, false, true, true) : av._toString2(1, false, true, true);
+            SpreadsheetMLMain.aa1(this, aw);
             this.ad.k();
         }
-        static gf(v, w) {
-            if (w == null) {
+        static gf(at, au) {
+            if (au == null) {
                 return;
             }
-            SpreadsheetMLMain.aa2(v, w);
-            v.ad.k();
+            SpreadsheetMLMain.aa2(at, au);
+            at.ad.k();
         }
-        gg(v, w) {
-            if (w == null || w.count == 0) {
+        gg(at, au) {
+            if (au == null || au.count == 0) {
                 return;
             }
             SpreadsheetMLMain.abb(this, "{CCE6A557-97BC-4b89-ADB6-D9C93CAAB3DF}");
             this.ad.l(SpreadsheetML2009Main.ao);
-            SpreadsheetML2009Main.di(this, void 0, toNullable(Number_$type, null), toNullable(Number_$type, null), toNullable(Number_$type, intSToU(w.count)));
+            SpreadsheetML2009Main.di(this, void 0, toNullable(Number_$type, null), toNullable(Number_$type, null), toNullable(Number_$type, intSToU(au.count)));
             this.ad.l(Excel2006Main.ao);
-            w.q((x) => this.gc(v, x, true));
+            au.q((av) => this.gc(at, av, true));
             this.ad.k();
             this.ad.k();
         }
@@ -7484,88 +7503,88 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                 this.ad.k();
             });
         }
-        ba(v, w) {
-            let x = null;
-            let y = null;
-            if (v._ce != null) {
-                let z = v._ce.tryGetValue(this.bl, x);
-                x = z.p1;
-            }
-            if (v._cj != null) {
-                let aa = v._cj.tryGetValue(this.bl, y);
-                y = aa.p1;
-            }
-            let ab = this.bl._eb || (x != null && x.n) || y != null;
-            let ac = w != null && w.count != 0;
-            if (ab == false && ac == false) {
+        ba(at, au) {
+            let av = null;
+            let aw = null;
+            if (at._cf != null) {
+                let ax = at._cf.tryGetValue(this.bl, av);
+                av = ax.p1;
+            }
+            if (at._ck != null) {
+                let ay = at._ck.tryGetValue(this.bl, aw);
+                aw = ay.p1;
+            }
+            let az = this.bl._eb || (av != null && av.n) || aw != null;
+            let a0 = au != null && au.count != 0;
+            if (az == false && a0 == false) {
                 return null;
             }
             SpreadsheetMLMain.abh(this);
-            if (x != null) {
-                x.y(this, v, this.ad);
+            if (av != null) {
+                av.y(this, at, this.ad);
             }
-            if (y != null) {
-                y.b(this, v, this.ad);
+            if (aw != null) {
+                aw.b(this, at, this.ad);
             }
-            this.gg(v, w);
+            this.gg(at, au);
             return WorkItemExtensions.a(this.a9(), () => this.ad.k());
         }
-        gh(v, w, x, y) {
-            let z = typeCast(SingleTargetFormula.$, y);
-            if (z == null || z._ck == false) {
-                return;
-            }
-            let aa = null;
-            let ab = null;
-            let ac = 0;
-            let ad = false;
-            let ae = false;
-            let af = null;
-            let ag = null;
-            let ah = toNullable(Number_$type, null);
-            if (z._am) {
-                let ai = z._c0;
-                ac = 2;
-                ab = ai._h._toString2(1, false, true, true);
-                let aj = ai.columnInputCell;
-                let ak = ai.rowInputCell;
-                let al = WorksheetCell.l_op_Inequality(aj, null) && WorksheetCell.l_op_Inequality(ak, null);
-                ad = al;
-                ae = WorksheetCell.l_op_Inequality(ak, null);
-                af = (ak || aj)._toString2(1, false, true, true);
-                if (al) {
-                    ag = aj._toString2(1, false, true, true);
-                }
-            }
-            else if (z._ak) {
-                ac = 1;
-                let am = z._c0;
-                ab = am.cellRange._toString2(1, false, true, true);
-                aa = v._cv(am);
+        gh(at, au, av, aw) {
+            let ax = typeCast(SingleTargetFormula.$, aw);
+            if (ax == null || ax._ck == false) {
+                return;
+            }
+            let ay = null;
+            let az = null;
+            let a0 = 0;
+            let a1 = false;
+            let a2 = false;
+            let a3 = null;
+            let a4 = null;
+            let a5 = toNullable(Number_$type, null);
+            if (ax._am) {
+                let a6 = ax._c0;
+                a0 = 2;
+                az = a6._h._toString2(1, false, true, true);
+                let a7 = a6.columnInputCell;
+                let a8 = a6.rowInputCell;
+                let a9 = WorksheetCell.l_op_Inequality(a7, null) && WorksheetCell.l_op_Inequality(a8, null);
+                a1 = a9;
+                a2 = WorksheetCell.l_op_Inequality(a8, null);
+                a3 = (a8 || a7)._toString2(1, false, true, true);
+                if (a9) {
+                    a4 = a7._toString2(1, false, true, true);
+                }
+            }
+            else if (ax._ak) {
+                a0 = 1;
+                let ba = ax._c0;
+                az = ba.cellRange._toString2(1, false, true, true);
+                ay = at._cw(ba);
             }
             else {
-                aa = v._cv(z);
-                let t1 = z._s;
+                ay = at._cw(ax);
+                let t1 = ax._s;
                 L0: while (true) {
                     switch (t1) {
                         case 3:
                         case 0:
-                            ac = 0;
+                            a0 = 0;
                             break;
                         case 2:
-                            ac = 3;
-                            let an;
-                            let ao;
-                            ah = toNullable(Number_$type, ((() => { let ap = v._cx(w.worksheet, z, an, ao); an = ap.p2; ao = ap.p3; return ap.ret; })()));
-                            if (ao != null) {
-                                ab = ao._toString2(1, false, true, true);
+                            a0 = 3;
+                            let bb;
+                            let bc;
+                            a5 = toNullable(Number_$type, ((() => { let bd = at._cy(au.worksheet, ax, bb, bc); bb = bd.p2; bc = bd.p3; return bd.ret; })()));
+                            if (bc != null) {
+                                az = bc._toString2(1, false, true, true);
                             }
-                            if (an == false) {
-                                aa = null;
+                            if (bb == false) {
+                                ay = null;
                             }
                             break;
                         case 4:
-                            ac = 0;
+                            a0 = 0;
                             break;
                         default:
                             t1 = 0;
@@ -7574,45 +7593,45 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
                     break;
                 }
             }
-            let ap = w._as(x)._be();
-            SpreadsheetMLMain.abj(this, aa, ac, void 0, ab, ad, ae, void 0, void 0, af, ag, ap, ah);
+            let bd = au._as(av)._be();
+            SpreadsheetMLMain.abj(this, ay, a0, void 0, az, a1, a2, void 0, void 0, a3, a4, bd, a5);
             this.ad.k();
         }
-        static gi(v, w) {
-            let x = stringIsNullOrEmpty(w.header) == false;
-            let y = stringIsNullOrEmpty(w.footer) == false;
-            if (x == false && y == false && w.alignHeadersAndFootersWithMargins == true && w.scaleHeadersAndFootersWithDocument == true) {
+        static gi(at, au) {
+            let av = stringIsNullOrEmpty(au.header) == false;
+            let aw = stringIsNullOrEmpty(au.footer) == false;
+            if (av == false && aw == false && au.alignHeadersAndFootersWithMargins == true && au.scaleHeadersAndFootersWithDocument == true) {
                 return;
             }
-            SpreadsheetMLMain.ab1(v, void 0, void 0, w.scaleHeadersAndFootersWithDocument, w.alignHeadersAndFootersWithMargins);
-            if (x) {
-                SpreadsheetMLMain.ack(v, w.header);
-                v.ad.k();
+            SpreadsheetMLMain.ab1(at, void 0, void 0, au.scaleHeadersAndFootersWithDocument, au.alignHeadersAndFootersWithMargins);
+            if (av) {
+                SpreadsheetMLMain.ack(at, au.header);
+                at.ad.k();
             }
-            if (y) {
-                SpreadsheetMLMain.acj(v, w.footer);
-                v.ad.k();
+            if (aw) {
+                SpreadsheetMLMain.acj(at, au.footer);
+                at.ad.k();
             }
-            v.ad.k();
+            at.ad.k();
         }
-        gj(v) {
-            let w;
-            let x;
-            let y;
-            let z = WorkbookSaveManager._b7(v, w, x, y);
-            w = z.p1;
-            x = z.p2;
-            y = z.p3;
-            let aa = null;
-            if (w != null) {
-                aa = this.d._ay(w, this.bh._a4());
-            }
-            let ab = WorksheetCell.l_op_Inequality(v.sourceCell, null) ? v.sourceCell._toString2(1, false, true, true) : v.sourceRegion._toString2(1, false, true, true);
-            let ac = v.displayText != null ? v.displayText : v.targetAddress;
-            if (Base.equalsStatic(ac, v.sourceRegion._k._c6(v.sourceRegion._v))) {
-                ac = null;
-            }
-            SpreadsheetMLMain.ab3(this, ab, aa, x, v.toolTip, v.displayText);
+        gj(at) {
+            let au;
+            let av;
+            let aw;
+            let ax = WorkbookSaveManager._b8(at, au, av, aw);
+            au = ax.p1;
+            av = ax.p2;
+            aw = ax.p3;
+            let ay = null;
+            if (au != null) {
+                ay = this.d._ay(au, this.bh._a4());
+            }
+            let az = WorksheetCell.l_op_Inequality(at.sourceCell, null) ? at.sourceCell._toString2(1, false, true, true) : at.sourceRegion._toString2(1, false, true, true);
+            let a0 = at.displayText != null ? at.displayText : at.targetAddress;
+            if (Base.equalsStatic(a0, at.sourceRegion._k._c6(at.sourceRegion._v))) {
+                a0 = null;
+            }
+            SpreadsheetMLMain.ab3(this, az, ay, av, at.toolTip, at.displayText);
             this.ad.k();
         }
         gk() {
@@ -7623,148 +7642,148 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             ExcelUtils.fq(WorksheetHyperlink.$, this.bl._hyperlinks$i, runOn(this, this.gj));
             this.ad.k();
         }
-        static gl(v, w) {
-            if (w == null) {
+        static gl(at, au) {
+            if (au == null) {
                 return;
             }
-            if (v.d._z == 0) {
-                SpreadsheetMLMain.acc(v, w);
-                v.ad.k();
+            if (at.d._z == 0) {
+                SpreadsheetMLMain.acc(at, au);
+                at.ad.k();
             }
             else {
-                v.ad.g([new AlternateContentChoice(0, VmlNamespace.ao, () => {
-                        SpreadsheetMLMain.acc(v, w);
-                        v.ad.k();
+                at.ad.g([new AlternateContentChoice(0, VmlNamespace.ao, () => {
+                        SpreadsheetMLMain.acc(at, au);
+                        at.ad.k();
                     })]);
             }
         }
-        static gm(v, w) {
-            if (w == null) {
+        static gm(at, au) {
+            if (au == null) {
                 return;
             }
-            if (v.d._z == 0) {
-                SpreadsheetMLMain.acd(v, w);
-                v.ad.k();
+            if (at.d._z == 0) {
+                SpreadsheetMLMain.acd(at, au);
+                at.ad.k();
             }
             else {
-                v.ad.g([new AlternateContentChoice(0, VmlNamespace.ao, () => {
-                        SpreadsheetMLMain.acd(v, w);
-                        v.ad.k();
+                at.ad.g([new AlternateContentChoice(0, VmlNamespace.ao, () => {
+                        SpreadsheetMLMain.acd(at, au);
+                        at.ad.k();
                     })]);
             }
         }
-        gn(v) {
-            SpreadsheetMLMain.ace(this, v._toString2(1, false, true, true));
+        gn(at) {
+            SpreadsheetMLMain.ace(this, at._toString2(1, false, true, true));
             this.ad.k();
         }
         go() {
-            let v = ObjectModelWorksheetPartManager.bi(this)._b9._ax(this.bl);
-            let w = Enumerable.aj(WorksheetMergedCellsRegion.$, v);
-            if (w == 0) {
+            let at = ObjectModelWorksheetPartManager.bi(this)._b9._ax(this.bl);
+            let au = Enumerable.aj(WorksheetMergedCellsRegion.$, at);
+            if (au == 0) {
                 return;
             }
-            SpreadsheetMLMain.acf(this, toNullable(Number_$type, intSToU(w)));
-            ExcelUtils.fq(WorksheetMergedCellsRegion.$, v, runOn(this, this.gn));
+            SpreadsheetMLMain.acf(this, toNullable(Number_$type, intSToU(au)));
+            ExcelUtils.fq(WorksheetMergedCellsRegion.$, at, runOn(this, this.gn));
             this.ad.k();
         }
         gp() {
             SpreadsheetMLMain.acp(this, void 0, this.bl.displayOptions._ao, this.bl.displayOptions._ap, this.bl.displayOptions.showOutlineSymbols);
             this.ad.k();
         }
-        static gq(v, w) {
-            SpreadsheetMLMain.acq(v, w.leftMargin, w.rightMargin, w.topMargin, w.bottomMargin, w.headerMargin, w.footerMargin);
-            v.ad.k();
+        static gq(at, au) {
+            SpreadsheetMLMain.acq(at, au.leftMargin, au.rightMargin, au.topMargin, au.bottomMargin, au.headerMargin, au.footerMargin);
+            at.ad.k();
         }
-        static gr(v, w) {
-            if (w._ag() == false) {
+        static gr(at, au) {
+            if (au._ag() == false) {
                 return;
             }
-            let x = null;
-            if (w._c != null) {
-                let y = WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), v.d._j(ObjectModelPrinterSettingsPartManager.a8, w._c));
-                if (y != null) {
-                    x = y.d;
+            let av = null;
+            if (au._c != null) {
+                let aw = WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), at.d._j(ObjectModelPrinterSettingsPartManager.a8, au._c));
+                if (aw != null) {
+                    av = aw.d;
                 }
             }
-            let z = 100;
-            let aa = 1;
-            let ab = 1;
-            let ac = 0;
-            if (typeCast(PrintOptions.$, w) !== null) {
-                let ad = w;
-                z = ad.scalingFactor;
-                aa = ad.maxPagesHorizontally;
-                ab = ad.maxPagesVertically;
-                ac = XlsxUtilities.ay(ad.pageOrder);
+            let ax = 100;
+            let ay = 1;
+            let az = 1;
+            let a0 = 0;
+            if (typeCast(PrintOptions.$, au) !== null) {
+                let a1 = au;
+                ax = a1.scalingFactor;
+                ay = a1.maxPagesHorizontally;
+                az = a1.maxPagesVertically;
+                a0 = XlsxUtilities.ay(a1.pageOrder);
             }
-            SpreadsheetMLMain.acr(v, w.paperSize, void 0, void 0, intSToU(z), intSToU(w.startPageNumber), intSToU(aa), intSToU(ab), ac, XlsxUtilities.ax(w.orientation), void 0, w.printInBlackAndWhite, w.draftQuality, XlsxUtilities.aq(w.printNotes), w.pageNumbering == 1, XlsxUtilities.a1(w.printErrors), intSToU(w.resolution), intSToU(w.verticalResolution), intSToU(w.numberOfCopies), x);
-            v.ad.k();
+            SpreadsheetMLMain.acr(at, au.paperSize, void 0, void 0, intSToU(ax), intSToU(au.startPageNumber), intSToU(ay), intSToU(az), a0, XlsxUtilities.ax(au.orientation), void 0, au.printInBlackAndWhite, au.draftQuality, XlsxUtilities.aq(au.printNotes), au.pageNumbering == 1, XlsxUtilities.a1(au.printErrors), intSToU(au.resolution), intSToU(au.verticalResolution), intSToU(au.numberOfCopies), av);
+            at.ad.k();
         }
         gs() {
             SpreadsheetMLMain.acs(this, void 0, this.bl.printOptions.scalingType == 1);
             this.ad.k();
         }
-        gt(v) {
-            let w = this.bh._by;
-            v._bs();
-            let x = XlsxUtilities.az(v._aa);
-            if (v.panesAreFrozen) {
-                let y = v.frozenPaneSettings;
-                let z = null;
-                let aa = Math.max(y.frozenColumns, y.firstColumnInRightPane);
-                let ab = Math.max(y.frozenRows, y.firstRowInBottomPane);
-                if (aa > 0 || ab > 0) {
-                    z = CellAddress.u(ab, aa, w.currentFormat);
-                }
-                let ac = y._aa ? 2 : 1;
-                SpreadsheetMLMain.act(this, y.frozenColumns, y.frozenRows, z, x, ac);
+        gt(at) {
+            let au = this.bh._by;
+            at._bs();
+            let av = XlsxUtilities.az(at._aa);
+            if (at.panesAreFrozen) {
+                let aw = at.frozenPaneSettings;
+                let ax = null;
+                let ay = Math.max(aw.frozenColumns, aw.firstColumnInRightPane);
+                let az = Math.max(aw.frozenRows, aw.firstRowInBottomPane);
+                if (ay > 0 || az > 0) {
+                    ax = CellAddress.u(az, ay, au.currentFormat);
+                }
+                let a0 = aw._aa ? 2 : 1;
+                SpreadsheetMLMain.act(this, aw.frozenColumns, aw.frozenRows, ax, av, a0);
             }
             else {
-                let ad = v.unfrozenPaneSettings;
-                let ae = null;
-                if (ad.firstColumnInRightPane > 0 && ad.firstRowInBottomPane > 0) {
-                    ae = CellAddress.u(ad.firstRowInBottomPane, ad.firstColumnInRightPane, w.currentFormat);
+                let a1 = at.unfrozenPaneSettings;
+                let a2 = null;
+                if (a1.firstColumnInRightPane > 0 && a1.firstRowInBottomPane > 0) {
+                    a2 = CellAddress.u(a1.firstRowInBottomPane, a1.firstColumnInRightPane, au.currentFormat);
                 }
-                SpreadsheetMLMain.act(this, ad.leftPaneWidth, ad.topPaneHeight, ae, x, 0);
+                SpreadsheetMLMain.act(this, a1.leftPaneWidth, a1.topPaneHeight, a2, av, 0);
             }
             this.ad.k();
         }
-        static gu(v, w, x) {
-            if (x.a == null) {
+        static gu(at, au, av) {
+            if (av.a == null) {
                 return;
             }
-            SpreadsheetMLMain.acv(v, x.a);
-            v.ad.k();
+            SpreadsheetMLMain.acv(at, av.a);
+            at.ad.k();
         }
-        gv(v) {
-            SpreadsheetMLMain.acy(this, v.centerHorizontally, v.centerVertically, v.printRowAndColumnHeaders, v.printGridlines);
+        gv(at) {
+            SpreadsheetMLMain.acy(this, at.centerHorizontally, at.centerVertically, at.printRowAndColumnHeaders, at.printGridlines);
             this.ad.k();
         }
-        gw(v) {
-            let w = this.d._z == 0;
-            if (w && nullableEquals(v._c.h(), 0)) {
-                w = false;
-            }
-            let x = null;
-            if (v.ranges.count > 0) {
-                let y = Enumerable.o(WorksheetRegion.$, WorksheetRegionAddress.$, v.ranges, (z) => z._h);
-                x = WorksheetReferenceCollection._ab(1, this.bl, y);
-            }
-            if (w == false) {
-                let z;
-                let aa, ab;
-                let ac;
-                let ad = v._c.e(z, aa, ab, ac);
-                z = ad.p0;
-                aa = ad.p1;
-                ab = ad.p2;
-                ac = ad.p3;
-                SpreadsheetMLMain.ac0(this, v._m(), x, v.title, z, aa != null ? Convert.toBase64String(aa) : null, ab != null ? Convert.toBase64String(ab) : null, ac);
+        gw(at) {
+            let au = this.d._z == 0;
+            if (au && nullableEquals(at._c.h(), 0)) {
+                au = false;
+            }
+            let av = null;
+            if (at.ranges.count > 0) {
+                let aw = Enumerable.o(WorksheetRegion.$, WorksheetRegionAddress.$, at.ranges, (ax) => ax._h);
+                av = WorksheetReferenceCollection._ab(1, this.bl, aw);
+            }
+            if (au == false) {
+                let ax;
+                let ay, az;
+                let a0;
+                let a1 = at._c.e(ax, ay, az, a0);
+                ax = a1.p0;
+                ay = a1.p1;
+                az = a1.p2;
+                a0 = a1.p3;
+                SpreadsheetMLMain.ac0(this, at._m(), av, at.title, ax, ay != null ? Convert.toBase64String(ay) : null, az != null ? Convert.toBase64String(az) : null, a0);
             }
             else {
-                let ae = v._c.h();
-                let af = ae.hasValue ? toNullable(ST_UnsignedShortHex.$, new ST_UnsignedShortHex(1, ae.value)) : toNullable(ST_UnsignedShortHex.$, null);
-                SpreadsheetMLMain.acz(this, v._m(), x, v.title, af);
+                let a2 = at._c.h();
+                let a3 = a2.hasValue ? toNullable(ST_UnsignedShortHex.$, new ST_UnsignedShortHex(1, a2.value)) : toNullable(ST_UnsignedShortHex.$, null);
+                SpreadsheetMLMain.acz(this, at._m(), av, at.title, a3);
             }
             this.ad.k();
         }
@@ -7776,64 +7795,64 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             ExcelUtils.fq(WorksheetProtectedRange.$, this.bl.protection._allowedEditRanges$i, runOn(this, this.gw));
             this.ad.k();
         }
-        bx(v, w, x) {
-            let y = 0;
-            let z = false;
-            if (w._hasCellFormat && w._cellFormatInternal._z == false) {
-                y = v._a8(w._cellFormatInternal.d);
-                z = true;
+        bx(at, au, av) {
+            let aw = 0;
+            let ax = false;
+            if (au._hasCellFormat && au._cellFormatInternal._z == false) {
+                aw = at._a8(au._cellFormatInternal.d);
+                ax = true;
             }
-            let aa = toNullable(Number_$type, null);
-            let ab = w._cs(true);
-            if (ab > -1) {
-                aa = toNullable(Number_$type, ab / 20);
+            let ay = toNullable(Number_$type, null);
+            let az = au._cs(true);
+            if (az > -1) {
+                ay = toNullable(Number_$type, az / 20);
             }
             else if (this.bl._d4) {
-                aa = toNullable(Number_$type, this.bl.defaultRowHeight / 20);
+                ay = toNullable(Number_$type, this.bl.defaultRowHeight / 20);
             }
-            SpreadsheetMLMain.ac8(this, toNullable(Number_$type, intSToU((w.index + 1))), void 0, y, z, aa, w.hidden, w._bz, w.outlineLevel, x.a, w._b4, w._b1);
-            let ac = w._hasCellFormat ? w._cellFormatInternal.d : null;
-            let ad = CellAddress.x(w.index, true, v._b.currentFormat, w.index, false, 1);
-            let ae = 0;
-            for (let af of fromEnum(w._ch(void 0, void 0, true))) {
-                if (af.j == null) {
-                    af.j = ac || this.bl._cb(af.r).b;
+            SpreadsheetMLMain.ac8(this, toNullable(Number_$type, intSToU((au.index + 1))), void 0, aw, ax, ay, au.hidden, au._bz, au.outlineLevel, av.a, au._b4, au._b1);
+            let a0 = au._hasCellFormat ? au._cellFormatInternal.d : null;
+            let a1 = CellAddress.x(au.index, true, at._b.currentFormat, au.index, false, 1);
+            let a2 = 0;
+            for (let a3 of fromEnum(au._ch(void 0, void 0, true))) {
+                if (a3.j == null) {
+                    a3.j = a0 || this.bl._cb(a3.r).b;
                 }
-                this.f4(v, w, x, ad, af);
-                ae++;
+                this.f4(at, au, av, a1, a3);
+                a2++;
             }
             this.ad.k();
-            return ae;
+            return a2;
         }
-        gy(v) {
-            if (v._cp == false) {
+        gy(at) {
+            if (at._cp == false) {
                 return;
             }
-            SpreadsheetMLMain.ac7(this, intSToU(v._horizontalPageBreaks$i.count), intSToU(v._horizontalPageBreaks$i._k()));
-            ExcelUtils.fq(HorizontalPageBreak.$, v._horizontalPageBreaks$i, runOn(this, this.f3));
+            SpreadsheetMLMain.ac7(this, intSToU(at._horizontalPageBreaks$i.count), intSToU(at._horizontalPageBreaks$i._k()));
+            ExcelUtils.fq(HorizontalPageBreak.$, at._horizontalPageBreaks$i, runOn(this, this.f3));
             this.ad.k();
         }
-        gz(v) {
-            if (v._aj == false) {
+        gz(at) {
+            if (at._aj == false) {
                 return;
             }
-            let w = v._ag;
-            let x = v._ae.workbook;
-            let y = x.currentFormat;
-            for (let z of fromEnum(w.b)) {
-                let aa = XlsxUtilities.az(z.a);
-                let ab = z.b.p(false, false, y, 1);
-                let ac = intSToU(z.f);
-                let ad = new List$1(String_$type, 0);
-                for (let ae of fromEnum(z.d)) {
-                    ad.add(ae._ah(false, false, y, 1));
+            let au = at._ag;
+            let av = at._ae.workbook;
+            let aw = av.currentFormat;
+            for (let ax of fromEnum(au.b)) {
+                let ay = XlsxUtilities.az(ax.a);
+                let az = ax.b.p(false, false, aw, 1);
+                let a0 = intSToU(ax.f);
+                let a1 = new List$1(String_$type, 0);
+                for (let a2 of fromEnum(ax.d)) {
+                    a1.add(a2._ah(false, false, aw, 1));
                 }
-                SpreadsheetMLMain.adc(this, aa, ab, ac, ad);
+                SpreadsheetMLMain.adc(this, ay, az, a0, a1);
                 this.ad.k();
             }
         }
         g0() {
-            if (Enumerable.d(KeyValuePair$2.$.specialize(WorkbookReferenceBase.$, Number_$type), this.bh._b9._ck, (v) => typeCast(OleLinkWorkbookReference.$, v.key) !== null)) {
+            if (Enumerable.d(KeyValuePair$2.$.specialize(WorkbookReferenceBase.$, Number_$type), this.bh._b9._cl, (at) => typeCast(OleLinkWorkbookReference.$, at.key) !== null)) {
                 return;
             }
             if (!this.bo) {
@@ -7842,15 +7861,15 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             SpreadsheetMLMain.ade(this, true);
             this.ad.k();
         }
-        bb(v) {
+        bb(at) {
             SpreadsheetMLMain.adf(this);
-            let w = 0;
-            return WorkItemExtensions.a(Async.e(WorksheetRow.$, v._ay(this.bl), (x) => {
-                let y = v._u(x);
-                if (y != null) {
-                    w += this.bx(v, x, y);
-                    if (1000 < w) {
-                        w = 0;
+            let au = 0;
+            return WorkItemExtensions.a(Async.e(WorksheetRow.$, at._ay(this.bl), (av) => {
+                let aw = at._u(av);
+                if (aw != null) {
+                    au += this.bx(at, av, aw);
+                    if (1000 < au) {
+                        au = 0;
                         return false;
                     }
                 }
@@ -7858,67 +7877,67 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             }), () => this.ad.k());
         }
         g1() {
-            let v = this.bl._ek ? toNullable(Number_$type, this.bl.getDefaultColumnWidth(0)) : toNullable(Number_$type, null);
-            if (nullableNotEquals(v, null) && Enumerable.b(WorksheetColumnBlock.$, this.bl._ff, (w) => w.i)) {
-                v = toNullable(Number_$type, 0);
+            let at = this.bl._ek ? toNullable(Number_$type, this.bl.getDefaultColumnWidth(0)) : toNullable(Number_$type, null);
+            if (nullableNotEquals(at, null) && Enumerable.b(WorksheetColumnBlock.$, this.bl._ff, (au) => au.i)) {
+                at = toNullable(Number_$type, 0);
             }
-            SpreadsheetMLMain.adj(this, this.bl.defaultRowHeight / 20, truncate(MathUtilities.j(this.bl.getDefaultColumnWidth(2))), v, this.bl._d4, this.bl._dv, this.bl._dt, this.bl._ds);
+            SpreadsheetMLMain.adj(this, this.bl.defaultRowHeight / 20, truncate(MathUtilities.j(this.bl.getDefaultColumnWidth(2))), at, this.bl._d4, this.bl._dv, this.bl._dt, this.bl._ds);
             this.ad.k();
         }
         g2() {
-            let v = null;
+            let at = null;
             if (this.bl.workbook._k != null) {
-                v = this.bl._ak;
+                at = this.bl._ak;
             }
-            SpreadsheetMLMain.adm(this, void 0, void 0, void 0, void 0, void 0, void 0, v);
+            SpreadsheetMLMain.adm(this, void 0, void 0, void 0, void 0, void 0, void 0, at);
             this.g7();
             this.gp();
             this.gs();
             this.ad.k();
         }
         g3() {
-            let v = this.bl.protection;
-            let w = this.d._z == 0;
-            if (w && nullableEquals(v._c.h(), 0)) {
-                w = false;
-            }
-            if (w && !v._c.h().hasValue) {
-                w = false;
-            }
-            if (w == false) {
-                let x;
-                let y, z;
-                let aa;
-                let ab = v._c.e(x, y, z, aa);
-                x = ab.p0;
-                y = ab.p1;
-                z = ab.p2;
-                aa = ab.p3;
-                SpreadsheetMLMain.ado(this, x, y != null ? Convert.toBase64String(y) : null, z != null ? Convert.toBase64String(z) : null, aa, this.bl.isProtected, v.allowEditObjects == false, v.allowEditScenarios == false, v.allowFormattingCells == false, v.allowFormattingColumns == false, v.allowFormattingRows == false, v.allowInsertingColumns == false, v.allowInsertingRows == false, v.allowInsertingHyperlinks == false, v.allowDeletingColumns == false, v.allowDeletingRows == false, v._ab == false, v.allowSorting == false, v.allowFiltering == false, v.allowUsingPivotTables == false, v._ac == false);
+            let at = this.bl.protection;
+            let au = this.d._z == 0;
+            if (au && nullableEquals(at._c.h(), 0)) {
+                au = false;
+            }
+            if (au && !at._c.h().hasValue) {
+                au = false;
+            }
+            if (au == false) {
+                let av;
+                let aw, ax;
+                let ay;
+                let az = at._c.e(av, aw, ax, ay);
+                av = az.p0;
+                aw = az.p1;
+                ax = az.p2;
+                ay = az.p3;
+                SpreadsheetMLMain.ado(this, av, aw != null ? Convert.toBase64String(aw) : null, ax != null ? Convert.toBase64String(ax) : null, ay, this.bl.isProtected, at.allowEditObjects == false, at.allowEditScenarios == false, at.allowFormattingCells == false, at.allowFormattingColumns == false, at.allowFormattingRows == false, at.allowInsertingColumns == false, at.allowInsertingRows == false, at.allowInsertingHyperlinks == false, at.allowDeletingColumns == false, at.allowDeletingRows == false, at._ab == false, at.allowSorting == false, at.allowFiltering == false, at.allowUsingPivotTables == false, at._ac == false);
             }
             else {
-                let ac = v._c.h();
-                let ad = ac.hasValue ? toNullable(ST_UnsignedShortHex.$, new ST_UnsignedShortHex(1, ac.value)) : toNullable(ST_UnsignedShortHex.$, null);
-                SpreadsheetMLMain.adn(this, ad, this.bl.isProtected, v.allowEditObjects == false, v.allowEditScenarios == false, v.allowFormattingCells == false, v.allowFormattingColumns == false, v.allowFormattingRows == false, v.allowInsertingColumns == false, v.allowInsertingRows == false, v.allowInsertingHyperlinks == false, v.allowDeletingColumns == false, v.allowDeletingRows == false, v._ab == false, v.allowSorting == false, v.allowFiltering == false, v.allowUsingPivotTables == false, v._ac == false);
+                let a0 = at._c.h();
+                let a1 = a0.hasValue ? toNullable(ST_UnsignedShortHex.$, new ST_UnsignedShortHex(1, a0.value)) : toNullable(ST_UnsignedShortHex.$, null);
+                SpreadsheetMLMain.adn(this, a1, this.bl.isProtected, at.allowEditObjects == false, at.allowEditScenarios == false, at.allowFormattingCells == false, at.allowFormattingColumns == false, at.allowFormattingRows == false, at.allowInsertingColumns == false, at.allowInsertingRows == false, at.allowInsertingHyperlinks == false, at.allowDeletingColumns == false, at.allowDeletingRows == false, at._ab == false, at.allowSorting == false, at.allowFiltering == false, at.allowUsingPivotTables == false, at._ac == false);
             }
             this.ad.k();
         }
         g4() {
-            let v = this.bh._by;
-            let w = this.bl.displayOptions;
-            let x = null;
-            let y = w.unfrozenPaneSettings.firstColumnInLeftPane;
-            let z = w.unfrozenPaneSettings.firstRowInTopPane;
-            if (y > 0 || z > 0) {
-                x = CellAddress.u(z, y, v.currentFormat);
-            }
-            SpreadsheetMLMain.adq(this, 0, void 0, w.showFormulasInCells, w.showGridlines, w.showRowAndColumnHeaders, w.showZeroValues, w.orderColumnsRightToLeft, v.windowOptions.selectedSheet == this.bl || this.bl._w, w.showRulerInPageLayoutView, w.showOutlineSymbols, w._a9 == 64, w.showWhitespaceInPageLayoutView, XlsxUtilities.a4(w.view), x, intSToU(w._a9), intSToU(w._b4), intSToU(w.magnificationInNormalView), intSToU(w.magnificationInPageBreakView), intSToU(w.magnificationInPageLayoutView));
-            let aa = this.bl.displayOptions.frozenPaneSettings;
-            let ab = this.bl.displayOptions.unfrozenPaneSettings;
-            if ((w.panesAreFrozen && (aa._h || aa._i)) || (!w.panesAreFrozen && (ab._h || ab._i))) {
-                this.gt(w);
-            }
-            this.gz(w);
+            let at = this.bh._by;
+            let au = this.bl.displayOptions;
+            let av = null;
+            let aw = au.unfrozenPaneSettings.firstColumnInLeftPane;
+            let ax = au.unfrozenPaneSettings.firstRowInTopPane;
+            if (aw > 0 || ax > 0) {
+                av = CellAddress.u(ax, aw, at.currentFormat);
+            }
+            SpreadsheetMLMain.adq(this, 0, void 0, au.showFormulasInCells, au.showGridlines, au.showRowAndColumnHeaders, au.showZeroValues, au.orderColumnsRightToLeft, at.windowOptions.selectedSheet == this.bl || this.bl._w, au.showRulerInPageLayoutView, au.showOutlineSymbols, au._a9 == 64, au.showWhitespaceInPageLayoutView, XlsxUtilities.a4(au.view), av, intSToU(au._a9), intSToU(au._b4), intSToU(au.magnificationInNormalView), intSToU(au.magnificationInPageBreakView), intSToU(au.magnificationInPageLayoutView));
+            let ay = this.bl.displayOptions.frozenPaneSettings;
+            let az = this.bl.displayOptions.unfrozenPaneSettings;
+            if ((au.panesAreFrozen && (ay._h || ay._i)) || (!au.panesAreFrozen && (az._h || az._i))) {
+                this.gt(au);
+            }
+            this.gz(au);
             this.ad.k();
         }
         g5() {
@@ -7926,41 +7945,41 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             this.g4();
             this.ad.k();
         }
-        g6(v, w, x, y, z = 0) {
-            if (w == null) {
+        g6(at, au, av, aw, ax = 0) {
+            if (au == null) {
                 return;
             }
-            (((aa, ab, ac, ad, ae) => SpreadsheetMLMain.adv(aa, ac, ab, ad, ae))(this, z == 1, w._toString2(1, false, true, true), x.caseSensitive, x._n ? XlsxUtilities.a5(x._i) : 0));
-            let af = v._w(w.worksheet);
-            for (let ag of fromEnum(x._sortConditions$i)) {
-                let ah = ag.key;
-                let ai = ag.value;
-                let aj = null;
-                let ak = 0;
-                let al = toNullable(Number_$type, null);
-                let am = typeCast(CustomListSortCondition.$, ai);
-                if (am != null) {
-                    aj = am._l();
+            (((ay, az, a0, a1, a2) => SpreadsheetMLMain.adv(ay, a0, az, a1, a2))(this, ax == 1, au._toString2(1, false, true, true), av.caseSensitive, av._n ? XlsxUtilities.a5(av._i) : 0));
+            let a3 = at._w(au.worksheet);
+            for (let a4 of fromEnum(av._sortConditions$i)) {
+                let a5 = a4.key;
+                let a6 = a4.value;
+                let a7 = null;
+                let a8 = 0;
+                let a9 = toNullable(Number_$type, null);
+                let ba = typeCast(CustomListSortCondition.$, a6);
+                if (ba != null) {
+                    a7 = ba._l();
                 }
-                let an = typeCast(IconSortCondition.$, ai);
-                if (an != null) {
-                    ak = an._k;
-                    al = an._n;
+                let bb = typeCast(IconSortCondition.$, a6);
+                if (bb != null) {
+                    a8 = bb._k;
+                    a9 = bb._n;
                 }
-                let ao = w._h;
-                if (z == 1) {
-                    ao = ao._d((ao._ac + ah.index))._f((ao._ac + ah.index));
+                let bc = au._h;
+                if (ax == 1) {
+                    bc = bc._d((bc._ac + a5.index))._f((bc._ac + a5.index));
                 }
                 else {
-                    ao = ao._c((ao._w + ah.index))._e((ao._w + ah.index));
+                    bc = bc._c((bc._w + a5.index))._e((bc._w + a5.index));
                 }
-                SpreadsheetMLMain.adt(this, ao._ah(true, true, this.bl._o, 1), ai.sortDirection == 1, ai._d, aj, y ? af.l(ah.index) : af.m(ah.index), ak, al);
+                SpreadsheetMLMain.adt(this, bc._ah(true, true, this.bl._o, 1), a6.sortDirection == 1, a6._d, a7, aw ? a3.l(a5.index) : a3.m(a5.index), a8, a9);
             }
             this.ad.k();
         }
-        bc(af) {
-            return WorkItemExtensions.e(Tuple$2.$.specialize(Uri.$, String_$type), this.bh._j(ObjectModelSlicerPartManager.a8, af), (ag) => {
-                SpreadsheetML2009Main.dr(this, WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), ag).d);
+        bc(a3) {
+            return WorkItemExtensions.e(Tuple$2.$.specialize(Uri.$, String_$type), this.bh._j(ObjectModelSlicerPartManager.a8, a3), (a4) => {
+                SpreadsheetML2009Main.dr(this, WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), a4).d);
                 this.ad.k();
             });
         }
@@ -7970,9 +7989,9 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             }
             ObjectModelCommonPartHelpers.ao(this, this.bl.displayOptions.tabColorInfo, 4, SpreadsheetMLMain.ad2);
         }
-        g8(af) {
-            let ag = this.bh._f(af).id;
-            SpreadsheetMLMain.ad6(this, ag);
+        g8(a3) {
+            let a4 = this.bh._f(a3).id;
+            SpreadsheetMLMain.ad6(this, a4);
             this.ad.k();
         }
         g9() {
@@ -7983,102 +8002,102 @@ export let ObjectModelWorksheetPartManager = /*@__PURE__*/ (() => {
             ExcelUtils.fq(WorksheetTable.$, this.bl._tables$i, runOn(this, this.g8));
             this.ad.k();
         }
-        static bq(af) {
-            if (af.workbook.calculationMode == 0 && !af.workbook.recalculateBeforeSave) {
+        static bq(a3) {
+            if (a3.workbook.calculationMode == 0 && !a3.workbook.recalculateBeforeSave) {
                 return true;
             }
-            if (af._shapes$i.count > 0) {
-                let ag = af._shapes$i;
-                for (let ah = 0; ah < ag.count; ah++) {
-                    if (typeCast(WorksheetChart.$, ag.item(ah)) !== null) {
+            if (a3._shapes$i.count > 0) {
+                let a4 = a3._shapes$i;
+                for (let a5 = 0; a5 < a4.count; a5++) {
+                    if (typeCast(WorksheetChart.$, a4.item(a5)) !== null) {
                         return true;
                     }
                 }
             }
             return false;
         }
-        bd(af, ag) {
-            let ah = af._b;
-            let ai = this.bl.printOptions;
-            let aj = af._w(this.bl);
+        bd(a3, a4) {
+            let a5 = a3._b;
+            let a6 = this.bl.printOptions;
+            let a7 = a3._w(this.bl);
             this.bo = ObjectModelWorksheetPartManager.bq(this.bl);
-            let ak = null;
-            let al = null;
-            for (let am of fromEnum(this.bl._dataValidationRules$i)) {
-                let an = am.key;
-                let ao = al;
-                if (this.bp(an._n(null)) || this.bp(an._o(null))) {
-                    if (al == null) {
-                        al = new List$1(KeyValuePair$2.$.specialize(DataValidationRule.$, WorksheetReferenceCollection.$), 0);
+            let a8 = null;
+            let a9 = null;
+            for (let ba of fromEnum(this.bl._dataValidationRules$i)) {
+                let bb = ba.key;
+                let bc = a9;
+                if (this.bp(bb._n(null)) || this.bp(bb._o(null))) {
+                    if (a9 == null) {
+                        a9 = new List$1(KeyValuePair$2.$.specialize(DataValidationRule.$, WorksheetReferenceCollection.$), 0);
                     }
-                    al.add(am);
+                    a9.add(ba);
                 }
                 else {
-                    if (ak == null) {
-                        ak = new List$1(KeyValuePair$2.$.specialize(DataValidationRule.$, WorksheetReferenceCollection.$), 0);
+                    if (a8 == null) {
+                        a8 = new List$1(KeyValuePair$2.$.specialize(DataValidationRule.$, WorksheetReferenceCollection.$), 0);
                     }
-                    ak.add(am);
+                    a8.add(ba);
                 }
             }
             SpreadsheetMLMain.aer(this);
-            if (ag.c != null || ag.b != null) {
+            if (a4.c != null || a4.b != null) {
                 this.ad.l(VmlNamespace.ao);
             }
             this.g2();
-            this.ge(af, aj);
+            this.ge(a3, a7);
             this.g5();
             this.g1();
-            this.f7(af);
-            return WorkItemExtensions.a(WorkItemExtensions.c(WorkItemExtensions.a(WorkItemExtensions.c(WorkItemExtensions.a(this.bb(af), () => {
+            this.f7(a3);
+            return WorkItemExtensions.a(WorkItemExtensions.c(WorkItemExtensions.a(WorkItemExtensions.c(WorkItemExtensions.a(this.bb(a3), () => {
                 this.g0();
                 this.g3();
                 this.gx();
-                this.f2(af);
-                this.g6(af, this.bl.sortSettings.region, this.bl.sortSettings, false, this.bl.sortSettings.sortType);
-                this.gb();
+                this.f2(a3, this.bl.filterSettings, false);
+                this.g6(a3, this.bl.sortSettings.region, this.bl.sortSettings, false, this.bl.sortSettings.sortType);
+                this.gb(a3);
                 this.go();
-                this.f8(af);
-                this.gd(af, ak);
+                this.f8(a3);
+                this.gd(a3, a8);
                 this.gk();
-                this.gv(ai);
-                ObjectModelWorksheetPartManager.gq(this, ai);
-                ObjectModelWorksheetPartManager.gr(this, ai);
-                ObjectModelWorksheetPartManager.gi(this, ai);
-                this.gy(ai);
-                this.f5(ai);
-                ObjectModelWorksheetPartManager.gf(this, ag.a);
-                ObjectModelWorksheetPartManager.gl(this, ag.c);
-                ObjectModelWorksheetPartManager.gm(this, ag.b);
-                ObjectModelWorksheetPartManager.gu(this, af, aj);
-            }), () => this.a8()), () => this.g9()), () => this.ba(af, al)), () => this.ad.k());
-        }
-        static bg(af, ag) {
-            ag = null;
-            let ah = typeCast(ObjectModelWorksheetPartManager.$, af);
-            let ai = ah.bf;
-            if (ConditionalFormatInfo.e(ai) == false) {
+                this.gv(a6);
+                ObjectModelWorksheetPartManager.gq(this, a6);
+                ObjectModelWorksheetPartManager.gr(this, a6);
+                ObjectModelWorksheetPartManager.gi(this, a6);
+                this.gy(a6);
+                this.f5(a6);
+                ObjectModelWorksheetPartManager.gf(this, a4.a);
+                ObjectModelWorksheetPartManager.gl(this, a4.c);
+                ObjectModelWorksheetPartManager.gm(this, a4.b);
+                ObjectModelWorksheetPartManager.gu(this, a3, a7);
+            }), () => this.a8()), () => this.g9()), () => this.ba(a3, a9)), () => this.ad.k());
+        }
+        static bg(a3, a4) {
+            a4 = null;
+            let a5 = typeCast(ObjectModelWorksheetPartManager.$, a3);
+            let a6 = a5.bf;
+            if (ConditionalFormatInfo.e(a6) == false) {
                 return {
                     ret: null,
-                    p1: ag
+                    p1: a4
                 };
             }
-            ag = ai.b;
-            if (CfRuleInfo.l(ag) == false) {
+            a4 = a6.b;
+            if (CfRuleInfo.l(a4) == false) {
                 return {
                     ret: null,
-                    p1: ag
+                    p1: a4
                 };
             }
             return {
-                ret: ai,
-                p1: ag
+                ret: a6,
+                p1: a4
             };
         }
         get bh() {
             return ObjectModelWorksheetPartManager.bi(this);
         }
-        static bi(af) {
-            return af.d;
+        static bi(a3) {
+            return a3.d;
         }
         get bm() {
             return this.bl;
@@ -8218,17 +8237,17 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
                 h.c = f;
             }
             else {
-                if (g._b7._bb.count == 0) {
+                if (g._b7._bc.count == 0) {
                     let i = new BorderInfo();
                     i.c.a = 0;
                     i.e.a = 0;
                     i.i.a = 0;
                     i.k.a = 0;
                     i.m.a = 0;
-                    g._b7._bb.add(i);
+                    g._b7._bc.add(i);
                 }
                 else {
-                    g._b7._bb.add(f);
+                    g._b7._bc.add(f);
                 }
             }
             a.s.k(f);
@@ -8267,7 +8286,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             f = h.p5;
             g = h.p6;
             let i = ObjectModelStylesPartManager.a8(a);
-            i._b7._bc.add(((() => {
+            i._b7._bd.add(((() => {
                 let $ret = new StyleInfo(0);
                 $ret.e = b;
                 $ret.l = c;
@@ -8288,14 +8307,14 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             let c = SpreadsheetMLMain.t3(a, b);
             b = c.p1;
             let d = ObjectModelStylesPartManager.a8(a);
-            a.s.k(d._b7._bd);
+            a.s.k(d._b7._be);
         }
         static bi(a) {
             let b;
             let c = SpreadsheetMLMain.t4(a, b);
             b = c.p1;
             let d = ObjectModelStylesPartManager.a8(a);
-            a.s.k(d._b7._be);
+            a.s.k(d._b7._bf);
         }
         static bj(a) {
         }
@@ -8330,7 +8349,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
                 c.e = b;
             }
             else {
-                ObjectModelStylesPartManager.a8(a)._b7._bf.add(b);
+                ObjectModelStylesPartManager.a8(a)._b7._bg.add(b);
             }
         }
         static bp(a) {
@@ -8352,7 +8371,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
                 f.a = d;
             }
             else {
-                b._b7._bg.add(e);
+                b._b7._bh.add(e);
             }
         }
         static br(a) {
@@ -8504,20 +8523,20 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
         }
         static b2(a) {
             let b = ObjectModelStylesPartManager.a8(a)._b7;
-            if (b._bc.count == 0) {
-                b._bc.add(new StyleInfo(0));
-                if (b._be.count != 0) {
-                    b._be._inner[0] = new FormatInfo();
+            if (b._bd.count == 0) {
+                b._bd.add(new StyleInfo(0));
+                if (b._bf.count != 0) {
+                    b._bf._inner[0] = new FormatInfo();
                 }
             }
-            if (b._bd.count == 0) {
-                b._bd.add(new FormatInfo());
+            if (b._be.count == 0) {
+                b._be.add(new FormatInfo());
             }
             ObjectModelStylesPartManager.b8(b);
-            ObjectModelStylesPartManager.b9(b, b._bd);
-            for (let c of fromEnum(b._bc)) {
-                if (c.e > -1 && c.e < b._bd.count) {
-                    let d = b._bd._inner[c.e].g;
+            ObjectModelStylesPartManager.b9(b, b._be);
+            for (let c of fromEnum(b._bd)) {
+                if (c.e > -1 && c.e < b._be.count) {
+                    let d = b._be._inner[c.e].g;
                     let e = new BuiltInStyleInfo();
                     if (nullableEquals(c.h, null) && ((() => { let f = WorkbookStyleCollection._t.tryGetValue(c.l, e); e = f.p1; return f.ret; })())) {
                         c.h = toNullable(Number_$type, e.a);
@@ -8542,12 +8561,12 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
                             f = b._b._styles$i._addUserDefinedStyle(d, c.l);
                         }
                     }
-                    if (b._a7.containsKey(c.e) == false) {
-                        b._a7.addItem(c.e, f);
+                    if (b._a8.containsKey(c.e) == false) {
+                        b._a8.addItem(c.e, f);
                     }
                 }
             }
-            ObjectModelStylesPartManager.b9(b, b._be);
+            ObjectModelStylesPartManager.b9(b, b._bf);
         }
         static b3(a) {
             let b;
@@ -8560,7 +8579,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             d = f.p3;
             e = f.p4;
             let g = ObjectModelStylesPartManager.a8(a);
-            if (g._b7._av == false) {
+            if (g._b7._aw == false) {
                 let h = new WorksheetTableStyle(b, true);
                 a.s.k(h);
                 if (d) {
@@ -8602,16 +8621,16 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
                 }
             }
             let h = ObjectModelStylesPartManager.a8(a);
-            if (e.hasValue && h._b7._av) {
+            if (e.hasValue && h._b7._aw) {
                 e.postDecrement();
             }
             let i = null;
             if (e.hasValue) {
                 i = h._b7._g._inner[e.value];
             }
-            if (i != null && (i._cd == false || h._b7._av)) {
+            if (i != null && (i._cd == false || h._b7._aw)) {
                 let j = h._by;
-                if (h._b7._av) {
+                if (h._b7._aw) {
                     j = null;
                 }
                 let k = b._areaFormats$i._d(j, g);
@@ -8634,7 +8653,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             a.s.k(new ObjectModelStylesPartManager_TableStylesCollectionInfo(c));
         }
         static b6(a) {
-            if (ObjectModelStylesPartManager.a8(a)._b7._av) {
+            if (ObjectModelStylesPartManager.a8(a)._b7._aw) {
                 return;
             }
             let b = a.s.a(ObjectModelStylesPartManager_TableStylesCollectionInfo.$);
@@ -8681,7 +8700,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             n = p.p12;
             o = p.p13;
             let q = ObjectModelStylesPartManager.a8(a);
-            let r = (b == q._b7._bd);
+            let r = (b == q._b7._be);
             let s = r;
             let t = 0;
             if (n.getValueOrDefault1(s)) {
@@ -8718,7 +8737,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             a.s.k(u);
         }
         static b8(a) {
-            for (let b of fromEnum(a._bg)) {
+            for (let b of fromEnum(a._bh)) {
                 let c = b.d;
                 c.colorInfo = b.c(a);
                 if (a._h.count == 0) {
@@ -8728,7 +8747,7 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             }
         }
         static b9(a, b) {
-            let c = (b == a._bd);
+            let c = (b == a._be);
             for (let d = 0; d < b.count; d++) {
                 let e = c == false && d == 0;
                 let f = c && d == 0;
@@ -8782,8 +8801,8 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
         }
         cg(a) {
             let b = this.a7;
-            SpreadsheetMLMain.zf(this, toNullable(Number_$type, intSToU(a._cm.count)));
-            a._cm.q(runOn(this, this.ce));
+            SpreadsheetMLMain.zf(this, toNullable(Number_$type, intSToU(a._cn.count)));
+            a._cn.q(runOn(this, this.ce));
             this.ad.k();
         }
         ch(a, b) {
@@ -8805,18 +8824,18 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             this.ad.k();
         }
         cm(a) {
-            SpreadsheetMLMain.zn(this, toNullable(Number_$type, intSToU(a._cn.count)));
-            a._cn.q(runOn(this, this.cl));
+            SpreadsheetMLMain.zn(this, toNullable(Number_$type, intSToU(a._co.count)));
+            a._co.q(runOn(this, this.cl));
             this.ad.k();
         }
         cn(a) {
-            SpreadsheetMLMain.zo(this, toNullable(Number_$type, intSToU(a._co.count)));
-            a._co.q((b) => this.dr(b, true));
+            SpreadsheetMLMain.zo(this, toNullable(Number_$type, intSToU(a._cp.count)));
+            a._cp.q((b) => this.dr(b, true));
             this.ad.k();
         }
         co(a) {
-            SpreadsheetMLMain.zp(this, toNullable(Number_$type, intSToU(a._cp.count)));
-            a._cp.q((b) => this.dr(b, false));
+            SpreadsheetMLMain.zp(this, toNullable(Number_$type, intSToU(a._cq.count)));
+            a._cq.q((b) => this.dr(b, false));
             this.ad.k();
         }
         cp() {
@@ -8892,8 +8911,8 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             a.ad.k();
         }
         c1(a) {
-            SpreadsheetMLMain.abp(this, toNullable(Number_$type, intSToU(a._cq.count)));
-            a._cq.q(runOn(this, this.cz));
+            SpreadsheetMLMain.abp(this, toNullable(Number_$type, intSToU(a._cr.count)));
+            a._cr.q(runOn(this, this.cz));
             this.ad.k();
         }
         c2(a) {
@@ -8941,12 +8960,12 @@ export let ObjectModelStylesPartManager = /*@__PURE__*/ (() => {
             a.ad.k();
         }
         c9(a) {
-            let b = a._cr.count;
+            let b = a._cs.count;
             if (b == 0) {
                 return;
             }
             SpreadsheetMLMain.aci(this, toNullable(Number_$type, intSToU(b)));
-            a._cr.q((c) => this.c7(c, false));
+            a._cs.q((c) => this.c7(c, false));
             this.ad.k();
         }
         da(a) {
@@ -9097,71 +9116,71 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
     class WorkbookLoadManagerExcel2007 extends WorkbookLoadManager {
         constructor(a, b, c, d, e) {
             super(a, ExcelUtils.eg(b));
-            this._an = new WorkbookSerializationDataExcel2007();
-            this._a8 = null;
-            this._ax = null;
+            this._ao = new WorkbookSerializationDataExcel2007();
+            this._a9 = null;
             this._ay = null;
-            this._aj = null;
+            this._az = null;
             this._ak = null;
-            this._a9 = null;
+            this._al = null;
             this._ba = null;
-            this._az = null;
+            this._bb = null;
             this._a0 = null;
             this._a1 = null;
-            this._a3 = null;
             this._a2 = null;
-            this._au = false;
+            this._a4 = null;
+            this._a3 = null;
             this._av = false;
-            this._a8 = new List$1(ColorInfo.$, 0);
-            this._ax = new Dictionary$2(String_$type, Array_$type, 0);
-            this._ay = new Dictionary$2(Number_$type, UnknownShape.$, 0);
-            this._aj = new WorkbookLoadManagerExcel2007_FontCollection();
+            this._aw = false;
+            this._a9 = new List$1(ColorInfo.$, 0);
+            this._ay = new Dictionary$2(String_$type, Array_$type, 0);
+            this._az = new Dictionary$2(Number_$type, UnknownShape.$, 0);
             this._ak = new WorkbookLoadManagerExcel2007_FontCollection();
-            this._a9 = new List$1(WorkbookLoadManagerExcel2007_NamedReferenceInfo.$, 0);
-            this._ba = ((() => {
+            this._al = new WorkbookLoadManagerExcel2007_FontCollection();
+            this._ba = new List$1(WorkbookLoadManagerExcel2007_NamedReferenceInfo.$, 0);
+            this._bb = ((() => {
                 let $ret = new List$1(WorkbookReferenceBase.$, 0);
                 $ret.add(this._b._bb);
                 return $ret;
             })());
-            this._az = new Dictionary$2(String_$type, List$1.$.specialize(WorksheetShape.$), 0);
-            this._a0 = new Dictionary$2(WorksheetShape.$, EG_Anchor.$, 0);
-            this._a1 = new Dictionary$2(WorksheetShape.$, CT_Transform2D.$, 0);
-            this._a3 = new Dictionary$2(Number_$type, WorkbookStyle.$, 0);
-            this._a2 = new Dictionary$2(String_$type, Sheet.$, 0);
-            this._au = c == null || c.isDuplicateFormulaParsingOptimized;
-            this._an = new WorkbookSerializationDataExcel2007(1, new ObjectModelExcelDocumentManager(0, this, e || c._d, b, d));
+            this._a0 = new Dictionary$2(String_$type, List$1.$.specialize(WorksheetShape.$), 0);
+            this._a1 = new Dictionary$2(WorksheetShape.$, EG_Anchor.$, 0);
+            this._a2 = new Dictionary$2(WorksheetShape.$, CT_Transform2D.$, 0);
+            this._a4 = new Dictionary$2(Number_$type, WorkbookStyle.$, 0);
+            this._a3 = new Dictionary$2(String_$type, Sheet.$, 0);
+            this._av = c == null || c.isDuplicateFormulaParsingOptimized;
+            this._ao = new WorkbookSerializationDataExcel2007(1, new ObjectModelExcelDocumentManager(0, this, e || c._d, b, d));
         }
         static staticInit() {
-            WorkbookStyleCollection._n = WorkbookLoadManagerExcel2007._bq;
-            StandardTableStyleCollection._h = WorkbookLoadManagerExcel2007._af;
-            ExcelUtils.cq = WorkbookLoadManagerExcel2007._bl;
-            Workbook._e1 = WorkbookLoadManagerExcel2007._ah;
-            Workbook._e0 = WorkbookLoadManagerExcel2007._ag;
+            WorkbookStyleCollection._n = WorkbookLoadManagerExcel2007._br;
+            StandardTableStyleCollection._h = WorkbookLoadManagerExcel2007._ag;
+            ExcelUtils.cq = WorkbookLoadManagerExcel2007._bm;
+            Workbook._e1 = WorkbookLoadManagerExcel2007._ai;
+            Workbook._e0 = WorkbookLoadManagerExcel2007._ah;
             WorkbookOptionsBase._e = WorkbookOptionsBase._e || (() => new PackageFactory());
         }
         disposeCore(a) {
             if (a) {
-                this._ai.dispose();
+                this._aj.dispose();
             }
             super.disposeCore(a);
         }
         _r() {
-            if (this._be.count == 0) {
+            if (this._bf.count == 0) {
                 return null;
             }
-            return this._be._inner[0].g;
+            return this._bf._inner[0].g;
         }
         _p() {
             this._i.add(this._b._bb);
-            return WorkItemExtensions.a(this._ai._n(), () => {
-                this._b._n = this._ai._h;
-                this._b._o = this._ai._i;
-                this._b._gx = this._al.d;
-                this._b._gy = this._am.d;
+            return WorkItemExtensions.a(this._aj._n(), () => {
+                this._b._n = this._aj._h;
+                this._b._o = this._aj._i;
+                this._b._gx = this._am.d;
+                this._b._gy = this._an.d;
             });
         }
         _z() {
-            for (let a of fromEnum(this._bh)) {
+            for (let a of fromEnum(this._bi)) {
                 this._y(a.a, a.b);
             }
             for (let b of fromEnum(this._b._namedReferences$i)) {
@@ -9176,38 +9195,38 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
                 f.h();
             }, this._b._namedReferences$i, this._b._sheets$i, true);
         }
-        _bo(a, b) {
-            this._a2.item(b, a);
-        }
         _bp(a, b) {
-            let c = this._at(b);
+            this._a3.item(b, a);
+        }
+        _bq(a, b) {
+            let c = this._au(b);
             c.b(Tuple$2.$.specialize(Sheet.$, WorksheetShape.$), Boolean_$type, WorkbookLoadManagerExcel2007_ShapeAnchorApplicator.a, Tuple.a(Sheet.$, WorksheetShape.$, a, b));
-            this._br(a, b);
+            this._bs(a, b);
             a._p._add3(b);
         }
-        _at(a) {
+        _au(a) {
             let b;
-            let c = this._a0.tryGetValue(a, b);
+            let c = this._a1.tryGetValue(a, b);
             b = c.p1;
             return b;
         }
-        _aq(a) {
+        _ar(a) {
             let b;
-            let c = this._a1.tryGetValue(a, b);
+            let c = this._a2.tryGetValue(a, b);
             b = c.p1;
             return b;
         }
-        _ao(a) {
+        _ap(a) {
             let b;
-            let c = this._a2.tryGetValue(a, b);
+            let c = this._a3.tryGetValue(a, b);
             b = c.p1;
             return b;
         }
-        _ap(a) {
-            let b = this._ao(a);
+        _aq(a) {
+            let b = this._ap(a);
             return b;
         }
-        static _bs(a) {
+        static _bt(a) {
             if (stringIsNullOrEmpty(a) == false && stringStartsWith(a, "=") == false) {
                 a = stringInsert(a, 0, "=");
             }
@@ -9215,13 +9234,13 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
                 p0: a
             };
         }
-        _bu(a, b) {
-            this._a0.item(a, b);
-        }
         _bv(a, b) {
             this._a1.item(a, b);
         }
-        static _aw(a, b, c) {
+        _bw(a, b) {
+            this._a2.item(a, b);
+        }
+        static _ax(a, b, c) {
             c = null;
             let d = a.l("dxfId", b);
             if (nullableEquals(d, null)) {
@@ -9249,7 +9268,7 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        static _bl(a) {
+        static _bm(a) {
             for (let b of fromEnum(a.getRelationships())) {
                 if (b.relationshipType != WorkbookPartManagerBase.a7 && b.relationshipType != WorkbookPartManagerBase.a6) {
                     continue;
@@ -9272,14 +9291,14 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
             }
             return toNullable(WorkbookFormat_$type, null);
         }
-        static _bq(a) {
+        static _br(a) {
             let b = new Workbook(2);
             {
                 let c = new WorkbookLoadManagerExcel2007(b, null, new WorkbookLoadOptions(), toNullable(ST_ConformanceClass_$type, 0), null);
                 try {
-                    c._ai._bh();
-                    WorkItemScheduler.b().d(c._ai._m);
-                    let d = WorkbookLoadManagerExcel2007._ar(c._ai);
+                    c._aj._bh();
+                    WorkItemScheduler.b().d(c._aj._m);
+                    let d = WorkbookLoadManagerExcel2007._as(c._aj);
                     if (d == null) {
                         return;
                     }
@@ -9299,35 +9318,35 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
                 }
             }
         }
-        static _af(a) {
+        static _ag(a) {
             let b = new Workbook(2);
             return Async.p(WorkbookLoadManagerExcel2007.$, Base.$, new WorkbookLoadManagerExcel2007(b, null, new WorkbookLoadOptions(), toNullable(ST_ConformanceClass_$type, 0), null), (c) => {
-                c._av = true;
-                c._ai._bh();
-                WorkItemScheduler.b().d(c._ai._m);
-                let d = WorkbookLoadManagerExcel2007._as(c._ai, a);
+                c._aw = true;
+                c._aj._bh();
+                WorkItemScheduler.b().d(c._aj._m);
+                let d = WorkbookLoadManagerExcel2007._at(c._aj, a);
                 if (d != null) {
                     return d.a();
                 }
                 return null;
             });
         }
-        static _ah(a, b, c, d) {
+        static _ai(a, b, c, d) {
             return Async.n(WorkbookLoadManagerExcel2007.$, new WorkbookLoadManagerExcel2007(a, b, c, toNullable(ST_ConformanceClass_$type, null), d), (e) => e._o());
         }
-        static _ag(a, b, c) {
+        static _ah(a, b, c) {
             if (c == null) {
                 c = new PackageFactory();
             }
             return Async.n(ExcelThemeDocumentManager.$, new ExcelThemeDocumentManager(a, new WorkbookLoadManagerExcel2007_FontCollection(), new WorkbookLoadManagerExcel2007_FontCollection(), c, b, true, toNullable(ST_ConformanceClass_$type, 0)), (d) => d._n());
         }
-        static _bj() {
-            return new MemoryStream(2, Convert.fromBase64String(WorkbookLoadManagerExcel2007._bm));
+        static _bk() {
+            return new MemoryStream(2, Convert.fromBase64String(WorkbookLoadManagerExcel2007._bn));
         }
-        static _ar(a) {
+        static _as(a) {
             let b = new MemoryStream(0);
             {
-                let c = WorkbookLoadManagerExcel2007._bj();
+                let c = WorkbookLoadManagerExcel2007._bk();
                 try {
                     if (c == null) {
                         return null;
@@ -9364,13 +9383,13 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
             b.position = 0;
             return ObjectModelStylesPartManager.a9.e(a, b);
         }
-        static _bk() {
-            return new MemoryStream(2, Convert.fromBase64String(WorkbookLoadManagerExcel2007._bn));
+        static _bl() {
+            return new MemoryStream(2, Convert.fromBase64String(WorkbookLoadManagerExcel2007._bo));
         }
-        static _as(a, b) {
+        static _at(a, b) {
             let c = new MemoryStream(0);
             {
-                let d = WorkbookLoadManagerExcel2007._bk();
+                let d = WorkbookLoadManagerExcel2007._bl();
                 try {
                     if (d == null) {
                         return null;
@@ -9407,72 +9426,72 @@ export let WorkbookLoadManagerExcel2007 = /*@__PURE__*/ (() => {
             c.position = 0;
             return new WorkbookLoadManagerExcel2007_PresetTableStylesPartManager(b).e(a, c);
         }
-        _br(a, b) {
+        _bs(a, b) {
             let c = typeCast(WorksheetShapeGroupBase.$, b);
             if (c == null) {
                 return;
             }
             for (let d of fromEnum(c._shapes$i)) {
-                this._bt(a, d, c);
-                this._br(a, d);
+                this._bu(a, d, c);
+                this._bs(a, d);
             }
             c._d3();
         }
-        _bt(a, b, c) {
-            let d = this._aq(b);
-            let e = this._aq(c);
-            let f = this._ae(d, b._b6, e, c._getBoundsInTwips());
+        _bu(a, b, c) {
+            let d = this._ar(b);
+            let e = this._ar(c);
+            let f = this._af(d, b._b6, e, c._getBoundsInTwips());
             b._setBoundsInTwips(a, f);
         }
-        get _bb() {
-            return this._an.b;
-        }
         get _bc() {
-            return this._an.c;
+            return this._ao.b;
         }
         get _bd() {
-            return this._an.d;
+            return this._ao.c;
         }
         get _be() {
-            return this._an.e;
-        }
-        get _ai() {
-            return this._an.a;
+            return this._ao.d;
         }
         get _bf() {
-            return this._an.f;
+            return this._ao.e;
+        }
+        get _aj() {
+            return this._ao.a;
         }
         get _bg() {
-            return this._a8;
+            return this._ao.f;
         }
-        get _a4() {
-            return this._ax;
+        get _bh() {
+            return this._a9;
         }
         get _a5() {
             return this._ay;
         }
-        get _al() {
-            return this._aj;
+        get _a6() {
+            return this._az;
         }
         get _am() {
             return this._ak;
         }
-        get _bh() {
-            return this._a9;
+        get _an() {
+            return this._al;
         }
         get _bi() {
             return this._ba;
         }
-        get _a6() {
-            return this._az;
+        get _bj() {
+            return this._bb;
         }
         get _a7() {
-            return this._a3;
+            return this._a0;
+        }
+        get _a8() {
+            return this._a4;
         }
     }
     WorkbookLoadManagerExcel2007.$t = /*@__PURE__*/ markType(WorkbookLoadManagerExcel2007, 'WorkbookLoadManagerExcel2007', WorkbookLoadManager.$);
-    WorkbookLoadManagerExcel2007._bm = "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";
-    WorkbookLoadManagerExcel2007._bn = "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";
+    WorkbookLoadManagerExcel2007._bn = "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";
+    WorkbookLoadManagerExcel2007._bo = "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";
     return WorkbookLoadManagerExcel2007;
 })();
 /**
@@ -9494,9 +9513,9 @@ export let WorkbookLoadManagerExcel2007_PresetTableStylesPartManager = /*@__PURE
             }
             let b = this.a7;
             b._b7._g.clear();
-            b._b7._bf.clear();
-            b._b7._h.clear();
             b._b7._bg.clear();
+            b._b7._h.clear();
+            b._b7._bh.clear();
             let c = new WorksheetTableStyle(IOPath.getFileName(a), false);
             c._s = true;
             if (stringStartsWith(c.name, "Table")) {
@@ -9525,40 +9544,40 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
     class WorkbookSaveManagerExcel2007 extends WorkbookSaveManager {
         constructor(a, b, c, d) {
             super(a, ExcelUtils.eg(b), c);
-            this._cd = null;
-            this._cc = new WorkbookSerializationDataExcel2007();
-            this._cf = null;
-            this._cg = null;
-            this._cw = 0;
-            this._cl = null;
-            this._ci = null;
             this._ce = null;
-            this._cj = null;
+            this._cd = new WorkbookSerializationDataExcel2007();
+            this._cg = null;
             this._ch = null;
-            this._cd = new Dictionary$2(WorksheetCellFormatData.$, Number_$type, 0);
-            this._cf = ((() => {
+            this._cx = 0;
+            this._cm = null;
+            this._cj = null;
+            this._cf = null;
+            this._ck = null;
+            this._ci = null;
+            this._ce = new Dictionary$2(WorksheetCellFormatData.$, Number_$type, 0);
+            this._cg = ((() => {
                 let $ret = new Dictionary$2(WorkbookReferenceBase.$, Number_$type, 0);
                 $ret.addItem(a._bb, 0);
                 return $ret;
             })());
-            this._cg = new Dictionary$2(ExcelImage.$, Uri.$, 0);
-            this._cl = new List$1(SerializationNumberFormatInfo.$, 0);
-            this._ci = new Dictionary$2(Base.$, Number_$type, 0);
-            this._cc = new WorkbookSerializationDataExcel2007(1, new ObjectModelExcelDocumentManager(1, this, c._d, b, toNullable(ST_ConformanceClass_$type, d)));
+            this._ch = new Dictionary$2(ExcelImage.$, Uri.$, 0);
+            this._cm = new List$1(SerializationNumberFormatInfo.$, 0);
+            this._cj = new Dictionary$2(Base.$, Number_$type, 0);
+            this._cd = new WorkbookSerializationDataExcel2007(1, new ObjectModelExcelDocumentManager(1, this, c._d, b, toNullable(ST_ConformanceClass_$type, d)));
         }
         static staticInit() {
-            Workbook._e3 = WorkbookSaveManagerExcel2007._b9;
+            Workbook._e3 = WorkbookSaveManagerExcel2007._ca;
             WorkbookOptionsBase._e = WorkbookOptionsBase._e || (() => new PackageFactory());
         }
         disposeCore(a) {
             if (a) {
-                this._cb.dispose();
+                this._cc.dispose();
             }
             super.disposeCore(a);
         }
         _a8(a) {
             let b;
-            let c = this._cd.tryGetValue(a, b);
+            let c = this._ce.tryGetValue(a, b);
             b = c.p1;
             return b;
         }
@@ -9568,10 +9587,10 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
             b = c.p1;
             return b;
         }
-        _bm() {
+        _bn() {
             let a = new Dictionary$2(FillInfo.$, Number_$type, 0);
             let b = new Dictionary$2(BorderInfo.$, Number_$type, 0);
-            this._ct(((() => {
+            this._cu(((() => {
                 let $ret = new FillInfo();
                 $ret.d = ((() => {
                     let $ret = new PatternFillInfo();
@@ -9580,7 +9599,7 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 })());
                 return $ret;
             })()), a);
-            this._ct(((() => {
+            this._cu(((() => {
                 let $ret = new FillInfo();
                 $ret.d = ((() => {
                     let $ret = new PatternFillInfo();
@@ -9589,35 +9608,35 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 })());
                 return $ret;
             })()), a);
-            this._cs(BorderInfo.a(this, new WorksheetCellFormatData(null, 1)), b);
+            this._ct(BorderInfo.a(this, new WorksheetCellFormatData(null, 1)), b);
             let c = this._b._styles$i.normalStyle;
-            this._cz(c, a, b);
-            this._cn.add(new StyleInfo(1, this, c));
+            this._c0(c, a, b);
+            this._co.add(new StyleInfo(1, this, c));
             for (let d of fromEnum(this._b._styles$i)) {
                 if (d == c || d._p == false) {
                     continue;
                 }
-                this._cz(d, a, b);
-                this._cn.add(new StyleInfo(1, this, d));
+                this._c0(d, a, b);
+                this._co.add(new StyleInfo(1, this, d));
             }
             for (let e of fromEnum(this._b._styles$i._u())) {
                 if (e == c) {
                     continue;
                 }
-                this._cz(e, a, b);
-                this._cn.add(new StyleInfo(1, this, e));
+                this._c0(e, a, b);
+                this._co.add(new StyleInfo(1, this, e));
             }
             let f = this._b._ca;
-            this._cy(f._p, a, b);
+            this._cz(f._p, a, b);
             for (let g of fromEnum(f)) {
                 if (g == f._p) {
                     continue;
                 }
-                this._cy(g, a, b);
+                this._cz(g, a, b);
             }
             if (this._b._ct) {
                 for (let h of fromEnum(this._b._b2.m())) {
-                    this._cl.add(((() => {
+                    this._cm.add(((() => {
                         let $ret = new SerializationNumberFormatInfo();
                         $ret.c = intSToU(h);
                         $ret.b = this._b._b2.ad(h);
@@ -9626,12 +9645,12 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 }
             }
         }
-        _bt() {
-            super._bt();
+        _bu() {
+            super._bu();
             if (this._b._dz != null) {
                 let a = 1;
                 for (let b of fromEnum(this._b._dz.values)) {
-                    this._ck.addItem(b, a++);
+                    this._cl.addItem(b, a++);
                 }
             }
         }
@@ -9641,8 +9660,8 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
         get _ai() {
             return this.get__ai();
         }
-        _b6(a) {
-            let b = super._b6(a);
+        _b7(a) {
+            let b = super._b7(a);
             a = b.p0;
             let c = typeCast(WorksheetChart.$, a);
             if (c != null) {
@@ -9670,27 +9689,27 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
             };
         }
         _p() {
-            return this._cb._r();
+            return this._cc._r();
         }
-        _bn(a) {
+        _bo(a) {
             let b = ConditionalFormattingSerializer.a(a);
             if (b != null) {
-                if (this._ce == null) {
-                    this._ce = new Dictionary$2(Worksheet.$, ConditionalFormattingSerializer.$, 0);
+                if (this._cf == null) {
+                    this._cf = new Dictionary$2(Worksheet.$, ConditionalFormattingSerializer.$, 0);
                 }
-                this._ce.addItem(a, b);
+                this._cf.addItem(a, b);
                 b.w(this, a._conditionalFormats$i);
             }
         }
-        _bo(a) {
+        _bp(a) {
             if (a._sparklineGroups$i.count > 0) {
-                if (this._cj == null) {
-                    this._cj = new Dictionary$2(Worksheet.$, SparklinesSerializer.$, 0);
+                if (this._ck == null) {
+                    this._ck = new Dictionary$2(Worksheet.$, SparklinesSerializer.$, 0);
                 }
-                this._cj.addItem(a, new SparklinesSerializer(a));
+                this._ck.addItem(a, new SparklinesSerializer(a));
             }
         }
-        static _c0(a, b, c) {
+        static _c1(a, b, c) {
             if (ExcelUtils.ba(a)) {
                 b = 2;
                 c = null;
@@ -9733,10 +9752,10 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 p2: c
             };
         }
-        _cu(a) {
+        _cv(a) {
             let b = null;
-            if (this._ch == null) {
-                this._ch = new Dictionary$2(DisplayUnit_$type, String_$type, 0);
+            if (this._ci == null) {
+                this._ci = new Dictionary$2(DisplayUnit_$type, String_$type, 0);
                 let c = ExcelUtils.eh("LD_Chart_AxisDisplayUnits");
                 let d = stringSplit(c, [","], 1);
                 for (let f = 0; f < d.length; f++) {
@@ -9751,21 +9770,21 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                     if (((() => { let i = EnumUtil.tryParse$1(DisplayUnit_$type, g[0], true, h); h = i.p2; return i.ret; })()) == false) {
                         continue;
                     }
-                    if (((() => { let i = this._ch.tryGetValue(h, b); b = i.p1; return i.ret; })()) == false) {
-                        this._ch.addItem(h, g[1]);
+                    if (((() => { let i = this._ci.tryGetValue(h, b); b = i.p1; return i.ret; })()) == false) {
+                        this._ci.addItem(h, g[1]);
                     }
                 }
             }
-            if (((() => { let i = this._ch.tryGetValue(a, b); b = i.p1; return i.ret; })()) == false) {
+            if (((() => { let i = this._ci.tryGetValue(a, b); b = i.p1; return i.ret; })()) == false) {
                 return null;
             }
             return b;
         }
-        _cv(a) {
+        _cw(a) {
             if (a == null) {
                 return null;
             }
-            let b = new GetFormulaStringInfo(this._ck, true);
+            let b = new GetFormulaStringInfo(this._cl, true);
             let c = XLSXFormulaStringGenerator.bx(a, b);
             let d = c.a2();
             if (d.d == false) {
@@ -9773,15 +9792,15 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
             }
             return d.b;
         }
-        _cx(a, b, c, d) {
+        _cy(a, b, c, d) {
             d = null;
             c = false;
             let e = b._bg;
             let f;
-            if (((() => { let g = this._ci.tryGetValue(e, f); f = g.p1; return g.ret; })()) == false) {
+            if (((() => { let g = this._cj.tryGetValue(e, f); f = g.p1; return g.ret; })()) == false) {
                 c = true;
                 d = a._c2(b);
-                this._ci.item(e, f = this._cw++);
+                this._cj.item(e, f = this._cx++);
             }
             return {
                 ret: f,
@@ -9789,10 +9808,10 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 p3: d
             };
         }
-        _b8(a, b) {
+        _b9(a, b) {
             return Async.d(WorksheetShape.$, a, (c) => {
                 let d = typeCast(WorksheetShapeGroupBase.$, c);
-                return Async.g(d != null, () => this._b8(d._shapes$i, b), () => {
+                return Async.g(d != null, () => this._b9(d._shapes$i, b), () => {
                     let e = typeCast(IWorksheetImage_$type, c);
                     if (e == null) {
                         return null;
@@ -9803,46 +9822,46 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                     }
                     let g = null;
                     let h;
-                    return WorkItemExtensions.a(Async.g(((() => { let i = this._cg.tryGetValue(f, h); h = i.p1; return i.ret; })()), () => {
+                    return WorkItemExtensions.a(Async.g(((() => { let i = this._ch.tryGetValue(f, h); h = i.p1; return i.ret; })()), () => {
                         if (((() => { let i = b.tryGetValue(f, g); g = i.p1; return i.ret; })()) == false) {
-                            g = this._cb._a1(h, this._cb._cd());
+                            g = this._cc._a1(h, this._cc._cd());
                         }
                         return null;
-                    }, () => WorkItemExtensions.e(Tuple$2.$.specialize(Uri.$, String_$type), this._cb._b0(f, e.preferredFormat), (i) => {
+                    }, () => WorkItemExtensions.e(Tuple$2.$.specialize(Uri.$, String_$type), this._cc._b0(f, e.preferredFormat), (i) => {
                         let j = WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), i);
                         h = j.c;
                         g = j.d;
-                        this._cg.addItem(f, h);
+                        this._ch.addItem(f, h);
                     })), () => b.item(f, g));
                 });
             });
         }
-        _cs(a, b) {
+        _ct(a, b) {
             let c;
             if (((() => { let d = b.tryGetValue(a, c); c = d.p1; return d.ret; })())) {
                 return c;
             }
-            c = this._cm.count;
+            c = this._cn.count;
             b.item(a, c);
-            this._cm.add(a);
+            this._cn.add(a);
             return c;
         }
-        _ct(a, b) {
+        _cu(a, b) {
             let c;
             if (((() => { let d = b.tryGetValue(a, c); c = d.p1; return d.ret; })())) {
                 return c;
             }
-            c = this._cq.count;
+            c = this._cr.count;
             b.item(a, c);
-            this._cq.add(a);
+            this._cr.add(a);
             return c;
         }
-        _cy(a, b, c) {
+        _cz(a, b, c) {
             this._bf(a._bp, a);
             let d = ((() => {
                 let $ret = new FormatInfo();
-                $ret.r = toNullable(Number_$type, intSToU(this._ct(FillInfo.a(this, a), b)));
-                $ret.o = toNullable(Number_$type, intSToU(this._cs(BorderInfo.a(this, a), c)));
+                $ret.r = toNullable(Number_$type, intSToU(this._cu(FillInfo.a(this, a), b)));
+                $ret.o = toNullable(Number_$type, intSToU(this._ct(BorderInfo.a(this, a), c)));
                 $ret.i = a.formatOptions;
                 $ret.b = AlignmentInfo.d(a);
                 $ret.t = toNullable(Number_$type, a._bp._r.value);
@@ -9851,31 +9870,31 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 return $ret;
             })());
             if (a._b1 == 1) {
-                this._co.add(d);
+                this._cp.add(d);
             }
             else {
                 if (a.style != null) {
                     d.p = toNullable(Number_$type, this._a9(a.style));
                 }
-                this._cd.addItem(a, this._cp.count);
-                this._cp.add(d);
+                this._ce.addItem(a, this._cq.count);
+                this._cq.add(d);
             }
         }
-        _cz(a, b, c) {
-            this._av.addItem(a, this._co.count);
-            this._cy(a._i, b, c);
+        _c0(a, b, c) {
+            this._av.addItem(a, this._cp.count);
+            this._cz(a._i, b, c);
         }
-        static _b9(a, b, c) {
+        static _ca(a, b, c) {
             if (a._cw && (c == null || !c._i)) {
-                return OleDataSpaces.a(b, a._l, a._f(), (d) => WorkbookSaveManagerExcel2007._ca(a, d, c));
+                return OleDataSpaces.a(b, a._l, a._f(), (d) => WorkbookSaveManagerExcel2007._cb(a, d, c));
             }
             else {
-                return WorkbookSaveManagerExcel2007._ca(a, b, c);
+                return WorkbookSaveManagerExcel2007._cb(a, b, c);
             }
         }
-        static _ca(a, b, c) {
+        static _cb(a, b, c) {
             let d = null;
-            return WorkItemExtensions.c(Async.n(WorkbookSaveManagerExcel2007.$, new WorkbookSaveManagerExcel2007(a, b, c, a.currentFormat == 6 ? 1 : 0), (e) => WorkItemExtensions.a(e._o(), () => d = e._cb._b)), () => {
+            return WorkItemExtensions.c(Async.n(WorkbookSaveManagerExcel2007.$, new WorkbookSaveManagerExcel2007(a, b, c, a.currentFormat == 6 ? 1 : 0), (e) => WorkItemExtensions.a(e._o(), () => d = e._cc._b)), () => {
                 let e = typeCast(Package.$, d);
                 if (e != null) {
                     return e._h;
@@ -9883,29 +9902,29 @@ export let WorkbookSaveManagerExcel2007 = /*@__PURE__*/ (() => {
                 return null;
             });
         }
-        get _cm() {
-            return this._cc.b;
-        }
         get _cn() {
-            return this._cc.c;
+            return this._cd.b;
         }
         get _co() {
-            return this._cc.d;
+            return this._cd.c;
         }
         get _cp() {
-            return this._cc.e;
+            return this._cd.d;
         }
-        get _cb() {
-            return this._cc.a;
+        get _cq() {
+            return this._cd.e;
         }
-        get _ck() {
-            return this._cf;
+        get _cc() {
+            return this._cd.a;
         }
-        get _cq() {
-            return this._cc.f;
+        get _cl() {
+            return this._cg;
         }
         get _cr() {
-            return this._cl;
+            return this._cd.f;
+        }
+        get _cs() {
+            return this._cm;
         }
     }
     WorkbookSaveManagerExcel2007.$t = /*@__PURE__*/ markType(WorkbookSaveManagerExcel2007, 'WorkbookSaveManagerExcel2007', WorkbookSaveManager.$);
@@ -23246,7 +23265,7 @@ export let CT_BubbleSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.o.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -24566,7 +24585,7 @@ export let CT_SurfaceSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.g.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -25057,7 +25076,7 @@ export let CT_PieSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.k.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -25479,7 +25498,7 @@ export let CT_BarSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.q.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -26174,7 +26193,7 @@ export let CT_ScatterSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.m.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -26546,7 +26565,7 @@ export let CT_RadarSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.k.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -27061,10 +27080,10 @@ export let CT_LineSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.o.getChartType(null, this);
             }
-            if (WorksheetChart._gk(a)) {
+            if (WorksheetChart._gm(a)) {
                 return a;
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -27759,7 +27778,7 @@ export let CT_AreaSer = /*@__PURE__*/ (() => {
             if (a == 113) {
                 return this.k.getChartType(null, this);
             }
-            if (WorksheetChart._f5(a)) {
+            if (WorksheetChart._f6(a)) {
                 return WorksheetChart._e5(b);
             }
             return a;
@@ -29474,14 +29493,14 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
                 }
             }
             let j = e != null ? e.toArray() : null;
-            let k = WorkbookLoadManagerExcel2007._bs(f);
+            let k = WorkbookLoadManagerExcel2007._bt(f);
             f = k.p0;
-            let l = stringIsNullOrEmpty(f) ? null : Formula._k(f, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bi);
+            let l = stringIsNullOrEmpty(f) ? null : Formula._k(f, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bj);
             if (d) {
-                return XValues._aa(b, l, j, null, 2);
+                return XValues._ab(b, l, j, null, 2);
             }
             else {
-                return SeriesValues._u(b, l, j);
+                return SeriesValues._x(b, l, j);
             }
         }
         static s(a, b, c) {
@@ -29498,10 +29517,10 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
                 }
             }
             let h = d != null ? d.toArray() : null;
-            let i = WorkbookLoadManagerExcel2007._bs(e);
+            let i = WorkbookLoadManagerExcel2007._bt(e);
             e = i.p0;
-            let j = stringIsNullOrEmpty(e) ? null : Formula._k(e, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bi);
-            return XValues._aa(b, j, h, null, 0);
+            let j = stringIsNullOrEmpty(e) ? null : Formula._k(e, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bj);
+            return XValues._ab(b, j, h, null, 0);
         }
         static q(a, b, c) {
             if (a == null) {
@@ -29530,10 +29549,10 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
                     f[o] = p.d;
                 }
             }
-            let q = WorkbookLoadManagerExcel2007._bs(d);
+            let q = WorkbookLoadManagerExcel2007._bt(d);
             d = q.p0;
-            let r = stringIsNullOrEmpty(d) ? null : Formula._k(d, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bi);
-            return XValues._aa(b, r, e, f, 1);
+            let r = stringIsNullOrEmpty(d) ? null : Formula._k(d, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bj);
+            return XValues._ab(b, r, e, f, 1);
         }
         static r(a, b, c) {
             if (a == null) {
@@ -29541,7 +29560,7 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
             }
             let d = typeCast(IProvideXValuesData_$type, a);
             let e = d.getValues();
-            return XValues._aa(b, null, e, null, 0);
+            return XValues._ab(b, null, e, null, 0);
         }
         static o(a, b, c, d) {
             if (a == null) {
@@ -29550,10 +29569,10 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
             let e = typeCast(IProvideXValuesData_$type, a);
             let f = e.getValues();
             if (d) {
-                return XValues._aa(b, null, f, null, 2);
+                return XValues._ab(b, null, f, null, 2);
             }
             else {
-                return SeriesValues._u(b, null, f);
+                return SeriesValues._x(b, null, f);
             }
         }
         static aq($t, a) {
@@ -29570,9 +29589,9 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
             if (a.a != null) {
                 let d = a.a.e;
                 if (stringIsNullOrEmpty(d) == false) {
-                    let e = WorkbookLoadManagerExcel2007._bs(d);
+                    let e = WorkbookLoadManagerExcel2007._bt(d);
                     d = e.p0;
-                    let f = Formula._k(d, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bi);
+                    let f = Formula._k(d, 1, 0, b.workbook.currentFormat, CultureInfo.invariantCulture, c._bj);
                     return SeriesName._b(b, f, a.e);
                 }
             }
@@ -29588,7 +29607,7 @@ export let DMLChartUtils = /*@__PURE__*/ (() => {
             let d = new CT_SerTx();
             d.a = new CT_StrRef();
             if (a._d != null) {
-                let e = c._cv(a._d);
+                let e = c._cw(a._d);
                 d.a.e = e;
             }
             let f = a._a();
@@ -30534,7 +30553,7 @@ export let DMLChartExtensions = /*@__PURE__*/ (() => {
             if (a == 0 || a == 5) {
                 return a;
             }
-            if (WorksheetChart._f9(b)) {
+            if (WorksheetChart._ga(b)) {
                 switch (b) {
                     case 114: switch (a) {
                         case 7:
@@ -30563,17 +30582,17 @@ export let DMLChartExtensions = /*@__PURE__*/ (() => {
                     }
                 }
             }
-            let c = WorksheetChart._f6(b);
-            let d = WorksheetChart._ge(b);
+            let c = WorksheetChart._f7(b);
+            let d = WorksheetChart._gf(b);
             if (c && d == false) {
                 return 0;
             }
-            if (WorksheetChart._f7(b) || WorksheetChart._gl(b) || WorksheetChart._gf(b)) {
+            if (WorksheetChart._f8(b) || WorksheetChart._gn(b) || WorksheetChart._gh(b)) {
                 return 0;
             }
             let e;
             let f = false;
-            let g = ((() => { let h = WorksheetChart._f8(b, e, f); e = h.p1; f = h.p2; return h.ret; })());
+            let g = ((() => { let h = WorksheetChart._f9(b, e, f); e = h.p1; f = h.p2; return h.ret; })());
             if (g) {
                 switch (a) {
                     case 1:
@@ -30583,7 +30602,7 @@ export let DMLChartExtensions = /*@__PURE__*/ (() => {
                     default: return 0;
                 }
             }
-            if (WorksheetChart._gd(b) || WorksheetChart._gh(b)) {
+            if (WorksheetChart._ge(b) || WorksheetChart._gj(b)) {
                 switch (a) {
                     case 1:
                     case 7:
@@ -35398,7 +35417,7 @@ export let ChartExExtensions = /*@__PURE__*/ (() => {
                     g = new FormattedString(numberToString(a.displayUnitCustom, CultureInfo.currentCulture));
                 }
                 else {
-                    let h = c._cu(a.displayUnit);
+                    let h = c._cv(a.displayUnit);
                     if (h != null) {
                         g = new FormattedString(h);
                     }
@@ -46984,7 +47003,7 @@ export let ChartExDeserializer = /*@__PURE__*/ (() => {
         }
         static hz(a, b) {
             b.clear();
-            for (let c of fromEnum(a._bh)) {
+            for (let c of fromEnum(a._bi)) {
                 let d = null;
                 if (((() => { let e = b.tryGetValue(c.a.name, d); d = e.p1; return e.ret; })())) {
                     continue;
@@ -47062,7 +47081,7 @@ export let ChartExDeserializer = /*@__PURE__*/ (() => {
         }
         static j(a) {
             if (a.xValues != null) {
-                let b = a.xValues._u();
+                let b = a.xValues._x();
                 let c = a.xValues.getValues();
                 for (let d of fromEnum(b.c)) {
                 }
@@ -47086,8 +47105,8 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             if (a == null) {
                 return;
             }
-            a._jy();
-            a._jt();
+            a._j1();
+            a._jw();
             let e = this.bc;
             let f = a.chartArea;
             let g = a.plotArea;
@@ -47114,13 +47133,13 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 $ret.a = CT_Boolean.b(a.chartTitle == null);
                 return $ret;
             })());
-            if (WorksheetChart._f6(a.chartType)) {
+            if (WorksheetChart._f7(a.chartType)) {
                 h.f.u = ChartSerializer.a0(a.depthPercent, a.heightPercent, a.rotationX, a.rotationY, a.perspective, a.rightAngleAxes);
                 h.f.m = ChartSerializer.as(e, a, a.backWall);
                 h.f.q = ChartSerializer.as(e, a, a.sideWall);
                 h.f.o = ChartSerializer.as(e, a, a.floor);
             }
-            else if (WorksheetChart._gl(a.chartType)) {
+            else if (WorksheetChart._gn(a.chartType)) {
                 h.f.u = ChartSerializer.a1();
             }
             h.f.k = ((() => {
@@ -47281,7 +47300,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
         }
         static bg(a, b) {
             let c = new List$1(Axis.$, 0);
-            if (WorksheetChart._f3(a.chartType) == false) {
+            if (WorksheetChart._f4(a.chartType) == false) {
                 return c;
             }
             let d = a._axisCollection$i;
@@ -47290,7 +47309,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let g = d.item(1, 2);
             let h = d.item(2, 2);
             let i = d.item(3);
-            if (WorksheetChart._gy(a.chartType) == false) {
+            if (WorksheetChart._g1(a.chartType) == false) {
                 g = null;
                 h = null;
             }
@@ -47694,7 +47713,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             }
             if (c._legendEntries$i != null) {
                 e.m = new List$1(CT_LegendEntry.$, 0);
-                let h = b._g5();
+                let h = b._g8();
                 for (let i = 0; i < h.count; i++) {
                     let j = h._inner[i];
                     if (j._ak() == false) {
@@ -47897,7 +47916,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                     return $ret;
                 })());
             }
-            let h = a._iy;
+            let h = a._i1;
             if (h.hasValue) {
                 e.a = ((() => {
                     let $ret = new CT_GapAmount();
@@ -47918,7 +47937,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 $ret.b = DMLChartExtensions.ai(a.barShapeResolved);
                 return $ret;
             })());
-            let g = a._iy;
+            let g = a._i1;
             if (g.hasValue) {
                 e.c = ((() => {
                     let $ret = new CT_GapAmount();
@@ -47926,7 +47945,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                     return $ret;
                 })());
             }
-            let h = a._ix;
+            let h = a._i0;
             if (h.hasValue) {
                 e.a = ((() => {
                     let $ret = new CT_GapAmount();
@@ -47964,7 +47983,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let f = e.j;
             ChartSerializer.br(f, d, a, false, c);
             e.k = ChartSerializer.bk(b);
-            if (WorksheetChart._f4(a.chartType)) {
+            if (WorksheetChart._f5(a.chartType)) {
                 e.e = ((() => {
                     let $ret = new CT_Marker_Chart();
                     $ret.j = toNullable(Boolean_$type, true);
@@ -48058,7 +48077,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 $ret.b = g;
                 return $ret;
             })());
-            let h = a._iy;
+            let h = a._i1;
             if (h.hasValue) {
                 e.c = ((() => {
                     let $ret = new CT_GapAmount();
@@ -48157,7 +48176,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
         }
         static ar(a, b, c, d) {
             let e = a.sheet;
-            let f = WorksheetChart._i0(a.chartType);
+            let f = WorksheetChart._i3(a.chartType);
             let g = new CT_StockChart();
             g.i = new List$1(CT_UnsignedInt.$, 0);
             for (let h = 0; h < b.count; h++) {
@@ -48212,7 +48231,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             }
         }
         static b0(a, b, c, d, e = true) {
-            if (e && WorksheetChart._f3(b) == false) {
+            if (e && WorksheetChart._f4(b) == false) {
                 return;
             }
             let f = a.item(1, 1);
@@ -48284,7 +48303,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let e = a.sheet;
             let f = new CT_LineSer();
             let g = f.n;
-            let h = WorksheetChart._f6(a.chartType);
+            let h = WorksheetChart._f7(a.chartType);
             ChartSerializer.bt(g, e, b, d, c, h);
             let i = ChartSerializer.e(a, b);
             f.c = i;
@@ -48292,7 +48311,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             f.k = j;
             f.g = ChartSerializer.w(a, b);
             f.a = CT_Boolean.b(b.smooth);
-            f.i = ChartSerializer.ac(e, b.markerStyle, b._dl, b.markerFill, b.markerBorder, toNullable(ChartType_$type, b.chartType));
+            f.i = ChartSerializer.ac(e, b.markerStyle, b._dm, b.markerFill, b.markerBorder, toNullable(ChartType_$type, b.chartType));
             f.t = ChartSerializer.bj(e, b);
             f.e = ChartSerializer.u(e, b);
             f.p = ChartSerializer.bh(e, b);
@@ -48331,7 +48350,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             f.c = h;
             let i = ChartSerializer.ad(a, b);
             f.g = i;
-            let j = b._dk;
+            let j = b._dl;
             if (j.hasValue) {
                 f.a = ((() => {
                     let $ret = new CT_UnsignedInt();
@@ -48352,7 +48371,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             ChartSerializer.bt(i, g, b, e, d, false, j);
             if (f == false) {
                 let k = c.xValues != null ? typeCast(SeriesValuesBase.$, c.xValues) : typeCast(SeriesValuesBase.$, c.values);
-                if (d > 0 && b.xValues != null && b.xValues._ac == false) {
+                if (d > 0 && b.xValues != null && b.xValues._ad == false) {
                     k = b.xValues;
                 }
                 let l = ChartSerializer.f(a, k);
@@ -48362,7 +48381,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             h.i = m;
             h.p = new List$1(CT_ErrBars.$, 0);
             h.p.add(ChartSerializer.w(a, b));
-            h.a = CT_Boolean.b(b._b6);
+            h.a = CT_Boolean.b(b._b7);
             let n = null;
             let o = b.chartType != 75 && b.chartType != 73;
             if (o) {
@@ -48371,7 +48390,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 if (q == -4142) {
                     q = -4105;
                 }
-                n = ChartSerializer.ac(g, q, b._dl, p, b.markerBorder, toNullable(ChartType_$type, b.chartType));
+                n = ChartSerializer.ac(g, q, b._dm, p, b.markerBorder, toNullable(ChartType_$type, b.chartType));
             }
             else {
                 n = ((() => {
@@ -48408,7 +48427,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let f = new CT_RadarSer();
             let g = f.j;
             ChartSerializer.bt(g, e, b, d, c, a.chartType == 82);
-            f.e = ChartSerializer.ac(e, b.markerStyle, b._dl, b.markerFill, b.markerBorder, toNullable(ChartType_$type, a.chartType));
+            f.e = ChartSerializer.ac(e, b.markerStyle, b._dm, b.markerFill, b.markerBorder, toNullable(ChartType_$type, a.chartType));
             let h = ChartSerializer.e(a, b);
             f.a = h;
             let i = ChartSerializer.ad(a, b);
@@ -48493,7 +48512,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 })());
                 l.a = CT_Boolean.b(d);
                 l.c = CT_Boolean.b(i._au);
-                let m = WorksheetChart._gw(b.chartType);
+                let m = WorksheetChart._gz(b.chartType);
                 l.i = m ? ChartSerializer.ac(a, i._ao, toNullable(Number_$type, i._a9), i._al, i._ae, toNullable(ChartType_$type, null)) : null;
                 ChartSerializerExtensions.a4(l.k, i);
                 g.add(l);
@@ -48547,7 +48566,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let k = f ? c.fill : null;
             let l = f ? typeCast(ChartLineBase.$, c.border) : c.line != null ? typeCast(ChartLineBase.$, c.line) : null;
             let m = c.chart;
-            let n = f ? false : m != null && m._gt == false;
+            let n = f ? false : m != null && m._gv == false;
             if (f == false) {
                 if (l == null) {
                     l = new ChartLine();
@@ -48616,15 +48635,15 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             if (d == null) {
                 return null;
             }
-            let e = d._t();
+            let e = d._w();
             if (e == null || e.length == 0) {
                 return null;
             }
             let f = new CT_AxDataSource();
-            let g = d._ad > 1;
+            let g = d._ae > 1;
             ;
             if (g) {
-                let h = intDivide(e.length, d._ad);
+                let h = intDivide(e.length, d._ae);
                 f.a = new CT_MultiLvlStrRef();
                 f.a.a = ((() => {
                     let $ret = new CT_MultiLvlStrData();
@@ -48632,12 +48651,12 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                     return $ret;
                 })());
                 let i = null;
-                let j = new List$1(List$1.$.specialize(String_$type), 2, d._ad);
-                for (let k = 0; k < d._ad; k++) {
+                let j = new List$1(List$1.$.specialize(String_$type), 2, d._ae);
+                for (let k = 0; k < d._ae; k++) {
                     j.add(new List$1(String_$type, 2, h));
                 }
                 for (let l = 0; l < e.length; l++) {
-                    let m = l % d._ad;
+                    let m = l % d._ae;
                     let n = e[l];
                     let o = n == null ? stringEmpty() : n.toString();
                     j._inner[m].add(o);
@@ -48681,8 +48700,8 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                     })()));
                 }
             }
-            if (d._f != null) {
-                let v = d._f._toString1(c._c);
+            if (d._h != null) {
+                let v = d._h._toString1(c._c);
                 v = SerializationUtils.u(v);
                 if (g) {
                     if (f.a == null) {
@@ -48711,10 +48730,10 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             }
             let f = new CT_AxDataSource();
             let g = typeCast(XValues.$, b);
-            if (g != null && g._ab == 2) {
+            if (g != null && g._ac == 2) {
                 f.c = ChartSerializer.ai(e);
-                if (b._f != null) {
-                    d = b._f._toString1(c._c);
+                if (b._h != null) {
+                    d = b._h._toString1(c._c);
                     d = SerializationUtils.u(d);
                     f.c.e = d;
                 }
@@ -48739,8 +48758,8 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                     return $ret;
                 })()));
             }
-            if (b._f != null) {
-                d = b._f._toString1(c._c);
+            if (b._h != null) {
+                d = b._h._toString1(c._c);
                 d = SerializationUtils.u(d);
                 if (f.e == null) {
                     f.e = new CT_StrRef();
@@ -48760,8 +48779,8 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let e = new CT_NumDataSource();
             let f = b.getValues();
             e.b = ChartSerializer.ai(f);
-            if (b._f != null) {
-                let g = b._f._toString1(d._c);
+            if (b._h != null) {
+                let g = b._h._toString1(d._c);
                 g = SerializationUtils.u(g);
                 if (e.b == null) {
                     e.b = new CT_NumRef();
@@ -49225,7 +49244,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
                 return null;
             }
             let c = b.chart;
-            if (c != null && WorksheetChart._f6(c.chartType)) {
+            if (c != null && WorksheetChart._f7(c.chartType)) {
                 return null;
             }
             let d = new List$1(CT_Trendline.$, 2, b._trendlineCollection$i.count);
@@ -49324,7 +49343,7 @@ export let ChartSerializer = /*@__PURE__*/ (() => {
             let g = null;
             let h = toNullable(MarkerStyle_$type, null);
             if (f.hasValue) {
-                h = WorksheetChart._iz(f.value);
+                h = WorksheetChart._i2(f.value);
             }
             if (b == -4105 && h.hasValue) {
                 b = h.value;
@@ -49771,7 +49790,7 @@ export let ChartExSerializer = /*@__PURE__*/ (() => {
             return c;
         }
         static i(a, b, c) {
-            if (WorksheetChart._f9(b) == false) {
+            if (WorksheetChart._ga(b) == false) {
             }
             let d = new CT_SeriesLayoutProperties();
             switch (a.chartType) {
@@ -49986,10 +50005,10 @@ export let ChartExSerializer = /*@__PURE__*/ (() => {
                 let h = new CT_Data();
                 if (f != null) {
                     let i = null;
-                    if (((() => { let j = b.tryGetValue(f._f, i); i = j.p1; return j.ret; })()) == false) {
+                    if (((() => { let j = b.tryGetValue(f._h, i); i = j.p1; return j.ret; })()) == false) {
                     }
                     else {
-                        let j = f._ae.hasValue && f._ae.value ? 1 : 0;
+                        let j = f._af.hasValue && f._af.value ? 1 : 0;
                         h.b = ((() => {
                             let $ret = new CT_StringDimension();
                             $ret.c = 0;
@@ -50005,11 +50024,11 @@ export let ChartExSerializer = /*@__PURE__*/ (() => {
                 }
                 if (g != null) {
                     let k = null;
-                    if (((() => { let l = b.tryGetValue(g._f, k); k = l.p1; return l.ret; })()) == false) {
+                    if (((() => { let l = b.tryGetValue(g._h, k); k = l.p1; return l.ret; })()) == false) {
                     }
                     else {
                         let l = 0;
-                        if (g._v) {
+                        if (g._y) {
                             h.c = ((() => {
                                 let $ret = new CT_StringDimension();
                                 $ret.c = 1;
@@ -50451,9 +50470,9 @@ export let ComboChartSerializer = /*@__PURE__*/ (() => {
                 case 81: return a;
             }
             let b = false;
-            let c = ((() => { let d = WorksheetChart._gj(a, b); b = d.p1; return d.ret; })());
+            let c = ((() => { let d = WorksheetChart._gl(a, b); b = d.p1; return d.ret; })());
             let d, e;
-            if (((() => { let f = WorksheetChart._f8(a, d, e); d = f.p1; e = f.p2; return f.ret; })())) {
+            if (((() => { let f = WorksheetChart._f9(a, d, e); d = f.p1; e = f.p2; return f.ret; })())) {
                 if (d) {
                     return b ? 53 : c ? 52 : 51;
                 }
@@ -50461,20 +50480,20 @@ export let ComboChartSerializer = /*@__PURE__*/ (() => {
                     return b ? 59 : c ? 58 : 57;
                 }
             }
-            if (WorksheetChart._gd(a)) {
+            if (WorksheetChart._ge(a)) {
                 return b ? 64 : c ? 63 : 4;
             }
-            if (WorksheetChart._f7(a)) {
+            if (WorksheetChart._f8(a)) {
                 return b ? 77 : c ? 76 : 1;
             }
-            if (WorksheetChart._ge(a)) {
+            if (WorksheetChart._gf(a)) {
                 switch (a) {
                     case -4102:
                     case 70: return 5;
                     case 80: return 80;
                 }
             }
-            if (WorksheetChart._gk(a)) {
+            if (WorksheetChart._gm(a)) {
                 return 4;
             }
             switch (a) {
@@ -51387,7 +51406,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
     class WorksheetChartExtensions extends Base {
         static aq(a, b, c, d) {
             let e = c.workbook;
-            a._i8(c);
+            a._jb(c);
             try {
                 let f = b.f;
                 let g = f.a == null || f.a.k == false;
@@ -51532,6 +51551,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                     a.chartArea.border = ak;
                 }
                 a.chartArea.roundedCorners = CT_Boolean.g(b.d);
+                a._gg = b.j != null && !stringIsNullOrEmpty(b.j.e);
                 ai = h.af;
                 aj = ai != null ? ai.a : null;
                 if (ai != null) {
@@ -51614,7 +51634,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                         }
                         break;
                 }
-                let ay = WorksheetChart._gy(a.chartType);
+                let ay = WorksheetChart._g1(a.chartType);
                 if (ay == false) {
                     let az = a._axisCollection$i.item(2, 2);
                     if (az != null) {
@@ -51708,7 +51728,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                             let bo = bn.count > 0 ? bn._inner[0] : null;
                             if (bk.hasValue && bo != null) {
                                 let bp = bd.getChartType(b, bo);
-                                if (WorksheetChart._go(bp)) {
+                                if (WorksheetChart._gq(bp)) {
                                     let bq = a._fr(bp, bk.value);
                                     if (bf != null) {
                                         bq._gapWidth$i = toNullable(Number_$type, bf.c);
@@ -51729,7 +51749,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                 }
             }
             finally {
-                a._ja();
+                a._jd();
             }
         }
         static ap(a, b, c, d) {
@@ -51963,7 +51983,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
             if (g.c == null || g.c.count == 0) {
                 return;
             }
-            a._i8();
+            a._jb();
             try {
                 let i = null;
                 let j = null;
@@ -52061,7 +52081,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                 }
             }
             finally {
-                a._ja();
+                a._jd();
             }
         }
         static aj(a, b, c, d, e, f, g, h, i) {
@@ -52099,7 +52119,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                         }
                     }
                     a.values = new SeriesValues(e, j, null, false);
-                    a.values._v = true;
+                    a.values._y = true;
                 }
             }
             if (c.g != null && c.g.a != null) {
@@ -52810,9 +52830,9 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
             if (d != null) {
                 if (d.a != null) {
                     let k = d.a.e;
-                    let l = WorkbookLoadManagerExcel2007._bs(k);
+                    let l = WorkbookLoadManagerExcel2007._bt(k);
                     k = l.p0;
-                    let m = Formula._k(k, 1, 0, i.currentFormat, CultureInfo.invariantCulture, h._bi);
+                    let m = Formula._k(k, 1, 0, i.currentFormat, CultureInfo.invariantCulture, h._bj);
                     a._b2(g, m);
                 }
                 else {
@@ -52912,7 +52932,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                 k.add(Tuple.a(Number_$type, Axis.$, n.crossAxId, q));
                 e.addItem(n.id, Tuple.a(Axis.$, IAxis_$type, q, n));
             }
-            if (WorksheetChart._gr(a.chartType) == false) {
+            if (WorksheetChart._gt(a.chartType) == false) {
                 let r = a._axisCollection$i.item(2, 1);
                 let s = a._axisCollection$i.item(2, 2);
                 if (r != null && s != null) {
@@ -53171,7 +53191,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
             if (j != null && j.a != null) {
                 let o = new ChartBorder(null);
                 DMLChartExtensions.a4(o, j.a, e);
-                if (WorksheetChart._gd(n, 1)) {
+                if (WorksheetChart._ge(n, 1)) {
                     let p = new ChartLine();
                     p.fill = o.fill;
                     p.widthInPoints = o.widthInPoints;
@@ -53241,7 +53261,7 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
                     b.markerStyle = y.value;
                 }
             }
-            else if (WorksheetChart._f4(a.chartType)) {
+            else if (WorksheetChart._f5(a.chartType)) {
                 b.markerStyle = -4105;
             }
             if (i.b != null) {
@@ -53377,9 +53397,9 @@ export let WorksheetChartExtensions = /*@__PURE__*/ (() => {
             if (f != null && f.h != null) {
                 let ai = f.h.c;
                 if (stringIsNullOrEmpty(ai) == false) {
-                    let aj = WorkbookLoadManagerExcel2007._bs(ai);
+                    let aj = WorkbookLoadManagerExcel2007._bt(ai);
                     ai = aj.p0;
-                    let ak = typeCast(SingleTargetFormula.$, Formula._k(ai, 1, 0, j.currentFormat, CultureInfo.invariantCulture, i._bi));
+                    let ak = typeCast(SingleTargetFormula.$, Formula._k(ai, 1, 0, j.currentFormat, CultureInfo.invariantCulture, i._bj));
                     b.dataLabels._eb(h, ak);
                 }
             }
@@ -53783,8 +53803,8 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
             let f = this.t(a);
             let g = EnumConverter.j(a.operator);
             SpreadsheetMLMain.zq(b, SpreadsheetMLMain.eg, toNullable(ST_CfType_$type, 1), f, a.priority, a.stopIfTrue, toNullable(Boolean_$type, null), toNullable(Boolean_$type, null), toNullable(Boolean_$type, null), toNullable(ST_ConditionalFormattingOperator_$type, g));
-            let h = c._cv(a.operand1);
-            let i = c._cv(a.operand2);
+            let h = c._cw(a.operand1);
+            let i = c._cw(a.operand2);
             ConditionalFormattingSerializer.ae(b, d, h);
             ConditionalFormattingSerializer.ae(b, d, i);
             d.k();
@@ -53803,7 +53823,7 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
             }
             let f = this.t(a);
             SpreadsheetMLMain.zq(b, SpreadsheetMLMain.eg, toNullable(ST_CfType_$type, 0), f, a.priority, a.stopIfTrue);
-            let g = c._cv(a.formula);
+            let g = c._cw(a.formula);
             ConditionalFormattingSerializer.ae(b, d, g);
             d.k();
             return null;
@@ -53895,7 +53915,7 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
         e(a, b, c, d) {
             let e = toNullable(Number_$type, null);
             SpreadsheetMLMain.zq(b, SpreadsheetMLMain.eg, toNullable(ST_CfType_$type, 3), e, a.priority, a.stopIfTrue);
-            let f = c._cv(a.formula);
+            let f = c._cw(a.formula);
             ConditionalFormattingSerializer.ae(b, d, f);
             let g = toNullable(Number_$type, intSToU(a.fillPercentMin));
             let h = toNullable(Number_$type, intSToU(a.fillPercentMax));
@@ -53937,7 +53957,7 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
             }
             let f = toNullable(Number_$type, null);
             SpreadsheetMLMain.zq(b, SpreadsheetMLMain.eg, toNullable(ST_CfType_$type, 4), f, a.priority, a.stopIfTrue);
-            let g = c._cv(a.formula);
+            let g = c._cw(a.formula);
             ConditionalFormattingSerializer.ae(b, d, g);
             let h = ExcelUtils.ak(a.iconSet);
             SpreadsheetMLMain.ab7(b, SpreadsheetMLMain.jt, toNullable(ST_IconSetType_$type, h), toNullable(Boolean_$type, a._cm), toNullable(Boolean_$type, a.isReverseOrder), toNullable(Boolean_$type, a.showValue), toNullable(Boolean_$type, false));
@@ -53965,7 +53985,7 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
             let f = toNullable(Number_$type, null);
             let g = a.worksheet;
             SpreadsheetMLMain.zq(b, SpreadsheetMLMain.eg, toNullable(ST_CfType_$type, 2), f, a.priority, a.stopIfTrue);
-            let h = c._cv(a.formula);
+            let h = c._cw(a.formula);
             ConditionalFormattingSerializer.ae(b, d, h);
             SpreadsheetMLMain.z1(b);
             ConditionValueExtensions.b(a.minimumThreshold._b, b, c, d, g, false);
@@ -54104,7 +54124,7 @@ export let ConditionalFormattingSerializer = /*@__PURE__*/ (() => {
             return numberToString(a, CultureInfo.invariantCulture);
         }
         static ab(a, b, c, d) {
-            let e = b._cv(d);
+            let e = b._cw(d);
             ConditionalFormattingSerializer.ad(a, c, e);
         }
         static ac(a, b, c) {
@@ -55080,7 +55100,7 @@ export let SparklinesSerializer = /*@__PURE__*/ (() => {
                     ColorInfoExtensions.d(g.colorLowPoint, a, c, this.a, SpreadsheetML2009Main.a4);
                 }
                 if (g.dateRangeFormula != null) {
-                    let y = b._cv(g.dateRangeFormula);
+                    let y = b._cw(g.dateRangeFormula);
                     Excel2006Main.av(a, y);
                     c.k();
                 }
@@ -55156,8 +55176,8 @@ export let ObjectModelChartExPartManager = /*@__PURE__*/ (() => {
             if (b == null) {
                 return null;
             }
-            let c = b._gu;
-            let d = b._gv;
+            let c = b._gw;
+            let d = b._gx;
             let e = b._fx;
             if (e == null) {
                 if (c) {
@@ -55252,7 +55272,7 @@ export let ObjectModelChartsheetPartManager = /*@__PURE__*/ (() => {
         t() {
             let a = this.a9;
             let b = a._d.uri.toString();
-            this.a8 = a._b7._ao(b);
+            this.a8 = a._b7._ap(b);
             if (this.a8 == null) {
                 return null;
             }
@@ -55360,9 +55380,9 @@ export let ObjectModelChartsheetPartManager = /*@__PURE__*/ (() => {
             let d = c._b7;
             let e = PackageUtilities.ak(c._g(a)).originalString;
             let f;
-            if (((() => { let g = d._a6.tryGetValue(e, f); f = g.p1; return g.ret; })())) {
+            if (((() => { let g = d._a7.tryGetValue(e, f); f = g.p1; return g.ret; })())) {
                 for (let g of fromEnum(f)) {
-                    d._bp(this.a8, g);
+                    d._bq(this.a8, g);
                 }
             }
             else {
@@ -55511,7 +55531,7 @@ export let ObjectModelChartsheetPartManager = /*@__PURE__*/ (() => {
             if (b == null) {
                 return;
             }
-            SpreadsheetMLMain.aai(this, ST_Guid.a(a._t), intSToU(b.magnification), XlsxUtilities.a3(b.visibility), b.sizeWithWindow);
+            SpreadsheetMLMain.aai(this, ST_Guid.a(a._v), intSToU(b.magnification), XlsxUtilities.a3(b.visibility), b.sizeWithWindow);
             if (a.savePrintOptions) {
                 let c = a.getSheetPrintOptions(this.a8, false);
                 if (c != null) {
@@ -55749,7 +55769,7 @@ export let ObjectModelChartPartManager = /*@__PURE__*/ (() => {
             if (b == null) {
                 return null;
             }
-            let c = b._gu;
+            let c = b._gw;
             let d = b._fx;
             if (d == null) {
                 if (c) {
@@ -56193,7 +56213,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
             this.br = new List$1(WorksheetShape.$, 0);
             let a = this.be;
             let b = a._b7;
-            b._a6.addItem(a._d.uri.toString(), this.br);
+            b._a7.addItem(a._d.uri.toString(), this.br);
             return super.t();
         }
         ax(a, b) {
@@ -56224,7 +56244,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
             let c = this.be._b9;
             this.bz(c, b);
             let d = new Dictionary$2(ExcelImage.$, String_$type, 0);
-            return WorkItemExtensions.c(c._b8(b._p, d), () => {
+            return WorkItemExtensions.c(c._b9(b._p, d), () => {
                 this.s.k(d);
                 let e = b._p;
                 let f = new List$1(WorksheetShape.$, 2, e.count);
@@ -56315,7 +56335,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
                 }
             }
             let b = this.be;
-            if (WorksheetChart._f9(a.chartType)) {
+            if (WorksheetChart._ga(a.chartType)) {
                 return WorkItemExtensions.k(Tuple$2.$.specialize(Uri.$, String_$type), IGraphicalObjectContent_$type, b._j(ObjectModelChartExPartManager.ba, a), (c) => {
                     let d = WorkItemExtensions.m(Tuple$2.$.specialize(Uri.$, String_$type), c);
                     let e = d.c;
@@ -56920,7 +56940,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
             })());
             this.bi = b._accept$2$i(ObjectModelDrawingPartManager_ShapeLoadContext.$, WorksheetShape.$, this.bh, e);
             if (this.bi != null) {
-                this.be._b7._bu(this.bi, d);
+                this.be._b7._bv(this.bi, d);
             }
             else if (this.ab.s) {
                 this.ab.aj();
@@ -56935,7 +56955,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
             let d = null;
             if (b._an.f != 0) {
                 let e = b._an.d();
-                d = b._b7._ao(e.uri.toString());
+                d = b._b7._ap(e.uri.toString());
             }
             if (d == null) {
                 return;
@@ -57026,7 +57046,7 @@ export let ObjectModelDrawingPartManager = /*@__PURE__*/ (() => {
             this.cd(b);
             this.ch(b);
             let c = typeCast(WorksheetChart.$, b);
-            let d = c != null && WorksheetChart._f9(c.chartType);
+            let d = c != null && WorksheetChart._ga(c.chartType);
             if (d) {
                 let e = ChartExUtils.c(c.chartType);
                 this.cj(e);
@@ -57432,7 +57452,7 @@ export let ObjectModelDrawingPartManager_ShapeLoader = /*@__PURE__*/ (() => {
             a._b6 = b.d().n();
             a.flippedHorizontally = b.g();
             a.flippedVertically = b.h();
-            this.d._bv(a, b);
+            this.d._bw(a, b);
         }
         l(a, b) {
             if (b == null) {
@@ -57441,7 +57461,7 @@ export let ObjectModelDrawingPartManager_ShapeLoader = /*@__PURE__*/ (() => {
             a._b6 = b.d().n();
             a.flippedHorizontally = b.g();
             a.flippedVertically = b.h();
-            this.d._bv(a, b);
+            this.d._bw(a, b);
         }
         a(a, b) {
             if (a == null || a.d.count == 0) {
@@ -57628,7 +57648,7 @@ export let ObjectModelDrawingPartManager_ShapeLoader_ShapeFillCreator = /*@__PUR
         _visitCT_BlipFillProperties$i(a, b) {
             if (a.d != null) {
                 if (a.d.d != null) {
-                    let c = typeCast(ImageData.$, this.a.d._ai._au(a.d.d));
+                    let c = typeCast(ImageData.$, this.a.d._aj._au(a.d.d));
                     if (c != null) {
                         return new ShapeFillImage(c);
                     }
@@ -58259,7 +58279,7 @@ export let ObjectModelExternalLinkPartManager = /*@__PURE__*/ (() => {
                         for (let r of fromEnum(q.e)) {
                             let s;
                             let t;
-                            let u = WorkbookSaveManagerExcel2007._c0(r.value, s, t);
+                            let u = WorkbookSaveManagerExcel2007._c1(r.value, s, t);
                             s = u.p1;
                             t = u.p2;
                             SpreadsheetMLMain.zl(this, CellAddress.u(q.g, r.key, d.currentFormat), s);
@@ -58361,7 +58381,7 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
                 else {
                     return null;
                 }
-            })), () => b._j(ObjectModelStylesPartManager.a9)), () => b._j(ObjectModelThemePartManager.bc)), () => Async.g(c._a3 != 0, () => b._j(ObjectModelSharedStringsPartManager.a9))), () => Async.d(WorkbookReferenceBase.$, c._ck.keys, (e) => {
+            })), () => b._j(ObjectModelStylesPartManager.a9)), () => b._j(ObjectModelThemePartManager.bc)), () => Async.g(c._a3 != 0, () => b._j(ObjectModelSharedStringsPartManager.a9))), () => Async.d(WorkbookReferenceBase.$, c._cl.keys, (e) => {
                 if (typeCast(CurrentWorkbookReference.$, e) !== null) {
                     return null;
                 }
@@ -58489,13 +58509,13 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
             let ab = b._item(ST_Guid.e(d));
             if (ab == null) {
                 ab = new CustomView(b._e, true, true);
-                ab._t = ST_Guid.e(d);
+                ab._v = ST_Guid.e(d);
                 b._add1(ab);
             }
             let ac = ab.windowOptions;
             ab.name = c;
-            ab._ab(m);
-            ab._aa(n);
+            ab._ad(m);
+            ab._ac(n);
             ac.maximized = o;
             ac.scrollBars = 0;
             if (q) {
@@ -58530,7 +58550,7 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
             b = c.p1;
             let d = ObjectModelWorkbookPartManagerBase.bg(a);
             let e = typeCast(WorkbookReferenceBase.$, d._au(b));
-            d._b7._bi.add(e);
+            d._b7._bj.add(e);
         }
         static bo(a) {
         }
@@ -58599,7 +58619,7 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
             }
             j._e.visibility = XlsxUtilities.af(e);
             let k = PackageUtilities.ak(h).originalString;
-            ObjectModelWorkbookPartManagerBase.bg(a)._b7._bo(j, k);
+            ObjectModelWorkbookPartManagerBase.bg(a)._b7._bp(j, k);
         }
         static bv(a) {
         }
@@ -58777,7 +58797,7 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
         b2(a) {
             let b = a.windowOptions;
             let c = b._boundsInPixels$i;
-            SpreadsheetMLMain.aan(this, a.name, ST_Guid.a(a._t), b.selectedSheet == null ? 0 : b.selectedSheet._am, truncate(c.width), truncate(c.height), void 0, toNullable(Number_$type, null), void 0, void 0, void 0, a.savePrintOptions, a.saveHiddenRowsAndColumns, b.maximized, void 0, EnumUtil.enumHasFlag(b.scrollBars, 1), EnumUtil.enumHasFlag(b.scrollBars, 2), b.tabBarVisible, truncate(c.x), truncate(c.y), intSToU(b.tabBarWidth), b.showFormulaBar, b.showStatusBar, void 0, XlsxUtilities.aw(b.objectDisplayStyle));
+            SpreadsheetMLMain.aan(this, a.name, ST_Guid.a(a._v), b.selectedSheet == null ? 0 : b.selectedSheet._am, truncate(c.width), truncate(c.height), void 0, toNullable(Number_$type, null), void 0, void 0, void 0, a.savePrintOptions, a.saveHiddenRowsAndColumns, b.maximized, void 0, EnumUtil.enumHasFlag(b.scrollBars, 1), EnumUtil.enumHasFlag(b.scrollBars, 2), b.tabBarVisible, truncate(c.x), truncate(c.y), intSToU(b.tabBarWidth), b.showFormulaBar, b.showStatusBar, void 0, XlsxUtilities.aw(b.objectDisplayStyle));
             this.ad.k();
         }
         ba(a) {
@@ -58846,7 +58866,7 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
             let b = a._b;
             let c = b.windowOptions;
             let d = c._boundsInTwips$i;
-            SpreadsheetMLMain.aem(this, a._cb._z);
+            SpreadsheetMLMain.aem(this, a._cc._z);
             SpreadsheetMLMain.abn(this, "xl", "5", "5", "9303");
             this.ad.k();
             this.b3(b);
@@ -58862,8 +58882,8 @@ export let ObjectModelWorkbookPartManagerBase = /*@__PURE__*/ (() => {
             SpreadsheetMLMain.adp(this);
             ExcelUtils.fq(Sheet.$, a._a1, runOn(this, this.b6));
             this.ad.k();
-            let g = ObjectModelExternalLinkPartManager.a9.o(a._cb._z);
-            let h = new List$1(IPackageRelationship_$type, 1, Enumerable.u(IPackageRelationship_$type, a._cb._d.getRelationships(), (i) => i.relationshipType == g));
+            let g = ObjectModelExternalLinkPartManager.a9.o(a._cc._z);
+            let h = new List$1(IPackageRelationship_$type, 1, Enumerable.u(IPackageRelationship_$type, a._cc._d.getRelationships(), (i) => i.relationshipType == g));
             if (h.count != 0) {
                 SpreadsheetMLMain.abg(this);
                 for (let i of fromEnum(h)) {
@@ -59088,7 +59108,7 @@ export let ObjectModelPivotTablePartManager = /*@__PURE__*/ (() => {
                 return null;
             }
             let c = a._an.d().uri.toString();
-            return b._ao(c);
+            return b._ap(c);
         }
         bc(a) {
             let b = this.a8;
@@ -59102,7 +59122,7 @@ export let ObjectModelPivotTablePartManager = /*@__PURE__*/ (() => {
             }
             for (let e of fromEnum(d.f(SpreadsheetMLMain.ik, b))) {
                 let f;
-                if (((() => { let g = WorkbookLoadManagerExcel2007._aw(e, b, f); f = g.p2; return g.ret; })())) {
+                if (((() => { let g = WorkbookLoadManagerExcel2007._ax(e, b, f); f = g.p2; return g.ret; })())) {
                     e.n = f;
                 }
                 else {
@@ -59629,7 +59649,7 @@ export let ObjectModelVmlDrawingPartManager = /*@__PURE__*/ (() => {
         a() {
             let a = this.a9;
             let b = DocCoreUtils.c(this.l);
-            a._b7._a4.addItem(a._d.uri.toString(), b);
+            a._b7._a5.addItem(a._d.uri.toString(), b);
             try {
                 if (this.l.canSeek) {
                     this.l.position = 0;
@@ -59854,9 +59874,9 @@ export let ObjectModelVmlDrawingPartManager = /*@__PURE__*/ (() => {
                 let e = ObjectModelVmlDrawingPartManager.ba(a);
                 let f = e._by;
                 let g = FormulaParser.l(f, a.s.a(Worksheet.$), null, -1, CultureInfo.invariantCulture, 1, 3);
-                let h = WorkbookLoadManagerExcel2007._bs(c);
+                let h = WorkbookLoadManagerExcel2007._bt(c);
                 c = h.p0;
-                b.fmlaMacro = Formula._o(c, 3, g, e._b7._bi);
+                b.fmlaMacro = Formula._o(c, 3, g, e._b7._bj);
             }
             catch (i) {
             }
@@ -60715,7 +60735,7 @@ export let ObjectModelVmlDrawingPartManager = /*@__PURE__*/ (() => {
             if (b.fmlaMacro == null) {
                 return;
             }
-            ExcelNamespace.ej(this, a._cv(b.fmlaMacro));
+            ExcelNamespace.ej(this, a._cw(b.fmlaMacro));
             this.ad.k();
         }
         cz(a) {