[Libreoffice-commits] core.git: Branch 'libreoffice-5-4' - officecfg/Configuration_officecfg.mk officecfg/registry postprocess/CustomTarget_registry.mk

[Michael Stahl]

 officecfg/Configuration_officecfg.mk                       |    1 +
 officecfg/registry/data/org/openoffice/Office/Common.xcu   |    7 +++++++
 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    2 +-
 postprocess/CustomTarget_registry.mk                       |    5 +++++
 4 files changed, 14 insertions(+), 1 deletion(-)

New commits:
commit 9b29852c76884cf440043ea9484893c667db3214
Author: Michael Stahl <mstahl at redhat.com>
Date:   Fri Jul 14 15:31:20 2017 +0200

    officecfg: increase GraphicManager/TotalCacheSize again for 64-bit
    
    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
    (cherry picked from commit 55baf61c08630e0c09a87d99519211467818ef8c)
    Reviewed-on: https://gerrit.libreoffice.org/39969
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/officecfg/Configuration_officecfg.mk b/officecfg/Configuration_officecfg.mk
index b157784df702..ccaa35aea0a9 100644
--- a/officecfg/Configuration_officecfg.mk
+++ b/officecfg/Configuration_officecfg.mk
@@ -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-wnt.xcu \
 	org/openoffice/Office/Common-UseOOoFileDialogs.xcu \
+	org/openoffice/Office/Common-32bit.xcu \
 	org/openoffice/Office/Jobs-impress.xcu \
 	org/openoffice/Office/Linguistic-ForceDefaultLanguage.xcu \
 	org/openoffice/Office/ProtocolHandler-impress.xcu \
diff --git a/officecfg/registry/data/org/openoffice/Office/Common.xcu b/officecfg/registry/data/org/openoffice/Office/Common.xcu
index eef41786feed..f84bd1a8eeb6 100644
--- a/officecfg/registry/data/org/openoffice/Office/Common.xcu
+++ b/officecfg/registry/data/org/openoffice/Office/Common.xcu
@@ -506,6 +506,13 @@
       </prop>
     </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="Current">
       <prop oor:name="Temp" oor:type="xs:string">
diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index c07acff7c7fe..b3998b6eb52d 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1495,7 +1495,7 @@
             objects.</desc>
             <label>Total Image Cache Size</label>
           </info>
-          <value>200000000</value>
+          <value>400000000</value>
         </prop>
         <prop oor:name="ObjectCacheSize" oor:type="xs:int" oor:nillable="false">
           <info>
diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk
index d71b762c873a..cc12759f676b 100644
--- a/postprocess/CustomTarget_registry.mk
+++ b/postprocess/CustomTarget_registry.mk
@@ -353,6 +353,11 @@ else
 postprocess_FILES_main += $(postprocess_MOD)/org/openoffice/Office/Paths-internallibexttextcatdata.xcu
 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_FILES_math := \
 	$(postprocess_XCS)/Office/UI/MathCommands.xcs \