loplugin:commaoperator in sc/

Change-Id: Id3f21f80c1ce83293d10c29c8035a0e74e076f80

21 files changed, 166 insertions, 51 deletions

diff --git a/sc/source/core/data/documen2.cxx b/sc/source/core/data/documen2.cxx
index 8b114695e242..3e7c8d82512e 100644
--- a/sc/source/core/data/documen2.cxx
+++ b/sc/source/core/data/documen2.cxx
@@ -365,7 +365,8 @@ ScDocument::~ScDocument()
     {   // To be sure there isn't anything running do it with a protector,
         // this ensures also that nothing needs the control anymore.
         ScRefreshTimerProtector aProt( GetRefreshTimerControlAddress() );
-        delete pRefreshTimerControl, pRefreshTimerControl = nullptr;
+        delete pRefreshTimerControl;
+        pRefreshTimerControl = nullptr;
     }
 
     mxFormulaParserPool.reset();
diff --git a/sc/source/core/data/drwlayer.cxx b/sc/source/core/data/drwlayer.cxx
index d6b26b81091f..898815d74b75 100644
--- a/sc/source/core/data/drwlayer.cxx
+++ b/sc/source/core/data/drwlayer.cxx
@@ -343,8 +343,10 @@ ScDrawLayer::~ScDrawLayer()
     delete pUndoGroup;
     if( !--nInst )
     {
-        delete pFac, pFac = nullptr;
-        delete pF3d, pF3d = nullptr;
+        delete pFac;
+        pFac = nullptr;
+        delete pF3d;
+        pF3d = nullptr;
     }
 }
 
diff --git a/sc/source/core/data/formulacell.cxx b/sc/source/core/data/formulacell.cxx
index 0393b997560b..b6d9c392d914 100644
--- a/sc/source/core/data/formulacell.cxx
+++ b/sc/source/core/data/formulacell.cxx
@@ -350,7 +350,8 @@ lcl_checkIfAdjacent(
     Iter aBegin(rReferences.begin());
     Iter aEnd(rReferences.end());
     Iter aBegin1(aBegin);
-    ++aBegin1, --aEnd;
+    ++aBegin1;
+    --aEnd;
     return std::equal(aBegin, aEnd, aBegin1, AdjacentByReference(rPos, aWhich));
 }
 
