[Libreoffice-commits] core.git: Branch 'distro/lhm/libreoffice-5-2+backports' - sw/source

Libreoffice Gerrit user logerrit at kemper.freedesktop.org
Tue Aug 14 14:33:49 UTC 2018


 sw/source/core/ole/ndole.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit e15e80c23f19c5ce45874c65196b676ac78a0716
Author:     Armin Le Grand <Armin.Le.Grand at cib.de>
AuthorDate: Fri Jul 8 18:11:42 2016 +0200
Commit:     Thorsten Behrens <Thorsten.Behrens at CIB.de>
CommitDate: Tue Aug 14 16:32:56 2018 +0200

    Disabled async/parallel chart loading for now
    
    Need to check deeper for circumstances leading to problems
    
    Change-Id: I58c9601008edc53c958d59d04a30d11bc0c1bba3
    (cherry picked from commit be08f61d6f4121079c534af386139db23d0dd2c3)

diff --git a/sw/source/core/ole/ndole.cxx b/sw/source/core/ole/ndole.cxx
index 1be81749133e..a2338c00183c 100644
--- a/sw/source/core/ole/ndole.cxx
+++ b/sw/source/core/ole/ndole.cxx
@@ -1111,7 +1111,9 @@ drawinglayer::primitive2d::Primitive2DContainer SwOLEObj::tryToGetChartContentAs
             // loaded using own instance of comphelper::ThreadPool,
             // see getLocalThreadPool(). Disable via bool below if
             // trouble surfaces somewhere
-            static bool bAnynchronousLoadingAllowed = true;
+
+            // disabled fro now, need to check deeper
+            static bool bAnynchronousLoadingAllowed = false;
 
             if(bSynchron ||
                 !bAnynchronousLoadingAllowed ||


More information about the Libreoffice-commits mailing list