igniteui-webcomponents-excel 4.3.2 → 4.3.3-beta.0

package/esm5/lib/DefaultStyleHelper_combined.js

@@ -17173,7 +17173,13 @@ var CellShiftOperation = /** @class */ /*@__PURE__*/ (function (_super) {
                     c._bc(a)._setFormatting1(c._cellFormatInternal, j);
                 }
                 else {
-                    c._bc(a)._ar(j);
+                    var k = this.h._cb(a).b;
+                    if (k != null) {
+                        c._bc(a)._setFormatting1(k, j);
+                    }
+                    else {
+                        c._bc(a)._ar(j);
+                    }
                 }
                 return;
             }
@@ -17182,16 +17188,16 @@ var CellShiftOperation = /** @class */ /*@__PURE__*/ (function (_super) {
             }
         }
         else if (f != null) {
-            var k = i != null ? i.d._bu() : g;
-            var l = void 0;
-            var m_3;
-            if (((function () { var n = f.tryGetValue(a, m_3); m_3 = n.p1; return n.ret; })())) {
-                l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, m_3.c, m_3.d, k);
+            var l = i != null ? i.d._bu() : g;
+            var m = void 0;
+            var n_3;
+            if (((function () { var o = f.tryGetValue(a, n_3); n_3 = o.p1; return o.ret; })())) {
+                m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, n_3.c, n_3.d, l);
             }
             else {
-                l = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, k);
+                m = Tuple.b(Base.$, Boolean_$type, IWorksheetCellFormat_$type, null, false, l);
             }
