pyuno/qa/pytests/testcollections_XCellRange.py | 4 ++-- sc/inc/address.hxx | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-)
New commits: commit 4c5f8ccf0a2320432b8fe91add1dcadf54d9fd58 Author: Luboš Luňák <l.lu...@collabora.com> AuthorDate: Tue Mar 8 12:44:49 2022 +0100 Commit: Luboš Luňák <l.lu...@collabora.com> CommitDate: Wed Mar 9 08:25:44 2022 +0100 change default Calc number of columns to 16384 (tdf#50916) All tests pass now, and I've also handled all significant bugreports from tdf#133764. This commit is mainly meant to test this more in practice and collect feedback. Depending on how this turns out, there may be a backwards compatibility option or something similar, but so far I see no significant need for it. Change-Id: I1a946f4e0b51be5acf4e25dc773e7694c2b17b48 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131180 Tested-by: Jenkins Reviewed-by: Luboš Luňák <l.lu...@collabora.com> diff --git a/pyuno/qa/pytests/testcollections_XCellRange.py b/pyuno/qa/pytests/testcollections_XCellRange.py index 3f610ca3485c..641482433375 100644 --- a/pyuno/qa/pytests/testcollections_XCellRange.py +++ b/pyuno/qa/pytests/testcollections_XCellRange.py @@ -348,7 +348,7 @@ class TestXCellRange(CollectionsTestBase): self.assertEqual(0, rng.RangeAddress.StartRow) self.assertEqual(0, rng.RangeAddress.StartColumn) self.assertEqual(0, rng.RangeAddress.EndRow) - self.assertEqual(1023, rng.RangeAddress.EndColumn) + self.assertEqual(16383, rng.RangeAddress.EndColumn) spr.close(True) @@ -369,7 +369,7 @@ class TestXCellRange(CollectionsTestBase): self.assertEqual(0, rng.RangeAddress.StartRow) self.assertEqual(0, rng.RangeAddress.StartColumn) self.assertEqual(0, rng.RangeAddress.EndRow) - self.assertEqual(1023, rng.RangeAddress.EndColumn) + self.assertEqual(16383, rng.RangeAddress.EndColumn) spr.close(True) diff --git a/sc/inc/address.hxx b/sc/inc/address.hxx index 18bd11049e92..13cfd9c408c2 100644 --- a/sc/inc/address.hxx +++ b/sc/inc/address.hxx @@ -60,7 +60,7 @@ const SCSIZE SCSIZE_MAX = ::std::numeric_limits<SCSIZE>::max(); // Count values const SCROW MAXROWCOUNT = 1048576; -const SCCOL MAXCOLCOUNT = 1024; +const SCCOL MAXCOLCOUNT = 16384; const SCCOL INITIALCOLCOUNT = 64; // initial number of columns we allocate memory for /// limiting to 10000 for now, problem with 32 bit builds for now const SCTAB MAXTABCOUNT = 10000; @@ -82,7 +82,7 @@ const SCTAB MAXINITTAB = 1024; const SCTAB MININITTAB = 1; inline constexpr OUStringLiteral MAXROW_STRING(u"1048575"); -inline constexpr OUStringLiteral MAXCOL_STRING(u"AMJ"); +inline constexpr OUStringLiteral MAXCOL_STRING(u"XFD"); inline constexpr OUStringLiteral MAXROW_JUMBO_STRING(u"16777215"); inline constexpr OUStringLiteral MAXCOL_JUMBO_STRING(u"XFD");