diff options
| author | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-21 11:08:13 +0100 |
|---|---|---|
| committer | Zolnai Tamás <tamas.zolnai@collabora.com> | 2014-11-22 13:44:18 +0100 |
| commit | 49188c5a71d9a60ab71bbeb1c9af239cbb8cee09 (patch) | |
| tree | 7bd621db35ea7f37a26906a0e6b7edafaedc24d1 /svtools | |
| parent | a395c0d93cef9918a9c8d798b7fb7433ba7b5131 (diff) | |
Don't use a hard coded limit for size based auto swap out.
Now the graphic cache settings shows the real memory usage for
the users, so we can bequeth the decision of the limit to them.
Default is 200 MB.
See also:
dbdacc73ae154237314d599194cc686bd738a9bf
Change-Id: I463d31254f6f1836e1584d5acd692f38a97bfe39
(cherry picked from commit a87b1b07b91960601c7f39e2b40eba8ad50b1667)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/graphic/grfmgr2.cxx | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/svtools/source/graphic/grfmgr2.cxx b/svtools/source/graphic/grfmgr2.cxx index 3b6a738bde6b..f4696234e9f9 100644 --- a/svtools/source/graphic/grfmgr2.cxx +++ b/svtools/source/graphic/grfmgr2.cxx @@ -200,15 +200,8 @@ namespace void GraphicManager::ImplCheckSizeOfSwappedInGraphics(const GraphicObject* pGraphicToIgnore) { // detect maximum allowed memory footprint. Use the user-settings of MaxCacheSize (defaulted - // to 200MB). Limit to a useful maximum for 32Bit address space - - // max at 500MB; I experimented with 800 for debug and 750 for non-debug settings (pics start - // missing when office reaches a mem footprint of 1.5GB) but some secure left over space for - // app activity is needed - static sal_uLong aMaxSize32Bit(500 * 1024 * 1024); - - // calc max allowed cache size - const sal_uLong nMaxCacheSize(::std::min(GetMaxCacheSize(), aMaxSize32Bit)); + // to 200MB). + const sal_uLong nMaxCacheSize(GetMaxCacheSize()); if(mnUsedSize > nMaxCacheSize) { |