sc/source/core/tool/scmatrix.cxx | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
New commits:
commit 028d66430f6b34949b8cd53e0373b5522d17f09c
Author: Eike Rathke <er...@redhat.com>
Date: Mon Oct 23 17:44:12 2017 +0200
We still have to build and run on 32-bit
Change-Id: Id8840b001beae7de72beace5c0c14f0d304ce1fc
diff --git a/sc/source/core/tool/scmatrix.cxx b/sc/source/core/tool/scmatrix.cxx
index 32dc362245bd..7139a708e3dc 100644
--- a/sc/source/core/tool/scmatrix.cxx
+++ b/sc/source/core/tool/scmatrix.cxx
@@ -2816,10 +2816,15 @@ bool ScMatrix::IsSizeAllocatable( SCSIZE nC, SCSIZE nR )
else
{
// GetElementsMax() uses an (~arbitrary) elements limit.
- // Assume 6GB memory could be consumed by matrices.
// The actual allocation depends on the types of individual matrix
// elements and is averaged for type double.
+#if SAL_TYPES_SIZEOFPOINTER < 8
+ // Assume 1GB memory could be consumed by matrices.
+ constexpr size_t nMemMax = 0x40000000;
+#else
+ // Assume 6GB memory could be consumed by matrices.
constexpr size_t nMemMax = 0x180000000;
+#endif
nElementsMax = GetElementsMax( nMemMax);
}
bElementsMaxFetched = true;
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
