sc/source/core/data/conditio.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit b0ff8deb1130335537df5543da6b4b6eadfe2e99
Author: Markus Mohrhard <markus.mohrh...@googlemail.com>
Date: Sat Nov 24 16:46:52 2012 +0100
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
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index fa71951..28def93 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())
{
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