-            f.item(a, l);
+            f.item(a, m);
         }
         else {
             return;
@@ -17585,26 +17591,26 @@ var CellShiftOperation = /** @class */ /*@__PURE__*/ (function (_super) {
                     case 2:
                         {
                             var l_2 = a._ac;
-                            var m_4 = a._ae;
-                            var n_3 = a._w;
+                            var m_3 = a._ae;
+                            var n_4 = a._w;
                             var o_4 = a._x;
-                            var p = ((function () { var q = _this.d(l_2, n_3); l_2 = q.p0; n_3 = q.p1; return q.ret; })());
-                            var q = ((function () { var r = _this.d(m_4, o_4); m_4 = r.p0; o_4 = r.p1; return r.ret; })());
+                            var p = ((function () { var q = _this.d(l_2, n_4); l_2 = q.p0; n_4 = q.p1; return q.ret; })());
+                            var q = ((function () { var r = _this.d(m_3, o_4); m_3 = r.p0; o_4 = r.p1; return r.ret; })());
                             if (p.f || q.f) {
                                 if (p.f && q.f) {
-                                    if (m_4 < l_2) {
+                                    if (m_3 < l_2) {
                                         if (c) {
                                             if (d == null) {
                                                 d = new List$1(WorksheetRegionAddress.$, 0);
                                             }
-                                            var r = this.v <= 0 ? new WorksheetRegionAddress(1, l_2, this.j._ae, n_3, o_4) : new WorksheetRegionAddress(1, this.j._ac, m_4, n_3, o_4);
+                                            var r = this.v <= 0 ? new WorksheetRegionAddress(1, l_2, this.j._ae, n_4, o_4) : new WorksheetRegionAddress(1, this.j._ac, m_3, n_4, o_4);
                                             d.add(r);
                                         }
                                         if (this.v <= 0) {
                                             l_2 = this.j._ac;
                                         }
                                         else {
-                                            m_4 = this.j._ae;
+                                            m_3 = this.j._ae;
                                         }
                                     }
                                 }
@@ -17612,12 +17618,12 @@ var CellShiftOperation = /** @class */ /*@__PURE__*/ (function (_super) {
                                     var s = new WorksheetRegionAddress();
                                     var t_2 = new WorksheetRegionAddress();
                                     if (p.f == false) {
-                                        s = new WorksheetRegionAddress(1, l_2, this.j._ac, n_3, o_4);
-                                        t_2 = new WorksheetRegionAddress(1, this.j._ac, m_4, n_3, o_4);
+                                        s = new WorksheetRegionAddress(1, l_2, this.j._ac, n_4, o_4);
+                                        t_2 = new WorksheetRegionAddress(1, this.j._ac, m_3, n_4, o_4);
                                     }
                                     else {
-                                        s = new WorksheetRegionAddress(1, this.j._ae, m_4, n_3, o_4);
-                                        t_2 = new WorksheetRegionAddress(1, l_2, this.j._ae, n_3, o_4);
+                                        s = new WorksheetRegionAddress(1, this.j._ae, m_3, n_4, o_4);
+                                        t_2 = new WorksheetRegionAddress(1, l_2, this.j._ae, n_4, o_4);
                                     }
                                     var u = ((function () { var v = _this.f(t_2, b, c, d); t_2 = v.p0; d = v.p3; return v.ret; })());
                                     a = s;
@@ -17633,7 +17639,7 @@ var CellShiftOperation = /** @class */ /*@__PURE__*/ (function (_super) {
                                         p3: d
                                     };
                                 }
-                                a = new WorksheetRegionAddress(1, l_2, m_4, n_3, o_4);
+                                a = new WorksheetRegionAddress(1, l_2, m_3, n_4, o_4);
                                 return {
                                     ret: ShiftAddressResult.c,
                                     p0: a,
@@ -24896,10 +24902,10 @@ var Formula = /** @class */ /*@__PURE__*/ (function (_super) {
         if (e && this._d.length != 0) {
             var l = FormulaStringGenerator.bj(j);
             var m = l.a2();
-            var n_4 = m.b;
+            var n_5 = m.b;
             var o_5;
             var p_3;
-            if (((function () { var q = Formula._a4(n_4, d, c, j.o, p_3, o_5); p_3 = q.p4; o_5 = q.p5; return q.ret; })()) == false) {
+            if (((function () { var q = Formula._a4(n_5, d, c, j.o, p_3, o_5); p_3 = q.p4; o_5 = q.p5; return q.ret; })()) == false) {
                 b.g(ExcelUtils.eh("LE_InvalidOperationException_InvalidForWorkbookFormat"));
             }
         }
@@ -38535,7 +38541,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 var c = _3.value;
                 if (c.b._ca(b) == false) {
                     try {
-                        for (var _4 = (e_100 = void 0, __values(fromEnum(this._ch(c.q, c.r, true)))), _5 = _4.next(); !_5.done; _5 = _4.next()) {
+                        for (var _4 = (e_100 = void 0, __values(fromEnum(this._ch(c.r, c.s, true)))), _5 = _4.next(); !_5.done; _5 = _4.next()) {
                             var d = _5.value;
                             this._bc(d.r);
                         }
@@ -38749,7 +38755,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 for (var _1 = __values(fromEnum(a._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                     var b = _2.value;
                     if (b.b._cd == false) {
-                        for (var c = b.q; c <= b.r; c++) {
+                        for (var c = b.r; c <= b.s; c++) {
                             this._bc(c);
                         }
                     }
@@ -38921,7 +38927,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                     if ((z.b.formatOptions & y) == 0) {
                         continue;
                     }
-                    for (var aa = z.q; aa <= z.r; aa++) {
+                    for (var aa = z.r; aa <= z.s; aa++) {
                         this._bc(aa);
                     }
                 }
@@ -39939,48 +39945,52 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 p = this._a8(h.value);
             }
             for (var q = a; q <= b; q++) {
-                var r = this._bc(q);
-                r._ar(i);
+                var r = j != null || d != null;
+                var s = this._bc(q, r);
+                if (s == null) {
+                    continue;
+                }
+                s._ar(i);
                 if (j != null) {
-                    r._setFormatting1(j, i);
+                    s._setFormatting1(j, i);
                     if (nullableNotEquals(h, null)) {
-                        r._a3(r.formatOptions & ~8, true, -97);
+                        s._a3(s.formatOptions & ~8, true, -97);
                         if (p != null) {
                             if (WorkbookColorInfo.l_op_Inequality(p.topBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.topBorderColorInfo, j.topBorderColorInfo) && p.topBorderStyle == j.topBorderStyle) {
-                                r._bi(p.topBorderColorInfo, true, -97);
-                                r._bj(p.topBorderStyle, true, -97);
+                                s._bi(p.topBorderColorInfo, true, -97);
+                                s._bj(p.topBorderStyle, true, -97);
                             }
                             if (WorkbookColorInfo.l_op_Inequality(p.bottomBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.bottomBorderColorInfo, j.bottomBorderColorInfo) && p.bottomBorderStyle == j.bottomBorderStyle) {
-                                r._av(p.bottomBorderColorInfo, true, -97);
-                                r._aw(p.bottomBorderStyle, true, -97);
+                                s._av(p.bottomBorderColorInfo, true, -97);
+                                s._aw(p.bottomBorderStyle, true, -97);
                             }
                             if (!c) {
                                 if (WorkbookColorInfo.l_op_Inequality(p.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.leftBorderColorInfo, j.leftBorderColorInfo) && p.leftBorderStyle == j.leftBorderStyle) {
-                                    r._a9(p.leftBorderColorInfo, true, -97);
-                                    r._ba(p.leftBorderStyle, true, -97);
+                                    s._a9(p.leftBorderColorInfo, true, -97);
+                                    s._ba(p.leftBorderStyle, true, -97);
                                 }
                                 if (WorkbookColorInfo.l_op_Inequality(p.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(p.rightBorderColorInfo, j.rightBorderColorInfo) && p.rightBorderStyle == j.rightBorderStyle) {
-                                    r._bd(p.rightBorderColorInfo, true, -97);
-                                    r._be(p.rightBorderStyle, true, -97);
+                                    s._bd(p.rightBorderColorInfo, true, -97);
+                                    s._be(p.rightBorderStyle, true, -97);
                                 }
                             }
                         }
                     }
                 }
                 else if (d != null) {
-                    var s = d._bc(q);
-                    r.setFormatting(s);
+                    var t = d._bc(q);
+                    s.setFormatting(t);
                     if (l != null) {
-                        r._a3(r.formatOptions & ~8, true, -97);
-                        var t = l._a8(q);
-                        if (t != null) {
-                            if (WorkbookColorInfo.l_op_Inequality(t.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.leftBorderColorInfo, s.leftBorderColorInfo) && t.leftBorderStyle == s.leftBorderStyle) {
-                                r._a9(t.leftBorderColorInfo, true, -97);
-                                r._ba(t.leftBorderStyle, true, -97);
+                        s._a3(s.formatOptions & ~8, true, -97);
+                        var u = l._a8(q);
+                        if (u != null) {
+                            if (WorkbookColorInfo.l_op_Inequality(u.leftBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.leftBorderColorInfo, t.leftBorderColorInfo) && u.leftBorderStyle == t.leftBorderStyle) {
+                                s._a9(u.leftBorderColorInfo, true, -97);
+                                s._ba(u.leftBorderStyle, true, -97);
                             }
-                            if (WorkbookColorInfo.l_op_Inequality(t.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(t.rightBorderColorInfo, s.rightBorderColorInfo) && t.rightBorderStyle == s.rightBorderStyle) {
-                                r._bd(t.rightBorderColorInfo, true, -97);
-                                r._be(t.rightBorderStyle, true, -97);
+                            if (WorkbookColorInfo.l_op_Inequality(u.rightBorderColorInfo, null) && WorkbookColorInfo.l_op_Equality(u.rightBorderColorInfo, t.rightBorderColorInfo) && u.rightBorderStyle == t.rightBorderStyle) {
+                                s._bd(u.rightBorderColorInfo, true, -97);
+                                s._be(u.rightBorderStyle, true, -97);
                             }
                         }
                     }
@@ -40233,37 +40243,46 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
     /**
      * @hidden
      */
-    WorksheetRow.prototype._bc = function (a) {
-        var b = this._aj(a);
-        return this._bb(b, a);
+    WorksheetRow.prototype._bc = function (a, b) {
+        if (b === void 0) {
+            b = true;
+        }
+        var c = this._aj(a);
+        return this._bb(c, a, b);
     };
     /**
      * @hidden
      */
-    WorksheetRow.prototype._bb = function (a, b) {
-        var c = b % 32;
-        var d = a[c];
-        var e;
-        if (d == null) {
-            var f = this.worksheet.workbook;
-            var g = f == null ? null : f._ca;
-            if (g == null) {
-                d = new WorksheetCellFormatData(null, 0);
+    WorksheetRow.prototype._bb = function (a, b, c) {
+        if (c === void 0) {
+            c = true;
+        }
+        var d = b % 32;
+        var e = a[d];
+        var f;
+        if (e == null) {
+            if (!c) {
+                return null;
+            }
+            var g = this.worksheet.workbook;
+            var h = g == null ? null : g._ca;
+            if (h == null) {
+                e = new WorksheetCellFormatData(null, 0);
             }
             else {
-                d = f._ca._p._bu();
+                e = g._ca._p._bu();
             }
-            this._dk(b, d);
-            e = new WorksheetCellOwnedFormatProxy(d, g, this, b, a);
-            a[c] = e._bt;
+            this._dk(b, e);
+            f = new WorksheetCellOwnedFormatProxy(e, h, this, b, a);
+            a[d] = f._bt;
             if (this._a3 != null) {
                 this._a3._aj();
             }
         }
         else {
-            e = this._be(b, d, a, false);
+            f = this._be(b, e, a, false);
         }
-        return e;
+        return f;
     };
     /**
      * @hidden
@@ -40353,7 +40372,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
      * @hidden
      */
     WorksheetRow.prototype.__ch = function (a, b, c) {
-        var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s;
+        var d, e, f, g, h, i, j, k, l, m, n, o, p, q, r, s, t, u;
         if (a === void 0) {
             a = 0;
         }
@@ -40378,85 +40397,98 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                         }
                         g = h._ca._p;
                     }
-                    i = g;
+                    i = null;
+                    j = g;
                     if (this._hasCellFormat) {
-                        i = this._cellFormatInternal.d;
+                        j = this._cellFormatInternal.d;
                     }
-                    j = null;
-                    k = -1;
-                    l = toNullable(WorksheetCellFormatBlock.$, null);
+                    else {
+                        i = this.worksheet._cb(a);
+                    }
+                    k = null;
+                    l = -1;
+                    m = toNullable(WorksheetCellFormatBlock.$, null);
                     _0.label = 1;
                 case 1:
                     if (!(d != null || f != null))
                         return [3 /*break*/, 6];
-                    if (j == null && d != null) {
+                    if (k == null && d != null) {
                         if (++e < this._af.length) {
-                            j = this._af[e];
+                            k = this._af[e];
                         }
-                        if (j == null) {
+                        if (k == null) {
                             d = null;
                         }
                     }
-                    if (nullableEquals(l, null) && f != null) {
+                    if (nullableEquals(m, null) && f != null) {
                         if (f.moveNext() && f.current.a != null) {
-                            l = toNullable(WorksheetCellFormatBlock.$, f.current);
+                            m = toNullable(WorksheetCellFormatBlock.$, f.current);
                         }
                         else {
                             f.dispose();
                             f = null;
                         }
                     }
-                    m = 32767;
-                    if (j != null) {
-                        m = Math.min(m, j.w);
-                    }
-                    if (l.hasValue) {
-                        m = Math.min(m, l.value.b);
+                    n = 32767;
+                    if (k != null) {
+                        n = Math.min(n, k.w);
                     }
-                    n = null;
-                    if (j != null && j.w == m) {
-                        n = j;
-                        j = null;
+                    if (m.hasValue) {
+                        n = Math.min(n, m.value.b);
                     }
                     o = null;
-                    if (l.hasValue && l.value.b == m) {
-                        o = l.value.a;
-                        l = toNullable(WorksheetCellFormatBlock.$, null);
+                    if (k != null && k.w == n) {
+                        o = k;
+                        k = null;
+                    }
+                    p = null;
+                    if (m.hasValue && m.value.b == n) {
+                        p = m.value.a;
+                        m = toNullable(WorksheetCellFormatBlock.$, null);
                     }
-                    p = m * 32;
-                    if (b < p) {
+                    q = n * 32;
+                    if (b < q) {
                         return [2 /*return*/, undefined];
                     }
-                    q = Math.max(0, a - p);
+                    r = Math.max(0, a - q);
                     _0.label = 2;
                 case 2:
-                    if (!(q < 32))
+                    if (!(r < 32))
                         return [3 /*break*/, 5];
-                    r = (p + q);
-                    if (b < r) {
+                    s = (q + r);
+                    if (b < s) {
                         return [2 /*return*/, undefined];
                     }
-                    if (r < k) {
+                    if (s < l) {
                         return [3 /*break*/, 4];
                     }
-                    k = r;
-                    s = this._al(n, o == null ? null : o[q], i, g, r);
-                    if (s == null) {
+                    l = s;
+                    t = j;
+                    if (i != null) {
+                        if (!i.g(s)) {
+                            i = this.worksheet._cb(s);
+                        }
+                        if (i.b != null) {
+                            t = i.b;
+                        }
+                    }
+                    u = this._al(o, p == null ? null : p[r], t, g, s);
+                    if (u == null) {
                         return [3 /*break*/, 4];
                     }
-                    return [4 /*yield*/, s];
+                    return [4 /*yield*/, u];
                 case 3:
                     _0.sent();
-                    n = s.d;
-                    if (s.l && o != null) {
-                        o[q] = null;
+                    o = u.d;
+                    if (u.l && p != null) {
+                        p[r] = null;
                     }
                     if (c) {
-                        s.u();
+                        u.u();
                     }
                     _0.label = 4;
                 case 4:
-                    q++;
+                    r++;
                     return [3 /*break*/, 2];
                 case 5: return [3 /*break*/, 1];
                 case 6: return [2 /*return*/];
@@ -40763,7 +40795,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
             if (nullableEquals(d, null) || nullableGreaterThan(d, b)) {
                 break;
             }
-        } while (this.worksheet._cb(d.value).i);
+        } while (this.worksheet._cb(d.value).j);
         var e;
         if (nullableNotEquals(d, null)) {
             e = Math.min(b, d.value - 1);
@@ -40777,8 +40809,8 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 break;
             }
             var h = this.worksheet._cb(f);
-            if (h.i) {
-                f = h.r;
+            if (h.j) {
+                f = h.s;
             }
             else if (nullableNotEquals(c, null)) {
                 var i = this._a7(f);
@@ -42093,15 +42125,15 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             var k = h.b * 32;
             if (k != e) {
-                if (g && (f == null || f.r < e)) {
+                if (g && (f == null || f.s < e)) {
                     while (e < c) {
                         f = this.worksheet._cb(e);
                         a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                         b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
-                        if (f.r >= k) {
+                        if (f.s >= k) {
                             break;
                         }
-                        e = f.r + 1;
+                        e = f.s + 1;
                     }
                 }
                 else {
@@ -42111,7 +42143,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
             var l = h.a;
             for (var m = 0; m < 32; m++) {
                 if (l[m] == null) {
-                    if (g && (f == null || f.r < m + k)) {
+                    if (g && (f == null || f.s < m + k)) {
                         f = this.worksheet._cb((m + k));
                         a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                         b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
@@ -42154,7 +42186,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                     f = this.worksheet._cb(e);
                     a = ExcelUtils.h(a, ExcelUtils.g(f.b._ap));
                     b = ExcelUtils.h(b, ExcelUtils.g(f.b._al));
-                    e = f.r + 1;
+                    e = f.s + 1;
                 } while (e < c);
             }
         }
@@ -42180,14 +42212,14 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 }
                 var l = i.b * 32;
                 if (l != f) {
-                    if (h && (g == null || g.r < f)) {
+                    if (h && (g == null || g.s < f)) {
                         while (f < c) {
                             g = this.worksheet._cb(f);
                             b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
-                            if (g.r >= l) {
+                            if (g.s >= l) {
                                 break;
                             }
-                            f = g.r + 1;
+                            f = g.s + 1;
                         }
                     }
                     else {
@@ -42197,7 +42229,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                 var m = i.a;
                 for (var n = 0; n < 32 && b != 2; n++) {
                     if (m[n] == null) {
-                        if (h && (g == null || g.r < n + l)) {
+                        if (h && (g == null || g.s < n + l)) {
                             g = this.worksheet._cb((n + l));
                             b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
                         }
@@ -42225,7 +42257,7 @@ var WorksheetRow = /** @class */ /*@__PURE__*/ (function (_super) {
                     do {
                         g = this.worksheet._cb(f);
                         b = ExcelUtils.h(b, ExcelUtils.g(d(g.b)));
-                        f = g.r + 1;
+                        f = g.s + 1;
                     } while (f < c);
                 }
             }
@@ -44413,7 +44445,7 @@ var Worksheet_HideUnhideChangeContext = /** @class */ /*@__PURE__*/ (function (_
                     try {
                         for (var _10 = (e_128 = void 0, __values(fromEnum(this.f))), _11 = _10.next(); !_11.done; _11 = _10.next()) {
                             var j = _11.value;
-                            if (j.a <= h.r && h.q <= j.b) {
+                            if (j.a <= h.s && h.r <= j.b) {
                                 i = true;
                                 break;
                             }
@@ -44433,7 +44465,7 @@ var Worksheet_HideUnhideChangeContext = /** @class */ /*@__PURE__*/ (function (_
                         }
                     }
                     if (i) {
-                        h.i = (h.i == false);
+                        h.j = (h.j == false);
                     }
                 }
             }
@@ -46002,23 +46034,23 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = a;
         var f = (a + b - 1);
         var g;
-        if (c.r >= f) {
+        if (c.s >= f) {
             g = new Array(1);
             g[0] = c.d(this.workbook, e, f);
         }
         else {
             var h = new List$1(WorksheetColumnBlock.$, 0);
-            var i = c.d(this.workbook, e, c.r);
+            var i = c.d(this.workbook, e, c.s);
             h.add(i);
-            var j = b - i.t;
-            e = (e + i.t);
+            var j = b - i.u;
+            e = (e + i.u);
             while (j > 0) {
                 d++;
                 c = this._fe._inner[d];
-                i = c.d(this.workbook, e, Math.min(c.r, f));
+                i = c.d(this.workbook, e, Math.min(c.s, f));
                 h.add(i);
-                j -= i.t;
-                e += i.t;
+                j -= i.u;
+                e += i.u;
             }
             g = h.toArray();
         }
@@ -46350,7 +46382,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             b = d.p3;
         }
         var e = this._cb(a);
-        var f = truncate(MathUtilities.f(e.n(this, 1)));
+        var f = truncate(MathUtilities.f(e.o(this, 1)));
         return new WorksheetItemPosition(1, a, b, f);
     };
     /**
@@ -46367,7 +46399,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         d = f.p2;
         e = f.p3;
         var g = this._cb(e);
-        var h = truncate(MathUtilities.f(g.n(this, 1)));
+        var h = truncate(MathUtilities.f(g.o(this, 1)));
         return new WorksheetItemPosition(1, e, a - c, h);
     };
     /**
@@ -46391,7 +46423,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var k = Math.min(h, c);
         for (var l = g; l <= k; l++) {
             var m = this._cb(l);
-            var n = truncate(MathUtilities.f(m.n(this, 1)));
+            var n = truncate(MathUtilities.f(m.o(this, 1)));
             if (n != 0) {
                 d.add(new WorksheetItemPosition(1, l, j, n));
             }
@@ -46426,10 +46458,10 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
                     if (!(c ? h <= f : h >= f))
                         return [3 /*break*/, 5];
                     i = this._cb(h);
-                    if (i.k) {
+                    if (i.l) {
                         return [3 /*break*/, 4];
                     }
-                    j = c ? i.r : i.q;
+                    j = c ? i.s : i.r;
                     _0.label = 2;
                 case 2:
                     if (!true)
@@ -46471,11 +46503,11 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             b = false;
         }
         if (a != null) {
-            if (b == false && a.i) {
+            if (b == false && a.j) {
                 return 0;
             }
-            if (a.v >= 0) {
-                return a.v;
+            if (a.w >= 0) {
+                return a.w;
             }
         }
         return this.defaultColumnWidth;
@@ -46515,7 +46547,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
      */
     Worksheet.prototype._fo = function (a, b) {
         if (a != null) {
-            return a.n(this, 3, b);
+            return a.o(this, 3, b);
         }
         return this.getDefaultColumnWidth(3);
     };
@@ -46914,23 +46946,23 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var l = this._b3;
         for (var m = k.count - 1; m >= 0; m--) {
             var n = k._inner[m];
-            if (n.m != 0) {
-                g = n.r + 1;
+            if (n.n != 0) {
+                g = n.s + 1;
                 break;
             }
             else if (!Base.equalsStatic(n.b, l)) {
-                g = n.r;
+                g = n.s;
                 break;
             }
         }
         for (var o = 0; o < k.count; o++) {
             var p = k._inner[o];
-            if (p.m != 0) {
-                i = p.q;
+            if (p.n != 0) {
+                i = p.r;
                 break;
             }
             else if (!Base.equalsStatic(p.b, l)) {
-                i = p.q;
+                i = p.r;
                 break;
             }
         }
@@ -47227,7 +47259,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
      * @hidden
      */
     Worksheet.prototype._ec = function (a) {
-        return this._cb(a).i;
+        return this._cb(a).j;
     };
     /**
      * @hidden
@@ -47304,10 +47336,10 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             h.b = GenericCacheElementEx.r(WorksheetCellFormatData.$, f, i);
             this._hh();
         }
-        h.i = d;
-        h.m = e;
-        h.v = c;
-        h.j = g;
+        h.j = d;
+        h.n = e;
+        h.w = c;
+        h.k = g;
     };
     /**
      * @hidden
@@ -47318,7 +47350,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var d = ((function () { var e = _this._f8(a, b, true, c); c = e.p3; return e.ret; })());
         var e = this.workbook._ff;
         var f = d;
-        var g = (c.r + 1);
+        var g = (c.s + 1);
         var h = 0;
         for (var i = d + 1; i < this._fe.count; i++) {
             if (g >= e) {
@@ -47326,10 +47358,10 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
                 continue;
             }
             var j = this._fe._inner[i];
-            var k = j.r + 1 - j.q;
-            j.q = g;
-            j.r = Math.min(g + k - 1, e - 1);
-            g = (j.r + 1);
+            var k = j.s + 1 - j.r;
+            j.r = g;
+            j.s = Math.min(g + k - 1, e - 1);
+            g = (j.s + 1);
         }
         while (h > 0) {
             d = this._fe.count - 1;
@@ -47349,28 +47381,28 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var d = this._fe._inner[c];
         var e = b;
         var f = c;
-        if (d.q == a && d.q + b >= d.r + 1) {
-            e -= d.t;
+        if (d.r == a && d.r + b >= d.s + 1) {
+            e -= d.u;
             this._id(c, d);
             if (c < this._fe.count) {
                 var g = this._fe._inner[c];
-                var h = g.t;
-                g.q = a;
-                g.r = (a + h - 1);
+                var h = g.u;
+                g.r = a;
+                g.s = (a + h - 1);
             }
             if (f > 0) {
                 f--;
             }
         }
         else {
-            var i = Math.min(d.r + 1 - a, b);
-            d.r -= i;
+            var i = Math.min(d.s + 1 - a, b);
+            d.s -= i;
             e -= i;
             c++;
         }
         while (e > 0) {
             d = this._fe._inner[c];
-            var j = d.t;
+            var j = d.u;
             if (j <= e) {
                 e -= j;
                 this._id(c, d);
@@ -47378,7 +47410,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             else {
                 j -= e;
                 e = 0;
-                d.r = (d.q + j - 1);
+                d.s = (d.r + j - 1);
             }
         }
         if (this._fe.count == 0) {
@@ -47393,23 +47425,23 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         var b = this._fe._inner[this._fe.count - 1];
         var c = (this.workbook._ff - 1);
         do {
-            if (b.r <= c) {
+            if (b.s <= c) {
                 break;
             }
             if (this._fe.count == 1) {
-                b.r = c;
+                b.s = c;
                 break;
             }
             GenericCacheElementEx.q(WorksheetCellFormatData.$, b.b);
             this._fe.removeAt(this._fe.count - 1);
             b = this._fe._inner[this._fe.count - 1];
         } while (true);
-        if (b.r < c) {
-            if (b.k) {
-                b.r = c;
+        if (b.s < c) {
+            if (b.l) {
+                b.s = c;
             }
             else {
-                var d = new WorksheetColumnBlock(0, (b.r + 1), c, this.workbook._ca._p);
+                var d = new WorksheetColumnBlock(0, (b.s + 1), c, this.workbook._ca._p);
                 d.b.k();
                 this._fe.add(d);
             }
@@ -47761,45 +47793,45 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
      */
     Worksheet.prototype._h9 = function (a) {
         var _this = this;
-        var b = a.q;
-        var c = a.r;
+        var b = a.r;
+        var c = a.s;
         var d;
         var e = ((function () { var f = _this._f8(b, (c - (b + 1)), false, d); d = f.p3; return f.ret; })());
         var f = d == a;
         var g = 0;
         if (f) {
-            if (d.r >= a.r) {
+            if (d.s >= a.s) {
                 return;
             }
-            g = a.r - d.r;
-            d.r = a.r;
+            g = a.s - d.s;
+            d.s = a.s;
         }
         else {
-            if (d.q == a.q) {
-                if (d.r == a.r) {
+            if (d.r == a.r) {
+                if (d.s == a.s) {
                     this._fe._inner[e] = a;
                     return;
                 }
-                if (d.r > a.r) {
+                if (d.s > a.s) {
                     this._fe.insert(e, a);
-                    d.q = (a.r + 1);
+                    d.r = (a.s + 1);
                     return;
                 }
-                g = a.r - d.r;
+                g = a.s - d.s;
                 this._fe._inner[e] = a;
             }
             else {
-                if (a.r >= d.r) {
-                    g = a.r - d.r;
-                    d.r = (a.q - 1);
+                if (a.s >= d.s) {
+                    g = a.s - d.s;
+                    d.s = (a.r - 1);
                     this._fe.insert(e + 1, a);
                 }
                 else {
-                    var h = d.r;
-                    d.r = (a.q - 1);
+                    var h = d.s;
+                    d.s = (a.r - 1);
                     this._fe.insert(e + 1, a);
-                    if (h > a.r) {
-                        this._fe.insert(e + 2, d.d(this.workbook, (a.r + 1), h));
+                    if (h > a.s) {
+                        this._fe.insert(e + 2, d.d(this.workbook, (a.s + 1), h));
                     }
                 }
             }
@@ -47807,12 +47839,12 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         while (g > 0) {
             e++;
             d = this._fe._inner[e];
-            if (g >= d.t) {
-                g -= d.t;
+            if (g >= d.u) {
+                g -= d.u;
                 this._fe.removeAt(e);
             }
             else {
-                d.q += g;
+                d.r += g;
                 g = 0;
             }
         }
@@ -48045,20 +48077,20 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             var n = l.e;
             var o = this._f9(m);
             var p = this._ff._inner[o];
-            if (p.q < m) {
-                this._cc(m, Math.min(p.r, n));
+            if (p.r < m) {
+                this._cc(m, Math.min(p.s, n));
                 o++;
             }
             var q = this._f9(n);
             p = this._ff._inner[q];
-            if (p.r > n) {
-                this._cc(Math.max(p.q, m), n);
+            if (p.s > n) {
+                this._cc(Math.max(p.r, m), n);
             }
             for (var r = o; r <= q; r++) {
                 p = this._fe._inner[r];
-                p.v = l.c;
-                p.j = l.a;
-                p.i = l.b;
+                p.w = l.c;
+                p.k = l.a;
+                p.j = l.b;
             }
             this._cd(n);
             this._cd(m);
@@ -48869,16 +48901,16 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
     Worksheet.prototype._cc = function (a, b) {
         var c = this._f9(a);
         var d = this._fe._inner[c];
-        var e = d.r;
-        if (d.q != a) {
-            d.r = (a - 1);
+        var e = d.s;
+        if (d.r != a) {
+            d.s = (a - 1);
             var f = new WorksheetColumnBlock(1, a, e, d);
             c++;
             this._fe.insert(c, f);
             d = f;
         }
-        if (d.r != b) {
-            d.r = b;
+        if (d.s != b) {
+            d.s = b;
             var g = new WorksheetColumnBlock(1, (b + 1), e, d);
             this._fe.insert(c + 1, g);
         }
@@ -48935,23 +48967,24 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
     Worksheet.prototype._cd = function (a) {
         var b = this._f9(a);
         var c = this._fe._inner[b];
-        if (c.q != 0) {
-            var d = this._cb((c.q - 1));
-            if (c.equals(d)) {
+        var d = this.defaultColumnWidth;
+        if (c.r != 0) {
+            var e = this._cb((c.r - 1));
+            if (c.i(e, d)) {
                 this._ff.removeAt(b);
                 GenericCacheElementEx.q(WorksheetCellFormatData.$, c.b);
-                d.r = c.r;
-                c = d;
+                e.s = c.s;
+                c = e;
             }
         }
-        var e = this._columns$i.maxCount - 1;
-        if (c.r != e) {
-            var f = this._f9((c.r + 1));
-            var g = this._fe._inner[f];
-            if (c.equals(g)) {
-                this._ff.removeAt(f);
-                GenericCacheElementEx.q(WorksheetCellFormatData.$, g.b);
-                c.r = g.r;
+        var f = this._columns$i.maxCount - 1;
+        if (c.s != f) {
+            var g = this._f9((c.s + 1));
+            var h = this._fe._inner[g];
+            if (c.i(h, d)) {
+                this._ff.removeAt(g);
+                GenericCacheElementEx.q(WorksheetCellFormatData.$, h.b);
+                c.s = h.s;
             }
         }
         return c;
@@ -49291,10 +49324,11 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a === void 0) {
             a = 0;
         }
-        var b = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), this.workbook._ca._p);
-        b.b.k();
-        this._fe.add(b);
-        return b;
+        var b = this._b3;
+        var c = new WorksheetColumnBlock(0, a, (this.workbook._ff - 1), b);
+        c.b.k();
+        this._fe.add(c);
+        return c;
     };
     /**
      * @hidden
@@ -49315,7 +49349,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             if (e.g(a)) {
                 return d;
             }
-            var f = e.q - a;
+            var f = e.r - a;
             if (f < 0) {
                 b = d + 1;
             }
@@ -49509,20 +49543,23 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
     Worksheet.prototype._hj = function (a) {
         var b = this._fe._inner[a];
         if (a == 0) {
-            b.r -= b.q;
-            b.q = 0;
+            b.s -= b.r;
+            b.r = 0;
         }
         for (var c = a + 1; c < this._fe.count; c++) {
             var d = this._fe._inner[c];
-            var e = d.t;
-            d.q = (b.r + 1);
-            d.r = (d.q + e - 1);
+            var e = d.u;
+            d.r = (b.s + 1);
+            d.s = (d.r + e - 1);
             b = d;
         }
-        if (b.r < this.workbook._ff - 1 && false == b.k) {
-            b = this._ca((b.r + 1));
+        if (b.s < this.workbook._ff - 1 && false == b.l) {
+            b = this._ca((b.s + 1));
+            if (b != this._cd(b.r)) {
+                b = this._ff._inner[this._ff.count - 1];
+            }
         }
-        b.r = (this.workbook._ff - 1);
+        b.s = (this.workbook._ff - 1);
     };
     /**
      * @hidden
@@ -49533,8 +49570,8 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
         if (a == 0) {
             d = this._fe._inner[0];
             if (c) {
-                if (d.k) {
-                    d.r = Math.min(d.r + b, f - 1);
+                if (d.l) {
+                    d.s = Math.min(d.s + b, f - 1);
                 }
                 else {
                     d = new WorksheetColumnBlock(0, a, (a + b - 1), this.workbook._ca._p);
@@ -49555,7 +49592,7 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             }
             d = this._fe._inner[e];
             if (c) {
-                d.r = Math.min(d.r + b, f - 1);
+                d.s = Math.min(d.s + b, f - 1);
             }
         }
         return {
@@ -49801,8 +49838,8 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
             try {
                 for (var _4 = __values(fromEnum(this._ff)), _5 = _4.next(); !_5.done; _5 = _4.next()) {
                     var u = _5.value;
-                    if (f <= u.q && u.r <= h) {
-                        u.i = d;
+                    if (f <= u.r && u.s <= h) {
+                        u.j = d;
                     }
                 }
             }
@@ -50682,15 +50719,15 @@ var Worksheet = /** @class */ /*@__PURE__*/ (function (_super) {
          */
         get: function () {
             var a = 0;
-            var b = this._ff._inner[0].b;
+            var b = this._ff.count == 0 ? null : this._ff._inner[0].b;
             for (var c = 0; c < this._ff.count; c++) {
                 var d = this._ff._inner[c];
-                if (a <= d.t) {
-                    a = d.t;
+                if (a <= d.u) {
+                    a = d.u;
                     b = d.b;
                 }
             }
-            if (b._cd) {
+            if (b == null || b._cd) {
                 b = this.workbook != null ? this.workbook._ca._p : null;
             }
             return b;
@@ -55139,11 +55176,11 @@ var ListDataValidationRule = /** @class */ /*@__PURE__*/ (function (_super) {
                         }
                         else {
                             var l = WorksheetCellBlock.ah(j);
-                            var m_5;
-                            if (!((function () { var n = ExcelUtils.b1(_this._workbook, j, m_5); m_5 = n.p2; return n.ret; })())) {
-                                m_5 = NaN;
+                            var m_4;
+                            if (!((function () { var n = ExcelUtils.b1(_this._workbook, j, m_4); m_4 = n.p2; return n.ret; })())) {
+                                m_4 = NaN;
                             }
-                            k = h.h(m_5, l, j, -1, null, null, false).j;
+                            k = h.h(m_4, l, j, -1, null, null, false).j;
                         }
                         if (stringEquals1(k, f, 0)) {
                             return { value: true };
@@ -55472,9 +55509,9 @@ var ListDataValidationRule = /** @class */ /*@__PURE__*/ (function (_super) {
                     h[i] = l_4;
                     return "continue";
                 }
-                var m_6;
-                if (((function () { var n = FormulaParser.bu(j, m_6); m_6 = n.p1; return n.ret; })())) {
-                    h[i] = m_6;
+                var m_5;
+                if (((function () { var n = FormulaParser.bu(j, m_5); m_5 = n.p1; return n.ret; })())) {
+                    h[i] = m_5;
                     return "continue";
                 }
                 var n = FormulaParser.b(j, b);
@@ -64634,7 +64671,7 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b == null) {
             return false;
         }
-        return b._cb(a).i;
+        return b._cb(a).j;
     };
     /**
      * @hidden
@@ -64645,7 +64682,7 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this._ad();
         this._ak();
-        this.worksheet._cb(this.index).i = a;
+        this.worksheet._cb(this.index).j = a;
         this._aj();
     };
     Object.defineProperty(WorksheetColumn.prototype, "_l", {
@@ -64902,7 +64939,7 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b == null) {
             return 0;
         }
-        return b._cb(a).m;
+        return b._cb(a).n;
     };
     /**
      * @hidden
@@ -64913,7 +64950,7 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this._ad();
         this._ak();
-        this.worksheet._cb(this.index).m = a;
+        this.worksheet._cb(this.index).n = a;
         this._aj();
     };
     Object.defineProperty(WorksheetColumn.prototype, "_n", {
@@ -65350,7 +65387,7 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
             if (b < 0) {
                 return 0;
             }
-            return a._cb(b).v;
+            return a._cb(b).w;
         },
         set: function (a) {
             this._ad();
@@ -65382,10 +65419,10 @@ var WorksheetColumn = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         this._ak();
         var c = this.worksheet._cb(this.index);
-        c.v = a;
-        c.j = this.width >= 0;
+        c.w = a;
+        c.k = this.width >= 0;
         if (this._l) {
-            c.i = false;
+            c.j = false;
             this._y();
         }
         this._aj();
@@ -65716,8 +65753,8 @@ var HiddenColumnCollection = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _1 = __values(fromEnum(a._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var b = _2.value;
-                if (b.i) {
-                    for (var c = b.q; c <= b.r; c++) {
+                if (b.j) {
+                    for (var c = b.r; c <= b.s; c++) {
                         this.add_1(a._columns$i.item(c));
                     }
                 }
@@ -104061,14 +104098,14 @@ var WorksheetElementResizeContext = /** @class */ /*@__PURE__*/ (function (_supe
         try {
             for (var _1 = __values(fromEnum(a._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var f = _2.value;
-                if (f.r < b) {
+                if (f.s < b) {
                     continue;
                 }
-                if (c < f.q) {
+                if (c < f.r) {
                     break;
                 }
-                if (f.i != d) {
-                    e.add(new IndexRange(1, Math.max(f.q, b), Math.min(f.r, c)));
+                if (f.j != d) {
+                    e.add(new IndexRange(1, Math.max(f.r, b), Math.min(f.s, c)));
                 }
             }
         }
@@ -104168,16 +104205,16 @@ var WorksheetElementResizeContext = /** @class */ /*@__PURE__*/ (function (_supe
         try {
             for (var _1 = __values(fromEnum(a._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var h = _2.value;
-                var i = h.q;
-                var j = h.r;
+                var i = h.r;
+                var j = h.s;
                 if (j < b) {
                     continue;
                 }
                 var k = d.count == 0 ? null : d._inner[d.count - 1];
-                if (k == null || k.c != h.v || k.a != h.j || k.b != h.i) {
+                if (k == null || k.c != h.w || k.a != h.k || k.b != h.j) {
                     var l = k == null ? b : k.e + 1;
                     var m = Math.min(c, j);
-                    k = new WorksheetElementResizeState(l, m, h.v, h.i, h.j);
+                    k = new WorksheetElementResizeState(l, m, h.w, h.j, h.k);
                     d.add(k);
                 }
                 else {
@@ -104274,15 +104311,15 @@ var WorksheetElementResizeContext = /** @class */ /*@__PURE__*/ (function (_supe
             var i = a._ff._inner[h];
             var j = d.count;
             while (true) {
-                var k = i.v;
-                var l = i.i;
-                var m = i.j;
-                if (i.r < f.e) {
+                var k = i.w;
+                var l = i.j;
+                var m = i.k;
+                if (i.s < f.e) {
                     h++;
                     i = a._ff._inner[h];
-                    if (i.v != k || i.i != l || i.j != m) {
-                        d.add(new WorksheetElementResizeState(g, i.q - 1, k, l, m));
-                        g = i.q;
+                    if (i.w != k || i.j != l || i.k != m) {
+                        d.add(new WorksheetElementResizeState(g, i.r - 1, k, l, m));
+                        g = i.r;
                     }
                 }
                 else {
@@ -106080,11 +106117,11 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         }
         var _this = _super.call(this) || this;
         _this.a = null;
-        _this.o = 0;
-        _this.e = false;
         _this.p = 0;
-        _this.l = 0;
-        _this.s = -1;
+        _this.e = false;
+        _this.q = 0;
+        _this.m = 0;
+        _this.t = -1;
         _this.f = false;
         a = (a == void 0) ? 0 : a;
         switch (a) {
@@ -106093,8 +106130,8 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
                     var c = _rest[0];
                     var d = _rest[1];
                     var e = _rest[2];
-                    _this.o = c;
-                    _this.p = d;
+                    _this.p = c;
+                    _this.q = d;
                     _this.a = e;
                 }
                 break;
@@ -106108,13 +106145,13 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
                         var h = f[0];
                         var i = f[1];
                         var j = f[2];
-                        _this.o = h;
-                        _this.p = i;
+                        _this.p = h;
+                        _this.q = i;
                         _this.a = j;
                     }
                     _this.e = e.e;
-                    _this.l = e.l;
-                    _this.s = e.s;
+                    _this.m = e.m;
+                    _this.t = e.t;
                     _this.a.k();
                     _this.f = e.f;
                 }
@@ -106127,16 +106164,24 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         if (b == null) {
             return false;
         }
-        return this.e == b.e && this.l == b.l && this.s == b.s && this.f == b.f && this.a.equals(b.a);
+        return this.i(b);
+    };
+    WorksheetColumnBlock.prototype.i = function (a, b) {
+        if (b === void 0) {
+            b = -1;
+        }
+        var c = this.t < 0 ? b : this.t;
+        var d = a.t < 0 ? b : a.t;
+        return this.e == a.e && this.m == a.m && c == d && this.f == a.f && this.a.equals(a.a);
     };
     WorksheetColumnBlock.prototype.getHashCode = function () {
-        return Base.getHashCodeStatic(this.e) ^ (this.l) ^ (this.s) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
+        return Base.getHashCodeStatic(this.e) ^ (this.m) ^ (this.t) ^ Base.getHashCodeStatic(this.f) ^ this.a.getHashCode();
     };
     WorksheetColumnBlock.prototype.toString = function () {
         var a = new StringBuilder(0);
-        a.r("FirstColumn: {0}, LastColumn: {1}", this.o, this.p);
-        if (this.s >= 0) {
-            a.q(", Width: {0}", this.s);
+        a.r("FirstColumn: {0}, LastColumn: {1}", this.p, this.q);
+        if (this.t >= 0) {
+            a.q(", Width: {0}", this.t);
         }
         if (this.e) {
             a.l(", Hidden");
@@ -106144,35 +106189,35 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         return a.toString();
     };
     WorksheetColumnBlock.prototype.c = function (a) {
-        return this.d(a, this.q, this.r);
+        return this.d(a, this.r, this.s);
     };
     WorksheetColumnBlock.prototype.d = function (a, b, c) {
         var d = new WorksheetColumnBlock(0, b, c, this.b._bv(a));
         d.e = this.e;
-        d.l = this.l;
-        d.s = this.s;
+        d.m = this.m;
+        d.t = this.t;
         d.f = this.f;
         return d;
     };
     WorksheetColumnBlock.prototype.g = function (a) {
-        return a >= this.o && a <= this.p;
+        return a >= this.p && a <= this.q;
     };
-    WorksheetColumnBlock.prototype.n = function (a, b, c) {
+    WorksheetColumnBlock.prototype.o = function (a, b, c) {
         if (c === void 0) {
             c = false;
         }
-        if (c == false && this.i) {
+        if (c == false && this.j) {
             return 0;
         }
-        return a._fl(this.v < 0 ? a.defaultColumnWidth : this.v, b);
+        return a._fl(this.w < 0 ? a.defaultColumnWidth : this.w, b);
     };
-    WorksheetColumnBlock.prototype.x = function (a, b) {
-        if (this.k) {
+    WorksheetColumnBlock.prototype.y = function (a, b) {
+        if (this.l) {
             return;
         }
         var c = Workbook.getMaxColumnCount(b) - 1;
-        if (c < this.q) {
-            a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.q, c + 1), c));
+        if (c < this.r) {
+            a.g(stringFormat(ExcelUtils.eh("LE_FormatLimitError_MaxColumnIndex"), Math.max(this.r, c + 1), c));
         }
     };
     Object.defineProperty(WorksheetColumnBlock.prototype, "b", {
@@ -106185,24 +106230,24 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "t", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "u", {
         get: function () {
-            return this.p + 1 - this.o;
+            return this.q + 1 - this.p;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "q", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "r", {
         get: function () {
-            return this.o;
+            return this.p;
         },
         set: function (a) {
-            this.o = a;
+            this.p = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "i", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "j", {
         get: function () {
             return this.e;
         },
@@ -106212,7 +106257,7 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "j", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "k", {
         get: function () {
             return this.f;
         },
@@ -106222,39 +106267,39 @@ var WorksheetColumnBlock = /** @class */ /*@__PURE__*/ (function (_super) {
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "k", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "l", {
         get: function () {
-            return this.e == false && this.l == 0 && this.s == -1 && this.a._cd;
+            return this.e == false && this.m == 0 && this.t == -1 && this.a._cd;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "r", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "s", {
         get: function () {
-            return this.p;
+            return this.q;
         },
         set: function (a) {
-            this.p = a;
+            this.q = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "m", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "n", {
         get: function () {
-            return this.l;
+            return this.m;
         },
         set: function (a) {
-            this.l = a;
+            this.m = a;
         },
         enumerable: false,
         configurable: true
     });
-    Object.defineProperty(WorksheetColumnBlock.prototype, "v", {
+    Object.defineProperty(WorksheetColumnBlock.prototype, "w", {
         get: function () {
-            return this.s;
+            return this.t;
         },
         set: function (a) {
-            this.s = a;
+            this.t = a;
         },
         enumerable: false,
         configurable: true
@@ -110113,11 +110158,11 @@ var WorkbookSaveManager = /** @class */ /*@__PURE__*/ (function (_super) {
             for (var _5 = __values(fromEnum(a._ff)), _6 = _5.next(); !_6.done; _6 = _5.next()) {
                 var i = _6.value;
                 if (this._ah(a, i, h)) {
-                    f = Math.max(i.m, f);
+                    f = Math.max(i.n, f);
                     if (nullableEquals(b, null)) {
-                        b = toNullable(Number_$type, i.q);
+                        b = toNullable(Number_$type, i.r);
                     }
-                    c = toNullable(Number_$type, (i.r + 1));
+                    c = toNullable(Number_$type, (i.s + 1));
                 }
                 h = i;
             }
@@ -110364,25 +110409,25 @@ var WorkbookSaveManager = /** @class */ /*@__PURE__*/ (function (_super) {
         var e = false;
         if (a.displayOptions._ap) {
             if (c != null) {
-                d = c.m;
-                e = c.i;
+                d = c.n;
+                e = c.j;
             }
         }
         else {
-            var f = (b.r + 1);
+            var f = (b.s + 1);
             if (f < a._columns$i.maxCount) {
                 var g = a._cb(f);
                 if (g != null) {
-                    d = g.m;
-                    e = g.i;
+                    d = g.n;
+                    e = g.j;
                 }
             }
         }
-        var h = e && b.m < d;
+        var h = e && b.n < d;
         if (h) {
             this._aw.add_1(b);
         }
-        return h || b.m != 0 || b.v >= 0 || b.b._cd == false;
+        return h || b.n != 0 || b.w >= 0 || b.b._cd == false;
     };
     WorkbookSaveManager.prototype._v = function (a, b, c) {
         var e_356, _0;
@@ -115984,7 +116029,7 @@ var WorksheetColumnCollection = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _1 = __values(fromEnum(this._e._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var c = _2.value;
-                c.x(a, b);
+                c.y(a, b);
             }
         }
         catch (e_367_1) {
@@ -116053,16 +116098,16 @@ var WorksheetColumnCollection = /** @class */ /*@__PURE__*/ (function (_super) {
             for (var _1 = __values(fromEnum(this._e._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var g = _2.value;
                 var h = 0;
-                if (e || g.i == false) {
-                    if (g.v < 0) {
+                if (e || g.j == false) {
+                    if (g.w < 0) {
                         h = f;
                     }
                     else {
-                        h = g.v;
+                        h = g.w;
                     }
                 }
-                var i = Math.max(0, Math.min(g.r, a - 1) - g.q + 1);
-                var j = Math.max(0, Math.min(g.r, b - 1) - g.q + 1);
+                var i = Math.max(0, Math.min(g.s, a - 1) - g.r + 1);
+                var j = Math.max(0, Math.min(g.s, b - 1) - g.r + 1);
                 if (i == 0 && j == 0) {
                     break;
                 }
@@ -116104,15 +116149,15 @@ var WorksheetColumnCollection = /** @class */ /*@__PURE__*/ (function (_super) {
             for (var _1 = __values(fromEnum(this._e._ff)), _2 = _1.next(); !_2.done; _2 = _1.next()) {
                 var h = _2.value;
                 var i = 0;
-                if (e || h.i == false) {
-                    if (h.v < 0) {
+                if (e || h.j == false) {
+                    if (h.w < 0) {
                         i = g;
                     }
                     else {
-                        i = h.v;
+                        i = h.w;
                     }
                 }
-                var j = (h.r - h.q) + 1;
+                var j = (h.s - h.r) + 1;
                 var k = i * j;
                 if (f == false) {
                     if (a < k) {
@@ -116175,10 +116220,10 @@ var WorksheetColumnCollection = /** @class */ /*@__PURE__*/ (function (_super) {
         try {
             for (var _3 = __values(fromEnum(this._e._ff)), _4 = _3.next(); !_4.done; _4 = _3.next()) {
                 var c = _4.value;
-                if (c.i == false) {
+                if (c.j == false) {
                     continue;
                 }
-                for (var d = c.q; d <= c.r; d++) {
+                for (var d = c.r; d <= c.s; d++) {
                     b.add_1(this.item(d));
                 }
             }
@@ -127305,15 +127350,15 @@ var SparklineGroupCollection = /** @class */ /*@__PURE__*/ (function (_super) {
                 var k = false;
                 if (j._g == c) {
                     var l_6 = j._i.o;
-                    var m_7 = j._i.m;
-                    var n = ((function () { var o = a.d(l_6, m_7); l_6 = o.p0; m_7 = o.p1; return o.ret; })());
+                    var m_6 = j._i.m;
+                    var n = ((function () { var o = a.d(l_6, m_6); l_6 = o.p0; m_6 = o.p1; return o.ret; })());
                     if (n.f) {
                         f = true;
                         if (n.g) {
                             k = true;
                         }
                         else {
-                            j = j._c(l_6, m_7);
+                            j = j._c(l_6, m_6);
                             g.item(i, j);
                         }
                     }