[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - sc/source

[Gabor Kelemen]

 sc/source/ui/optdlg/tpcalc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 41a780a589151afa1159403231c59c57bc8a1bc8
Author: Gabor Kelemen <kelemeng at ubuntu.com>
Date:   Tue Jul 3 07:41:47 2018 +0200

    tdf#118452 Don't crash when multi thread calculation is disabled
    
    ...by default configuration.
    
    Change-Id: If6075ae66537f613434dd38766324436f2426517
    Reviewed-on: https://gerrit.libreoffice.org/56840
    Tested-by: Jenkins
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    (cherry picked from commit e119194aeec907f3d02cb914e5afde5ac763df7c)
    Reviewed-on: https://gerrit.libreoffice.org/56856

diff --git a/sc/source/ui/optdlg/tpcalc.cxx b/sc/source/ui/optdlg/tpcalc.cxx
index 4ec601a23ac6..764d55d98e57 100644
--- a/sc/source/ui/optdlg/tpcalc.cxx
+++ b/sc/source/ui/optdlg/tpcalc.cxx
@@ -183,7 +183,7 @@ void ScTpCalcOptions::Reset( const SfxItemSet* /* rCoreAttrs */ )
         m_pEdPrec->SetValue(nPrec);
     }
 
-    m_pBtnThread->Enable();
+    m_pBtnThread->Enable( !officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::isReadOnly() );
     m_pBtnThread->Check( officecfg::Office::Calc::Formula::Calculation::UseThreadedCalculationForFormulaGroups::get() );
 
     CheckClickHdl(m_pBtnIterate);