diff options
author | Tor Lillqvist <tml@collabora.com> | 2015-10-02 13:25:47 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@collabora.com> | 2015-10-02 13:28:35 +0300 |
commit | 9ad516a00cabba1383bc5c53b133ecc33b1c71ff (patch) | |
tree | bd5b13ff3bbb7257dea5d8fe49c144bd14e5168d /sc/source/core/data/documen7.cxx | |
parent | 5067d31364695d892d4290afb039a9877450fccb (diff) |
Revert "Make fewer calls to officecfg::...::UseOpenCL::get()"
Was not liked.
This reverts commit e4ddba2b5f8ff32dd35e8c8f66f145597407be42.
This reverts commit ab092bdc0f8c45e174cad403de9d2342adc01fb6.
Change-Id: If2e9e032a135530da92b5bd166f5b559b10b0b91
Diffstat (limited to 'sc/source/core/data/documen7.cxx')
-rw-r--r-- | sc/source/core/data/documen7.cxx | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx index 2f8a2d773457..864a77b757b6 100644 --- a/sc/source/core/data/documen7.cxx +++ b/sc/source/core/data/documen7.cxx @@ -17,7 +17,6 @@ * the License at http://www.apache.org/licenses/LICENSE-2.0 . */ -#include <officecfg/Office/Common.hxx> #include <vcl/svapp.hxx> #include "document.hxx" @@ -457,7 +456,6 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet pCell = pFormulaTree; ScFormulaCell* pLastNoGood = 0; - const bool bUseOpenCL(officecfg::Office::Common::Misc::UseOpenCL::get()); while ( pCell ) { // Interpret resets bDirty and calls Remove, also the referenced! @@ -465,11 +463,11 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet if ( bOnlyForced ) { if ( pCell->GetCode()->IsRecalcModeForced() ) - pCell->Interpret( bUseOpenCL ); + pCell->Interpret(); } else { - pCell->Interpret( bUseOpenCL ); + pCell->Interpret(); } if ( pCell->GetPrevious() || pCell == pFormulaTree ) { // (IsInFormulaTree(pCell)) no Remove was called => next |