You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by le...@apache.org on 2012/03/16 09:54:56 UTC
svn commit: r1301380 -
/incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx
Author: leiw
Date: Fri Mar 16 08:54:55 2012
New Revision: 1301380
URL: http://svn.apache.org/viewvc?rev=1301380&view=rev
Log:
#i118546# CPU 100% on switched off AutoCalculate with Conditional Formatting on date values
Modified:
incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx
Modified: incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx
URL: http://svn.apache.org/viewvc/incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx?rev=1301380&r1=1301379&r2=1301380&view=diff
==============================================================================
--- incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx (original)
+++ incubator/ooo/trunk/main/sc/source/core/data/conditio.cxx Fri Mar 16 08:54:55 2012
@@ -633,7 +633,7 @@ void ScConditionEntry::Interpret( const
if (!pEff1->IsRunning()) // keine 522 erzeugen
{
//! Changed statt Dirty abfragen !!!
- if (pEff1->GetDirty() && !bRelRef1)
+ if (pEff1->GetDirty() && !bRelRef1 && pDoc->GetAutoCalc())
bDirty = sal_True;
if (pEff1->IsValue())
{
@@ -662,7 +662,7 @@ void ScConditionEntry::Interpret( const
{
if (!pEff2->IsRunning()) // keine 522 erzeugen
{
- if (pEff2->GetDirty() && !bRelRef2)
+ if (pEff2->GetDirty() && !bRelRef2 && pDoc->GetAutoCalc())
bDirty = sal_True;
if (pEff2->IsValue())
{