cid#1583700 Uninitialized scalar variable

and

cid#1583699 Uninitialized scalar variable
cid#1583695 Uninitialized scalar variable
cid#1583694 Uninitialized scalar variable
cid#1583693 Uninitialized scalar field
cid#1583692 Uninitialized scalar variable
cid#1583691 Uninitialized scalar variable

Change-Id: I0d525d6231fe81e1cea63601bc42c3ad72808082
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/161745
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolan.mcnamara@collabora.com>

4 files changed, 9 insertions, 8 deletions

diff --git a/sc/inc/refupdatecontext.hxx b/sc/inc/refupdatecontext.hxx
index 50eb60c88d18..7789dfdc3a9e 100644
--- a/sc/inc/refupdatecontext.hxx
+++ b/sc/inc/refupdatecontext.hxx
@@ -113,7 +113,7 @@ struct RefUpdateResult
      */
     bool mbNameModified;
 
-    SCTAB nTab;
+    SCTAB mnTab;
 
     RefUpdateResult();
 };
diff --git a/sc/source/core/data/conditio.cxx b/sc/source/core/data/conditio.cxx
index 04ee4e6fc239..13859539f385 100644
--- a/sc/source/core/data/conditio.cxx
+++ b/sc/source/core/data/conditio.cxx
@@ -598,12 +598,12 @@ void ScConditionEntry::UpdateDeleteTab( sc::RefUpdateDeleteTabContext& rCxt )
 void ScConditionEntry::UpdateMoveTab(sc::RefUpdateMoveTabContext& rCxt)
 {
     sc::RefUpdateResult aResFinal;
-    aResFinal.nTab = aSrcPos.Tab();
+    aResFinal.mnTab = aSrcPos.Tab();
     if (pFormula1)
     {
         sc::RefUpdateResult aRes = pFormula1->AdjustReferenceOnMovedTab(rCxt, aSrcPos);
         if (aRes.mbValueChanged)
-            aResFinal.nTab = aRes.nTab;
+            aResFinal.mnTab = aRes.mnTab;
         pFCell1.reset();
     }
 
@@ -611,12 +611,12 @@ void ScConditionEntry::UpdateMoveTab(sc::RefUpdateMoveTabContext& rCxt)
     {
         sc::RefUpdateResult aRes = pFormula2->AdjustReferenceOnMovedTab(rCxt, aSrcPos);
         if (aRes.mbValueChanged)
-            aResFinal.nTab = aRes.nTab;
+            aResFinal.mnTab = aRes.mnTab;
         pFCell2.reset();
     }
 
-    if (aResFinal.nTab != aSrcPos.Tab())
-        aSrcPos.SetTab(aResFinal.nTab);
+    if (aResFinal.mnTab != aSrcPos.Tab())
+        aSrcPos.SetTab(aResFinal.mnTab);
 
     StartListening();
 }
diff --git a/sc/source/core/data/refupdatecontext.cxx b/sc/source/core/data/refupdatecontext.cxx
index 8faf1f105505..0ce3f175e48f 100644
--- a/sc/source/core/data/refupdatecontext.cxx
+++ b/sc/source/core/data/refupdatecontext.cxx
@@ -96,7 +96,8 @@ ColumnBlockPosition* RefUpdateContext::getBlockPosition(SCTAB nTab, SCCOL nCol)
     return mpBlockPos ? mpBlockPos->getBlockPosition(nTab, nCol) : nullptr;
 }
 
-RefUpdateResult::RefUpdateResult() : mbValueChanged(false), mbReferenceModified(false), mbNameModified(false) {}
+RefUpdateResult::RefUpdateResult()
+    : mbValueChanged(false), mbReferenceModified(false), mbNameModified(false), mnTab(-1) {}
 
 RefUpdateInsertTabContext::RefUpdateInsertTabContext(ScDocument& rDoc, SCTAB nInsertPos, SCTAB nSheets) :
     mrDoc(rDoc), mnInsertPos(nInsertPos), mnSheets(nSheets) {}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index f927f2389450..25c5b6f05f79 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -4420,7 +4420,7 @@ sc::RefUpdateResult ScTokenArray::AdjustReferenceOnMovedTab( const sc::RefUpdate
     {
         aRes.mbReferenceModified = true;
         aRes.mbValueChanged = true;
-        aRes.nTab = aNewPos.Tab(); // this sets the new tab position used when deleting
+        aRes.mnTab = aNewPos.Tab(); // this sets the new tab position used when deleting
     }
 
     TokenPointers aPtrs( pCode.get(), nLen, pRPN, nRPN);