diff --git a/sc/source/core/data/table1.cxx b/sc/source/core/data/table1.cxx
index 7761828d1359..df8284aeea70 100644
--- a/sc/source/core/data/table1.cxx
+++ b/sc/source/core/data/table1.cxx
@@ -917,13 +917,25 @@ bool ScTable::ShrinkToUsedDataArea( bool& o_bShrunk, SCCOL& rStartCol, SCROW& rS
     PutInOrder( rStartCol, rEndCol);
     PutInOrder( rStartRow, rEndRow);
     if (rStartCol < 0)
-        rStartCol = 0, o_bShrunk = true;
+    {
+        rStartCol = 0;
+        o_bShrunk = true;
+    }
     if (rStartRow < 0)
-        rStartRow = 0, o_bShrunk = true;
+    {
+        rStartRow = 0;
+        o_bShrunk = true;
+    }
     if (rEndCol > MAXCOL)
-        rEndCol = MAXCOL, o_bShrunk = true;
+    {
+        rEndCol = MAXCOL;
+        o_bShrunk = true;
+    }
     if (rEndRow > MAXROW)
-        rEndRow = MAXROW, o_bShrunk = true;
+    {
+        rEndRow = MAXROW;
+        o_bShrunk = true;
+    }
 
     while (rStartCol < rEndCol)
     {
diff --git a/sc/source/core/data/table3.cxx b/sc/source/core/data/table3.cxx
index 2820b9acbe59..67d9e3e23e71 100644
--- a/sc/source/core/data/table3.cxx
+++ b/sc/source/core/data/table3.cxx
@@ -1156,7 +1156,8 @@ void ScTable::SortReorderByRow(
 
         aSpans = sc::toSpanArray<SCROW,sc::RowSpan>(aRowFlags.maRowsFiltered, nRow1);
 
-        it = aSpans.begin(), itEnd = aSpans.end();
+        it = aSpans.begin();
+        itEnd = aSpans.end();
         for (; it != itEnd; ++it)
             SetRowFiltered(it->mnRow1, it->mnRow2, true);
     }
@@ -1353,7 +1354,8 @@ void ScTable::SortReorderByRowRefUpdate(
 
         aSpans = sc::toSpanArray<SCROW,sc::RowSpan>(aRowFlags.maRowsFiltered, nRow1);
 
-        it = aSpans.begin(), itEnd = aSpans.end();
+        it = aSpans.begin();
+        itEnd = aSpans.end();
         for (; it != itEnd; ++it)
             SetRowFiltered(it->mnRow1, it->mnRow2, true);
     }
diff --git a/sc/source/core/tool/address.cxx b/sc/source/core/tool/address.cxx
index 99de6b3dd324..6849db3c0b0b 100644
--- a/sc/source/core/tool/address.cxx
+++ b/sc/source/core/tool/address.cxx
@@ -841,7 +841,10 @@ static inline const sal_Unicode* lcl_a1_get_col( const sal_Unicode* p,
     SCCOL nCol;
 
     if( *p == '$' )
-        *nFlags |= SCA_COL_ABSOLUTE, p++;
+    {
+        *nFlags |= SCA_COL_ABSOLUTE;
+        p++;
+    }
 
     if( !rtl::isAsciiAlpha( *p ) )
         return nullptr;
@@ -866,7 +869,10 @@ static inline const sal_Unicode* lcl_a1_get_row( const sal_Unicode* p,
     long int n;
 
     if( *p == '$' )
-        *nFlags |= SCA_ROW_ABSOLUTE, p++;
+    {
+        *nFlags |= SCA_ROW_ABSOLUTE;
+        p++;
+    }
 
     n = sal_Unicode_strtol( p, &pEnd ) - 1;
     if( nullptr == pEnd || p == pEnd || n < 0 || n > MAXROW )
@@ -1083,7 +1089,10 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDo
         if ( bExtDoc )
             nRes |= SCA_TAB_ABSOLUTE;
         if (*p == '$')
-            nRes |= SCA_TAB_ABSOLUTE, p++;
+        {
+            nRes |= SCA_TAB_ABSOLUTE;
+            p++;
+        }
 
         if (*p == '\'')
         {
@@ -1141,7 +1150,10 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDo
     {
         nBits = SCA_VALID_COL;
         if (*p == '$')
-            nBits |= SCA_COL_ABSOLUTE, p++;
+        {
+            nBits |= SCA_COL_ABSOLUTE;
+            p++;
+        }
 
         if (rtl::isAsciiAlpha( *p ))
         {
@@ -1164,7 +1176,10 @@ static sal_uInt16 lcl_ScAddress_Parse_OOo( const sal_Unicode* p, ScDocument* pDo
     {
         nBits = SCA_VALID_ROW;
         if (*p == '$')
-            nBits |= SCA_ROW_ABSOLUTE, p++;
+        {
+            nBits |= SCA_ROW_ABSOLUTE;
+            p++;
+        }
         if( !rtl::isAsciiDigit( *p ) )
         {
             nBits = 0;
diff --git a/sc/source/core/tool/interpr2.cxx b/sc/source/core/tool/interpr2.cxx
index ef2277ada4bd..71270282ac67 100644
--- a/sc/source/core/tool/interpr2.cxx
+++ b/sc/source/core/tool/interpr2.cxx
@@ -68,7 +68,11 @@ double ScInterpreter::GetDateSerial( sal_Int16 nYear, sal_Int16 nMonth, sal_Int1
     // performance penalty.
     sal_Int16 nY, nM, nD;
     if (bStrict)
-        nY = nYear, nM = nMonth, nD = nDay;
+    {
+        nY = nYear;
+        nM = nMonth;
+        nD = nDay;
+    }
     else
     {
         if (nMonth > 0)
@@ -2154,7 +2158,8 @@ void ScInterpreter::ScIntersect()
                 xt[i]->GetRefList()->push_back( aRef);
             }
         }
-        x1 = xt[0], x2 = xt[1];
+        x1 = xt[0];
+        x2 = xt[1];
 
         ScTokenRef xRes = new ScRefListToken;
         ScRefList* pRefList = xRes->GetRefList();
diff --git a/sc/source/core/tool/interpr4.cxx b/sc/source/core/tool/interpr4.cxx
index dfa669363745..ef9aa923268f 100644
--- a/sc/source/core/tool/interpr4.cxx
+++ b/sc/source/core/tool/interpr4.cxx
@@ -477,7 +477,10 @@ bool ScInterpreter::CreateStringArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                         nPos += 10 + nStrLen + 1;
                         sal_uInt8* q = ( pCellArr + nPos );
                         if( (nStrLen & 1) == 0 )
-                            *q++ = 0, nPos++;
+                        {
+                            *q++ = 0;
+                            nPos++;
+                        }
                         p = reinterpret_cast<sal_uInt16*>( pCellArr + nPos );
                         nCount++;
                     }
@@ -593,7 +596,10 @@ bool ScInterpreter::CreateCellArr(SCCOL nCol1, SCROW nRow1, SCTAB nTab1,
                             nPos += 2 + nStrLen + 1;
                             sal_uInt8* q = ( pCellArr + nPos );
                             if( (nStrLen & 1) == 0 )
-                                *q++ = 0, nPos++;
+                            {
+                                *q++ = 0;
+                                nPos++;
+                            }
                         }
                         nCount++;
                         p = reinterpret_cast<sal_uInt16*>( pCellArr + nPos );
@@ -891,11 +897,20 @@ void ScInterpreter::SingleRefToVars( const ScSingleRefData & rRef,
         rTab = rRef.Tab();
 
     if( !ValidCol( rCol) || rRef.IsColDeleted() )
-        SetError( errNoRef ), rCol = 0;
+    {
+        SetError( errNoRef );
+        rCol = 0;
+    }
     if( !ValidRow( rRow) || rRef.IsRowDeleted() )
-        SetError( errNoRef ), rRow = 0;
+    {
+        SetError( errNoRef );
+        rRow = 0;
+    }
     if( !ValidTab( rTab, pDok->GetTableCount() - 1) || rRef.IsTabDeleted() )
-        SetError( errNoRef ), rTab = 0;
+    {
+        SetError( errNoRef );
+        rTab = 0;
+    }
 }
 
 void ScInterpreter::PopSingleRef(SCCOL& rCol, SCROW &rRow, SCTAB& rTab)
@@ -3198,7 +3213,10 @@ bool ScInterpreter::SetSbxVariable( SbxVariable* pVar, const ScAddress& rPos )
                         pVar->PutString(aCell.mpFormula->GetString().getString());
                 }
                 else
-                    SetError( nErr ), bOk = false;
+                {
+                    SetError( nErr );
+                    bOk = false;
+                }
                 break;
             default :
                 pVar->PutDouble( 0.0 );
diff --git a/sc/source/core/tool/stringutil.cxx b/sc/source/core/tool/stringutil.cxx
index 7b9e0aa20ad6..70313ffbaad1 100644
--- a/sc/source/core/tool/stringutil.cxx
+++ b/sc/source/core/tool/stringutil.cxx
@@ -386,7 +386,7 @@ sal_Int32 ScStringUtil::GetQuotedTokenCount(const OUString &rIn, const OUString&
                 ++nTokCount;
         }
 
-        ++pStr,
+        ++pStr;
         ++nIndex;
     }
 
@@ -449,7 +449,7 @@ OUString ScStringUtil::GetQuotedToken(const OUString &rIn, sal_Int32 nToken, con
             }
         }
 
-        ++pStr,
+        ++pStr;
         ++i;
     }
 
diff --git a/sc/source/filter/excel/xename.cxx b/sc/source/filter/excel/xename.cxx
index f4ed5eb51dcb..8ebe8117c4c1 100644
--- a/sc/source/filter/excel/xename.cxx
+++ b/sc/source/filter/excel/xename.cxx
@@ -652,7 +652,8 @@ void XclExpNameManagerImpl::CreateUserNames()
     ScRangeName::TabNameCopyMap::iterator tabIt = rLocalNames.begin(), tabItEnd = rLocalNames.end();
     for (; tabIt != tabItEnd; ++tabIt)
     {
-        itr = tabIt->second->begin(), itrEnd = tabIt->second->end();
+        itr = tabIt->second->begin();
+        itrEnd = tabIt->second->end();
         for (; itr != itrEnd; ++itr)
         {
             // skip definitions of shared formulas
diff --git a/sc/source/filter/qpro/qproform.cxx b/sc/source/filter/qpro/qproform.cxx
index 770aa6e8d9f6..d3e2b6e06d74 100644
--- a/sc/source/filter/qpro/qproform.cxx
+++ b/sc/source/filter/qpro/qproform.cxx
@@ -239,7 +239,12 @@ ConvErr QProToSc::Convert( const ScTokenArray*& pArray, sal_uInt16 /*nLen*/, con
     else
         return ConvErrCount;
 
-    i = 0, nIntCount = 0, nFloatCount = 0, nDLLCount = 0, nArgCount = 0, nStringCount =0;
+    i = 0;
+    nIntCount = 0;
+    nFloatCount = 0;
+    nDLLCount = 0;
+    nArgCount = 0;
+    nStringCount = 0;
 
     while( i < nRef && ( nFmla[ i ] != 0x03 ) )
     {
diff --git a/sc/source/ui/app/inputwin.cxx b/sc/source/ui/app/inputwin.cxx
index 6dd2e8fd06f1..a5cf267223d6 100644
--- a/sc/source/ui/app/inputwin.cxx
+++ b/sc/source/ui/app/inputwin.cxx
@@ -1683,8 +1683,8 @@ static sal_Int32 findFirstNonMatchingChar(const OUString& rStr1, const OUString&
         // Abort on the first unmatching char
         if ( *pStr1 != *pStr2 )
             return i;
-        ++pStr1,
-        ++pStr2,
+        ++pStr1;
+        ++pStr2;
         ++i;
     }
 
diff --git a/sc/source/ui/docshell/dbdocfun.cxx b/sc/source/ui/docshell/dbdocfun.cxx
index 306fd1b16076..d3c7553bcb89 100644
--- a/sc/source/ui/docshell/dbdocfun.cxx
+++ b/sc/source/ui/docshell/dbdocfun.cxx
@@ -694,7 +694,10 @@ bool ScDBDocFunc::Query( SCTAB nTab, const ScQueryParam& rQueryParam,
                                     ( aLocalParam.bHasHeader ? 1 : 0 );
                 while ( nTestCol <= MAXCOL &&
                         rDoc.GetCellType(ScAddress( nTestCol, nTestRow, nTab )) == CELLTYPE_FORMULA )
-                    ++nTestCol, ++nFormulaCols;
+                {
+                    ++nTestCol;
+                    ++nFormulaCols;
+                }
             }
 
             bKeepFmt = pDestData->IsKeepFmt();
diff --git a/sc/source/ui/docshell/dbdocimp.cxx b/sc/source/ui/docshell/dbdocimp.cxx
index 1f258da9a526..2d78db661065 100644
--- a/sc/source/ui/docshell/dbdocimp.cxx
+++ b/sc/source/ui/docshell/dbdocimp.cxx
@@ -401,7 +401,10 @@ bool ScDBDocFunc::DoImport( SCTAB nTab, const ScImportParam& rParam,
         SCROW nTestRow = rParam.nRow1 + 1;      // below the title row
         while ( nTestCol <= MAXCOL &&
                 rDoc.GetCellType(ScAddress( nTestCol, nTestRow, nTab )) == CELLTYPE_FORMULA )
-            ++nTestCol, ++nFormulaCols;
+        {
+            ++nTestCol;
+            ++nFormulaCols;
+        }
     }
 
     if (bSuccess)
diff --git a/sc/source/ui/docshell/docfunc.cxx b/sc/source/ui/docshell/docfunc.cxx
index 4cc3fd25e228..4d413d790884 100644
--- a/sc/source/ui/docshell/docfunc.cxx
+++ b/sc/source/ui/docshell/docfunc.cxx
@@ -2400,7 +2400,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
 
     if ( bRecord )
     {
-        itr = aFullMark.begin(), itrEnd = aFullMark.end();
+        itr = aFullMark.begin();
+        itrEnd = aFullMark.end();
         for (; itr != itrEnd && *itr < nTabCount; ++itr)
             pRefUndoDoc->DeleteAreaTab(nUndoStartCol,nUndoStartRow,nUndoEndCol,nUndoEndRow, *itr, InsertDeleteFlags::ALL);
 
@@ -2415,7 +2416,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
         SCTAB* pScenarios = new SCTAB[nSelCount];
         SCTAB   nUndoPos  = 0;
 
-        itr = aMark.begin(), itrEnd = aMark.end();
+        itr = aMark.begin();
+        itrEnd = aMark.end();
         for (; itr != itrEnd && *itr < nTabCount; ++itr)
         {
             SCTAB nCount = 0;
@@ -2504,7 +2506,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
 
         rDoc.ApplyPatternArea( nExtendStartCol, nExtendStartRow, nMergeTestEndCol, nMergeTestEndRow, aMark, aPattern );
 
-        itr = aMark.begin(), itrEnd = aMark.end();
+        itr = aMark.begin();
+        itrEnd = aMark.end();
         for (; itr != itrEnd && *itr < nTabCount; ++itr)
         {
             SCTAB nScenarioCount = 0;
@@ -2517,7 +2520,8 @@ bool ScDocFunc::DeleteCells( const ScRange& rRange, const ScMarkData* pTabMark,
         }
     }
 
-    itr = aMark.begin(), itrEnd = aMark.end();
+    itr = aMark.begin();
+    itrEnd = aMark.end();
     for (; itr != itrEnd && *itr < nTabCount; ++itr)
     {
         rDoc.SetDrawPageSize(*itr);
diff --git a/sc/source/ui/miscdlgs/solvrdlg.cxx b/sc/source/ui/miscdlgs/solvrdlg.cxx
index 28df67176ec7..5cf45106c185 100644
--- a/sc/source/ui/miscdlgs/solvrdlg.cxx
+++ b/sc/source/ui/miscdlgs/solvrdlg.cxx
@@ -59,7 +59,7 @@ ScSolverDlg::ScSolverDlg( SfxBindings* pB, SfxChildWindow* pCW, vcl::Window* pPa
     get(m_pEdFormulaCell, "formulaedit");
     m_pEdFormulaCell->SetReferences(this, m_pFtFormulaCell);
     get(m_pRBFormulaCell, "formulabutton");
-    m_pRBFormulaCell->SetReferences(this, m_pEdFormulaCell),
+    m_pRBFormulaCell->SetReferences(this, m_pEdFormulaCell);
     get(m_pEdTargetVal, "target");
     get(m_pFtVariableCell, "vartext");
     get(m_pEdVariableCell, "varedit");
diff --git a/sc/source/ui/optdlg/tpview.cxx b/sc/source/ui/optdlg/tpview.cxx
index a3f0dcbdd73d..110cb3038c06 100644
--- a/sc/source/ui/optdlg/tpview.cxx
+++ b/sc/source/ui/optdlg/tpview.cxx
@@ -286,7 +286,8 @@ void ScTpContentOptions::InitGridOpt()
 
     if ( bGrid || bGridOnTop )
     {
-        pColorFT->Enable(), pColorLB->Enable();
+        pColorFT->Enable();
+        pColorLB->Enable();
         if ( !bGridOnTop )
             nSelPos = 0;
         else
@@ -294,7 +295,8 @@ void ScTpContentOptions::InitGridOpt()
     }
     else
     {
-        pColorFT->Disable(), pColorLB->Disable();
+        pColorFT->Disable();
+        pColorLB->Disable();
         nSelPos = 2;
     }
 
diff --git a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
index 4623c244cef6..670c55ac9292 100644
--- a/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
+++ b/sc/source/ui/sidebar/CellAppearancePropertyPanel.cxx
@@ -311,7 +311,10 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
 
             if(pBoxItem)
             {
-                mbLeft=false, mbRight=false, mbTop=false, mbBottom=false;
+                mbLeft=false;
+                mbRight=false;
+                mbTop=false;
+                mbBottom=false;
 
                 if(pBoxItem->GetLeft())
                     mbLeft = true;
@@ -348,7 +351,8 @@ void CellAppearancePropertyPanel::NotifyItemUpdate(
             {
                 bool bLeft(false), bRight(false), bTop(false), bBottom(false);
 
-                mbVer = false, mbHor = false;
+                mbVer = false;
+                mbHor = false;
 
                 if(!pBoxInfoItem->IsValid( SvxBoxInfoItemValidFlags::VERT )  || pBoxInfoItem->GetVert())
                     mbVer = true;
diff --git a/sc/source/ui/undo/undodat.cxx b/sc/source/ui/undo/undodat.cxx
index 77e35c40cd34..59c839e36f8e 100644
--- a/sc/source/ui/undo/undodat.cxx
+++ b/sc/source/ui/undo/undodat.cxx
@@ -1303,7 +1303,10 @@ void ScUndoRepeatDB::Undo()
             SCROW nRow = aOldQuery.aStart.Row() + 1;        // test the header
             while ( nCol <= MAXCOL &&
                     rDoc.GetCellType(ScAddress( nCol, nRow, nTab )) == CELLTYPE_FORMULA )
-                ++nCol, ++nFormulaCols;
+            {
+                ++nCol;
+                ++nFormulaCols;
+            }
 
             if ( nFormulaCols > 0 )
             {
diff --git a/sc/source/ui/view/hdrcont.cxx b/sc/source/ui/view/hdrcont.cxx
index f37f4755d9c0..1efe6ea6925e 100644
--- a/sc/source/ui/view/hdrcont.cxx
+++ b/sc/source/ui/view/hdrcont.cxx
@@ -710,9 +710,15 @@ void ScHeaderControl::MouseButtonDown( const MouseEvent& rMEvt )
         Point aPoint;
         Rectangle aVis( aPoint,GetOutputSizePixel() );
         if (bVertical)
-            aVis.Left() = LONG_MIN, aVis.Right() = LONG_MAX;
+        {
+            aVis.Left() = LONG_MIN;
+            aVis.Right() = LONG_MAX;
+        }
         else
-            aVis.Top() = LONG_MIN, aVis.Bottom() = LONG_MAX;
+        {
+            aVis.Top() = LONG_MIN;
+            aVis.Bottom() = LONG_MAX;
+        }
         pSelEngine->SetVisibleArea( aVis );
 
         SetMarking( true );     //  must precede SelMouseButtonDown
diff --git a/sc/source/ui/view/select.cxx b/sc/source/ui/view/select.cxx
index 3bd992734ef6..acc8e8bd9636 100644
--- a/sc/source/ui/view/select.cxx
+++ b/sc/source/ui/view/select.cxx
@@ -352,18 +352,34 @@ bool ScViewFunctionSet::SetCursorAtPoint( const Point& rPointPixel, bool /* bDon
             if ( aEffPos.X() >= aWinSize.Width() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bScroll = false, bDidSwitch = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT );
+                    bScroll = false;
+                    bDidSwitch = true;
+                }
                 else if ( eWhich == SC_SPLIT_BOTTOMLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = false, bDidSwitch = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT );
+                    bScroll = false;
+                    bDidSwitch = true;
+                }
             }
 
         if ( pViewData->GetVSplitMode() == SC_SPLIT_FIX )
             if ( aEffPos.Y() >= aWinSize.Height() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bScroll = false, bDidSwitch = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT );
+                    bScroll = false;
+                    bDidSwitch = true;
+                }
                 else if ( eWhich == SC_SPLIT_TOPRIGHT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bScroll = false, bDidSwitch = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT );
+                    bScroll = false;
+                    bDidSwitch = true;
+                }
             }
     }
 
@@ -819,9 +835,15 @@ bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, bool /* bD
             if ( rPointPixel.X() > aWinSize.Width() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT ), bSwitched = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_TOPRIGHT );
+                    bSwitched = true;
+                }
                 else if ( eWhich == SC_SPLIT_BOTTOMLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT );
+                    bSwitched = true;
+                }
             }
         }
     }
@@ -832,9 +854,15 @@ bool ScHeaderFunctionSet::SetCursorAtPoint( const Point& rPointPixel, bool /* bD
             if ( rPointPixel.Y() > aWinSize.Height() )
             {
                 if ( eWhich == SC_SPLIT_TOPLEFT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT ), bSwitched = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMLEFT );
+                    bSwitched = true;
+                }
                 else if ( eWhich == SC_SPLIT_TOPRIGHT )
-                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT ), bSwitched = true;
+                {
+                    pViewData->GetView()->ActivatePart( SC_SPLIT_BOTTOMRIGHT );
+                    bSwitched = true;
+                }
             }
         }
     }