simplify calls to IsStreamValid/SetStreamValid

just add a short-circuit check inside SetStreamValid, and we can
simplify all of the call sites

Change-Id: Ib3d19455c60fe9569faf548b1fefbc274d03574c
Reviewed-on: https://gerrit.libreoffice.org/42267
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

7 files changed, 15 insertions, 31 deletions

diff --git a/sc/source/ui/docshell/arealink.cxx b/sc/source/ui/docshell/arealink.cxx
index 4e4c8ab847af..b81513afd987 100644
--- a/sc/source/ui/docshell/arealink.cxx
+++ b/sc/source/ui/docshell/arealink.cxx
@@ -161,8 +161,7 @@ void ScAreaLink::Closed()
     }
 
     SCTAB nDestTab = aDestArea.aStart.Tab();
-    if (rDoc.IsStreamValid(nDestTab))
-        rDoc.SetStreamValid(nDestTab, false);
+    rDoc.SetStreamValid(nDestTab, false);
 
     SvBaseLink::Closed();
 }
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 308fc524ff64..210bd18e33a2 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -114,8 +114,7 @@ IMPL_LINK( ScDocFunc, NotifyDrawUndo, SdrUndoAction*, pUndoAction, void )
     ScDocument& rDoc = rDocShell.GetDocument();
     SCTAB nTabCount = rDoc.GetTableCount();
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
-        if (rDoc.IsStreamValid(nTab))
-            rDoc.SetStreamValid(nTab, false);
+        rDoc.SetStreamValid(nTab, false);
 }
 
 //  paint row above the range (because of lines after AdjustRowHeight)
@@ -1212,8 +1211,7 @@ bool ScDocFunc::ShowNote( const ScAddress& rPos, bool bShow )
     if( rDoc.IsUndoEnabled() )
         rDocShell.GetUndoManager()->AddUndoAction( new ScUndoShowHideNote( rDocShell, rPos, bShow ) );
 
-    if (rDoc.IsStreamValid(rPos.Tab()))
-        rDoc.SetStreamValid(rPos.Tab(), false);
+     rDoc.SetStreamValid(rPos.Tab(), false);
 
     ScTabView::OnLOKNoteStateChanged(pNote);
 
@@ -1242,8 +1240,7 @@ void ScDocFunc::SetNoteText( const ScAddress& rPos, const OUString& rText, bool
 
     //! Undo !!!
 
-    if (rDoc.IsStreamValid(rPos.Tab()))
-        rDoc.SetStreamValid(rPos.Tab(), false);
+    rDoc.SetStreamValid(rPos.Tab(), false);
 
     rDocShell.PostPaintCell( rPos );
     aModificator.SetDocumentModified();
@@ -1297,8 +1294,7 @@ void ScDocFunc::ReplaceNote( const ScAddress& rPos, const OUString& rNoteText, c
         // repaint cell (to make note marker visible)
         rDocShell.PostPaintCell( rPos );
 
-        if (rDoc.IsStreamValid(rPos.Tab()))
-            rDoc.SetStreamValid(rPos.Tab(), false);
+        rDoc.SetStreamValid(rPos.Tab(), false);
 
         aModificator.SetDocumentModified();
 
@@ -3679,8 +3675,7 @@ bool ScDocFunc::InsertPageBreak( bool bColumn, const ScAddress& rPos,
     rDoc.InvalidatePageBreaks(nTab);
     rDoc.UpdatePageBreaks( nTab );
 
-    if (rDoc.IsStreamValid(nTab))
-        rDoc.SetStreamValid(nTab, false);
+    rDoc.SetStreamValid(nTab, false);
 
     if (bColumn)
     {
@@ -3743,8 +3738,7 @@ bool ScDocFunc::RemovePageBreak( bool bColumn, const ScAddress& rPos,
 
     rDoc.UpdatePageBreaks( nTab );
 
-    if (rDoc.IsStreamValid(nTab))
-        rDoc.SetStreamValid(nTab, false);
+    rDoc.SetStreamValid(nTab, false);
 
     if (bColumn)
     {
diff --git a/sc/source/ui/docshell/docsh.cxx b/sc/source/ui/docshell/docsh.cxx
index 1eea60ecd5d4..19116b128b5e 100644
--- a/sc/source/ui/docshell/docsh.cxx
+++ b/sc/source/ui/docshell/docsh.cxx
@@ -3102,10 +3102,8 @@ void ScDocShell::UseSheetSaveEntries()
         {
             // if no positions were set (for example, export to other format),
             // reset all "valid" flags
-
             for (nTab = 0; nTab < nTabCount; ++nTab)
-                if (aDocument.IsStreamValid(nTab))
-                    aDocument.SetStreamValid(nTab, false);
+                aDocument.SetStreamValid(nTab, false);
         }
     }
 }
diff --git a/sc/source/ui/docshell/docsh4.cxx b/sc/source/ui/docshell/docsh4.cxx
index 9dc6b4bd97af..2067d04761e7 100644
--- a/sc/source/ui/docshell/docsh4.cxx
+++ b/sc/source/ui/docshell/docsh4.cxx
@@ -1284,8 +1284,7 @@ void ScDocShell::DoHardRecalc()
     // use hard recalc also to disable stream-copying of all sheets
     // (somewhat consistent with charts)
     for (SCTAB nTab=0; nTab<nTabCount; nTab++)
-        if (aDocument.IsStreamValid(nTab))
-            aDocument.SetStreamValid(nTab, false);
+        aDocument.SetStreamValid(nTab, false);
 
     PostPaintGridAll();
 }
diff --git a/sc/source/ui/docshell/olinefun.cxx b/sc/source/ui/docshell/olinefun.cxx
index 7e5277232d72..aaa8f3ede600 100644
--- a/sc/source/ui/docshell/olinefun.cxx
+++ b/sc/source/ui/docshell/olinefun.cxx
@@ -110,8 +110,7 @@ void ScOutlineDocFunc::MakeOutline( const ScRange& rRange, bool bColumns, bool b
                                         pUndoTab, bColumns, true ) );
         }
 
-        if (rDoc.IsStreamValid(nTab))
-            rDoc.SetStreamValid(nTab, false);
+        rDoc.SetStreamValid(nTab, false);
 
         PaintPartFlags nParts = PaintPartFlags::NONE;   // Data range hasn't been changed
         if ( bColumns )
@@ -173,8 +172,7 @@ void ScOutlineDocFunc::RemoveOutline( const ScRange& rRange, bool bColumns, bool
                                             pUndoTab, bColumns, false ) );
             }
 
