[Libreoffice-commits] .: Branch 'feature/improvexlsximport' - 2 commits - officecfg/registry svx/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Wed Dec 12 01:23:07 PST 2012


 officecfg/registry/schema/org/openoffice/Office/Common.xcs |    2 +-
 svx/source/svdraw/svdetc.cxx                               |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit dd86ce1814588d6bb8fdc4b1e0b165f013e223f5
Author: Noel Power <noel.power at suse.com>
Date:   Wed Dec 12 09:21:22 2012 +0000

    even bodgy-er workaround for a core
    
    please note if you are reading this commit that this is a change on a private
    branch and not something intended to be committed as a *real* fix
    
    Change-Id: I15c49e9282f733268d43f590a4c82bd69a54bd19

diff --git a/svx/source/svdraw/svdetc.cxx b/svx/source/svdraw/svdetc.cxx
index c561e82..4cd85e8 100644
--- a/svx/source/svdraw/svdetc.cxx
+++ b/svx/source/svdraw/svdetc.cxx
@@ -107,7 +107,8 @@ const LocaleDataWrapper*    SdrGlobalData::GetLocaleData()
 OLEObjCache::OLEObjCache()
 :   Container( 0 )
 {
-    nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get();
+    // add fudge factor to avoid core ( not meant for comitting to any real branch )
+    nSize = officecfg::Office::Common::Cache::DrawingEngine::OLE_Objects::get() + 10;
     pTimer = new AutoTimer();
     Link aLink = LINK(this, OLEObjCache, UnloadCheckHdl);
 
commit f1e1c2013dc068cad4f860bd2e04a2ec011973e0
Author: Noel Power <noel.power at suse.com>
Date:   Wed Dec 12 09:12:19 2012 +0000

    Revert "temporary increase of ole object buffer to spare a core"
    
    This reverts commit 1c899d18cd974a569b905d5a5f979597353c8500.

diff --git a/officecfg/registry/schema/org/openoffice/Office/Common.xcs b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
index fe5faed..a0d672b 100644
--- a/officecfg/registry/schema/org/openoffice/Office/Common.xcs
+++ b/officecfg/registry/schema/org/openoffice/Office/Common.xcs
@@ -1689,7 +1689,7 @@
             page through the objects since they do not always need to be loaded
             from the hard drive.</desc>
           </info>
-          <value>30</value>
+          <value>20</value>
         </prop>
       </group>
       <group oor:name="Writer">


More information about the Libreoffice-commits mailing list