From b0ff8deb1130335537df5543da6b4b6eadfe2e99 Mon Sep 17 00:00:00 2001 From: Markus Mohrhard Date: Sat, 24 Nov 2012 16:46:52 +0100 Subject: prevent 100% cpu on switched of autocalc with volatile func, fdo#42260 Actually conditional formats with sitched off autocalc are not working correctly but this patch does not make it worse Change-Id: I44a4450fb7845e5cb2d9b2ac605540722a5bd48e --- sc/source/core/data/conditio.cxx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx index fa719514442b..28def93fa902 100644 --- a/sc/source/core/data/conditio.cxx +++ b/sc/source/core/data/conditio.cxx @@ -665,7 +665,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) if (!pEff1->IsRunning()) // keine 522 erzeugen { //! Changed statt Dirty abfragen !!! - if (pEff1->GetDirty() && !bRelRef1) + if (pEff1->GetDirty() && mpDoc->GetAutoCalc() && !bRelRef1) bDirty = true; if (pEff1->IsValue()) { @@ -694,7 +694,7 @@ void ScConditionEntry::Interpret( const ScAddress& rPos ) { if (!pEff2->IsRunning()) // keine 522 erzeugen { - if (pEff2->GetDirty() && !bRelRef2) + if (pEff2->GetDirty() && mpDoc->GetAutoCalc() && !bRelRef2) bDirty = true; if (pEff2->IsValue()) { -- cgit