mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

officecfg: increase GraphicManager/TotalCacheSize again for 64-bit

Browse Source 
There's a bit of a problem with XFillBitmapItem, which contains a
GraphicObject that can't be swapped because it's a poolable item.

Generally contemptorary hardware has enough RAM that we can easily
increase the cache size to 400M (effectively there's another factor
of 2x), but on legacy 32-bit platforms the address space is getting
scarce, so keep the existing size for those.

Change-Id: I8437f4e8c5421f8ec20e94e4cdf64f867d7760ca
This commit is contained in:
Michael Stahl
2017-07-14 15:31:20 +02:00
parent a03a0cfb1e
commit 55baf61c08
4 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
officecfg/Configuration_officecfg.mk
View File

@@ -84,6 +84,7 @@ $(eval $(call gb_Configuration_add_spool_modules,registry,officecfg/registry/dat
org/openoffice/Office/Common-macosx.xcu \ org/openoffice/Office/Common-macosx.xcu \
org/openoffice/Office/Common-wnt.xcu \ org/openoffice/Office/Common-wnt.xcu \
org/openoffice/Office/Common-UseOOoFileDialogs.xcu \ org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
org/openoffice/Office/Common-32bit.xcu \
org/openoffice/Office/Jobs-impress.xcu \ org/openoffice/Office/Jobs-impress.xcu \
org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \ org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
org/openoffice/Office/ProtocolHandler-impress.xcu \ org/openoffice/Office/ProtocolHandler-impress.xcu \

7
officecfg/registry/data/org/openoffice/Office/Common.xcu
View File

@@ -506,6 +506,13 @@
</prop> </prop>
</node> </node>
</node> </node>
<node oor:name="Cache">
<node oor:name="GraphicManager">
<prop oor:name="TotalCacheSize" oor:type="xs:int">
<value install:module="32bit">200000000</value>
</prop>
</node>
</node>
<node oor:name="Path"> <node oor:name="Path">
<node oor:name="Current"> <node oor:name="Current">
<prop oor:name="Temp" oor:type="xs:string"> <prop oor:name="Temp" oor:type="xs:string">

2
officecfg/registry/schema/org/openoffice/Office/Common.xcs
View File

@@ -1495,7 +1495,7 @@
objects.</desc> objects.</desc>
<label>Total Image Cache Size</label> <label>Total Image Cache Size</label>
</info> </info>
<value>200000000</value> <value>400000000</value>
</prop> </prop>
<prop oor:name="ObjectCacheSize" oor:type="xs:int" oor:nillable="false"> <prop oor:name="ObjectCacheSize" oor:type="xs:int" oor:nillable="false">
<info> <info>

5
postprocess/CustomTarget_registry.mk
View File

@@ -351,6 +351,11 @@ else
postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibexttextcatdata.xcu postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibexttextcatdata.xcu
endif endif
ifneq ($(filter $(CPUNAME),POWERPC INTEL ARM HPPA GODSON M68K SPARC S390),)
postprocess_FILES_main += \
$(postprocess_MOD)/org/openoffice/Office/Common-32bit.xcu
endif
postprocess_DEPS_math := main postprocess_DEPS_math := main
postprocess_FILES_math := \ postprocess_FILES_math := \
$(postprocess_XCS)/Office/UI/MathCommands.xcs \ $(postprocess_XCS)/Office/UI/MathCommands.xcs \