simplify the logic a little

Change-Id: I8ff2bc971fd1ab7acf6c416ae85a03152ca2a3d9

1 files changed, 12 insertions, 16 deletions

diff --git a/sc/source/core/data/documen7.cxx b/sc/source/core/data/documen7.cxx
index b67cce9f6b2e..216bec2cabce 100644
--- a/sc/source/core/data/documen7.cxx
+++ b/sc/source/core/data/documen7.cxx
@@ -424,24 +424,20 @@ void ScDocument::CalcFormulaTree( bool bOnlyForced, bool bProgressBar, bool bSet
         while ( pCell )
         {
             if ( pCell->GetDirty() )
-                pCell = pCell->GetNext();       // all clear
-            else
+                ;   // nothing to do
+            else if ( pCell->GetCode()->IsRecalcModeAlways() )
             {
-                if ( pCell->GetCode()->IsRecalcModeAlways() )
-                {
-                    // pCell and dependents are to be set dirty again, collect
-                    // them first and broadcast afterwards to not break the
-                    // FormulaTree chain here.
-                    vAlwaysDirty.push_back( pCell);
-                    pCell = pCell->GetNext();
-                }
-                else
-                {   // calculate the other single
-                    if( bSetAllDirty )
-                        pCell->SetDirtyVar();
-                    pCell = pCell->GetNext();
-                }
+                // pCell and dependents are to be set dirty again, collect
+                // them first and broadcast afterwards to not break the
+                // FormulaTree chain here.
+                vAlwaysDirty.push_back( pCell);
+            }
+            else if ( bSetAllDirty )
+            {
+                // Force calculating all in tree, without broadcasting.
+                pCell->SetDirtyVar();
             }
+            pCell = pCell->GetNext();
         }
         for (::std::vector<ScFormulaCell*>::iterator it( vAlwaysDirty.begin()), itEnd( vAlwaysDirty.end());
                 it != itEnd; ++it)