-            if (rDoc.IsStreamValid(nTab))
-                rDoc.SetStreamValid(nTab, false);
+            rDoc.SetStreamValid(nTab, false);
 
             PaintPartFlags nParts = PaintPartFlags::NONE;   // Data range hasn't been changed
             if ( bColumns )
@@ -239,8 +237,7 @@ bool ScOutlineDocFunc::RemoveAllOutlines( SCTAB nTab, bool bRecord )
 
         rDoc.UpdatePageBreaks( nTab );
 
-        if (rDoc.IsStreamValid(nTab))
-            rDoc.SetStreamValid(nTab, false);
+        rDoc.SetStreamValid(nTab, false);
 
         rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab,
                                     PaintPartFlags::Grid | PaintPartFlags::Left | PaintPartFlags::Top | PaintPartFlags::Size );
@@ -306,8 +303,7 @@ void ScOutlineDocFunc::AutoOutline( const ScRange& rRange, bool bRecord )
                                     pUndoDoc, pUndoTab ) );
     }
 
-    if (rDoc.IsStreamValid(nTab))
-        rDoc.SetStreamValid(nTab, false);
+    rDoc.SetStreamValid(nTab, false);
 
     rDocShell.PostPaint( 0,0,nTab, MAXCOL,MAXROW,nTab, PaintPartFlags::Left | PaintPartFlags::Top | PaintPartFlags::Size );
     rDocShell.SetDocumentModified();
diff --git a/sc/source/ui/drawfunc/futext3.cxx b/sc/source/ui/drawfunc/futext3.cxx
index a7a33488b9a9..8b4052657eb7 100644
--- a/sc/source/ui/drawfunc/futext3.cxx
+++ b/sc/source/ui/drawfunc/futext3.cxx
@@ -178,8 +178,7 @@ void FuText::StopEditMode()
 
         // invalidate stream positions only for the affected sheet
         rDoc.LockStreamValid(false);
-        if (rDoc.IsStreamValid(aNotePos.Tab()))
-            rDoc.SetStreamValid(aNotePos.Tab(), false);
+        rDoc.SetStreamValid(aNotePos.Tab(), false);
     }
 }
 
diff --git a/sc/source/ui/view/formatsh.cxx b/sc/source/ui/view/formatsh.cxx
index 479db4170881..e845a5798b44 100644
--- a/sc/source/ui/view/formatsh.cxx
+++ b/sc/source/ui/view/formatsh.cxx
@@ -887,8 +887,7 @@ void ScFormatShell::ExecuteStyle( SfxRequest& rReq )
 
                             SCTAB nTabCount = rDoc.GetTableCount();
                             for (SCTAB nTab=0; nTab<nTabCount; nTab++)
-                                if (rDoc.IsStreamValid(nTab))
-                                    rDoc.SetStreamValid(nTab, false);
+                                rDoc.SetStreamValid(nTab, false);
 
                             sal_uLong nOldFormat = static_cast<const SfxUInt32Item&>(aOldSet.
                                                     Get( ATTR_VALUE_FORMAT )).GetValue();