summaryrefslogtreecommitdiff
path: root/sc
diff options
context:
space:
mode:
authorMatteo Casalin <matteo.casalin@yahoo.com>2019-02-10 18:06:22 +0100
committerMarkus Mohrhard <markus.mohrhard@googlemail.com>2019-02-16 13:20:36 +0100
commit0bfbd186cc1c8bb5332209eadb7efa58d13e2e66 (patch)
treedc2f90e311ad6e5b9441c7298f108be0e70f1014 /sc
parent097d76b110be2595e1c0bbd3fde171ae849bb361 (diff)
Same token is used in both branches of if/else
Change-Id: I6d678b2969f0e16afe7f7f88e0610175553714b5 Reviewed-on: https://gerrit.libreoffice.org/67651 Tested-by: Jenkins Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'sc')
-rw-r--r--sc/source/ui/view/viewdata.cxx10
1 files changed, 6 insertions, 4 deletions
diff --git a/sc/source/ui/view/viewdata.cxx b/sc/source/ui/view/viewdata.cxx
index 0991ec545eea..823150303fe0 100644
--- a/sc/source/ui/view/viewdata.cxx
+++ b/sc/source/ui/view/viewdata.cxx
@@ -2902,21 +2902,23 @@ void ScViewData::ReadUserData(const OUString& rData)
maTabData[nPos]->eHSplitMode = static_cast<ScSplitMode>(aTabOpt.getToken(0, cTabSep, nIdx).toInt32());
maTabData[nPos]->eVSplitMode = static_cast<ScSplitMode>(aTabOpt.getToken(0, cTabSep, nIdx).toInt32());
+ sal_Int32 nTmp{ aTabOpt.getToken(0, cTabSep, nIdx).toInt32() };
if ( maTabData[nPos]->eHSplitMode == SC_SPLIT_FIX )
{
- maTabData[nPos]->nFixPosX = SanitizeCol( static_cast<SCCOL>(aTabOpt.getToken(0, cTabSep, nIdx).toInt32()));
+ maTabData[nPos]->nFixPosX = SanitizeCol( static_cast<SCCOL>(nTmp));
UpdateFixX(nPos);
}
else
- maTabData[nPos]->nHSplitPos = aTabOpt.getToken(0, cTabSep, nIdx).toInt32();
+ maTabData[nPos]->nHSplitPos = nTmp;
+ nTmp = aTabOpt.getToken(0, cTabSep, nIdx).toInt32();
if ( maTabData[nPos]->eVSplitMode == SC_SPLIT_FIX )
{
- maTabData[nPos]->nFixPosY = SanitizeRow( aTabOpt.getToken(0, cTabSep, nIdx).toInt32());
+ maTabData[nPos]->nFixPosY = SanitizeRow(nTmp);
UpdateFixY(nPos);
}
else
- maTabData[nPos]->nVSplitPos = aTabOpt.getToken(0, cTabSep, nIdx).toInt32();
+ maTabData[nPos]->nVSplitPos = nTmp;
maTabData[nPos]->eWhichActive = static_cast<ScSplitPos>(aTabOpt.getToken(0, cTabSep, nIdx).toInt32());
maTabData[nPos]->nPosX[0] = SanitizeCol( static_cast<SCCOL>(aTabOpt.getToken(0, cTabSep, nIdx).toInt32()));