summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2022-05-11 13:43:45 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2022-05-11 21:57:21 +0200
commit2d63a011ed161a01419a40ab2fbb88796d59b20a (patch)
tree6b297a11b31bb713a12a937fbeab7895fc913d15
parentcfb15d06e82ff9af6a9de2dab815b15e9724c9c6 (diff)
tdf#121740 just remove OLE_Objects limit for non-32-bit-Windows
shaves 5% off load time Change-Id: I1893180124ebe86babff1776d77a696ef1e4a190 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/134202 Tested-by: Noel Grandin <noel.grandin@collabora.co.uk> Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--svx/source/svdraw/svdetc.cxx8
1 files changed, 8 insertions, 0 deletions
diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index 6f4ec03d46ad..929d59e09f4a 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -93,7 +93,15 @@ SdrGlobalData & GetSdrGlobalData() {
OLEObjCache::OLEObjCache()
{
if (!utl::ConfigManager::IsFuzzing())
+ {
+// This limit is only useful on 32-bit windows, where we can run out of virtual memory (see tdf#95579)
+// For everything else, we are better off keeping it in main memory rather than using our hacky page-out thing
+#if defined _WIN32 && !defined _WIN64
nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
+#else
+ nSize = SAL_MAX_INT32; // effectively disable the page-out mechanism
+#endif
+ }
else
nSize = 100;
pTimer.reset( new AutoTimer( "svx OLEObjCache pTimer UnloadCheck" ) );