loplugin:flatten in sc

Change-Id: Iedb6ca37d1b006131d1fc77eca3303a12ccb60c9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/100401
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

3 files changed, 216 insertions, 215 deletions

diff --git a/sc/source/ui/dbgui/pfiltdlg.cxx b/sc/source/ui/dbgui/pfiltdlg.cxx
index 8ab7a954f440..98b0580bdda9 100644
--- a/sc/source/ui/dbgui/pfiltdlg.cxx
+++ b/sc/source/ui/dbgui/pfiltdlg.cxx
@@ -219,66 +219,66 @@ void ScPivotFilterDlg::FillFieldLists()
     m_xLbField2->append_text(aStrNone);
     m_xLbField3->append_text(aStrNone);
 
-    if ( pDoc )
+    if ( !pDoc )
+        return;
+
+    OUString  aFieldName;
+    SCTAB   nTab        = nSrcTab;
+    SCCOL   nFirstCol   = theQueryData.nCol1;
+    SCROW   nFirstRow   = theQueryData.nRow1;
+    SCCOL   nMaxCol     = theQueryData.nCol2;
+    SCCOL   col = 0;
+
+    for ( col=nFirstCol; col<=nMaxCol; col++ )
     {
-        OUString  aFieldName;
-        SCTAB   nTab        = nSrcTab;
-        SCCOL   nFirstCol   = theQueryData.nCol1;
-        SCROW   nFirstRow   = theQueryData.nRow1;
-        SCCOL   nMaxCol     = theQueryData.nCol2;
-        SCCOL   col = 0;
-
-        for ( col=nFirstCol; col<=nMaxCol; col++ )
+        aFieldName = pDoc->GetString(col, nFirstRow, nTab);
+        if ( aFieldName.isEmpty() )
         {
-            aFieldName = pDoc->GetString(col, nFirstRow, nTab);
-            if ( aFieldName.isEmpty() )
-            {
-                aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
-            }
-            m_xLbField1->append_text(aFieldName);
-            m_xLbField2->append_text(aFieldName);
-            m_xLbField3->append_text(aFieldName);
+            aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
         }
+        m_xLbField1->append_text(aFieldName);
+        m_xLbField2->append_text(aFieldName);
+        m_xLbField3->append_text(aFieldName);
     }
 }
 
 void ScPivotFilterDlg::UpdateValueList( sal_uInt16 nList )
 {
-    if ( pDoc && nList>0 && nList<=3 )
-    {
-        weld::ComboBox* pValList        = aValueEdArr[nList-1];
-        sal_Int32   nFieldSelPos    = aFieldLbArr[nList-1]->get_active();
-        OUString    aCurValue       = pValList->get_active_text();
+    if ( !(pDoc && nList>0 && nList<=3) )
+        return;
 
-        pValList->clear();
-        pValList->append_text(aStrNotEmpty);
-        pValList->append_text(aStrEmpty);
+    weld::ComboBox* pValList        = aValueEdArr[nList-1];
+    sal_Int32   nFieldSelPos    = aFieldLbArr[nList-1]->get_active();
+    OUString    aCurValue       = pValList->get_active_text();
+
+    pValList->clear();
+    pValList->append_text(aStrNotEmpty);
+    pValList->append_text(aStrEmpty);
 
-        if ( pDoc && nFieldSelPos )
+    if ( pDoc && nFieldSelPos )
+    {
+        SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
+        if (!m_pEntryLists[nColumn])
         {
-            SCCOL nColumn = theQueryData.nCol1 + static_cast<SCCOL>(nFieldSelPos) - 1;
-            if (!m_pEntryLists[nColumn])
-            {
-                weld::WaitObject aWaiter(m_xDialog.get());
-
-                SCTAB   nTab        = nSrcTab;
-                SCROW   nFirstRow   = theQueryData.nRow1;
-                SCROW   nLastRow    = theQueryData.nRow2;
-                nFirstRow++;
-                bool bCaseSens = m_xBtnCase->get_active();
-                m_pEntryLists[nColumn].reset( new ScFilterEntries);
-                pDoc->GetFilterEntriesArea(
-                    nColumn, nFirstRow, nLastRow, nTab, bCaseSens, *m_pEntryLists[nColumn]);
-            }
+            weld::WaitObject aWaiter(m_xDialog.get());
+
+            SCTAB   nTab        = nSrcTab;
+            SCROW   nFirstRow   = theQueryData.nRow1;
+            SCROW   nLastRow    = theQueryData.nRow2;
+            nFirstRow++;
+            bool bCaseSens = m_xBtnCase->get_active();
+            m_pEntryLists[nColumn].reset( new ScFilterEntries);
+            pDoc->GetFilterEntriesArea(
+                nColumn, nFirstRow, nLastRow, nTab, bCaseSens, *m_pEntryLists[nColumn]);
+        }
 
-            const ScFilterEntries* pColl = m_pEntryLists[nColumn].get();
-            for (const auto& rEntry : *pColl)
-            {
-                pValList->append_text(rEntry.GetString());
-            }
+        const ScFilterEntries* pColl = m_pEntryLists[nColumn].get();
+        for (const auto& rEntry : *pColl)
+        {
+            pValList->append_text(rEntry.GetString());
         }
-        pValList->set_entry_text(aCurValue);
     }
+    pValList->set_entry_text(aCurValue);
 }
 
 void ScPivotFilterDlg::ClearValueList( sal_uInt16 nList )
@@ -467,21 +467,21 @@ IMPL_LINK(ScPivotFilterDlg, CheckBoxHdl, weld::Button&, rBox, void)
 {
     // update the value lists when dealing with uppercase/lowercase
 
-    if (&rBox == m_xBtnCase.get())                    // value lists
-    {
-        for (auto& a : m_pEntryLists)
-            a.reset();
-
-        OUString aCurVal1 = m_xEdVal1->get_active_text();
-        OUString aCurVal2 = m_xEdVal2->get_active_text();
-        OUString aCurVal3 = m_xEdVal3->get_active_text();
-        UpdateValueList( 1 );
-        UpdateValueList( 2 );
-        UpdateValueList( 3 );
-        m_xEdVal1->set_entry_text(aCurVal1);
-        m_xEdVal2->set_entry_text(aCurVal2);
-        m_xEdVal3->set_entry_text(aCurVal3);
-    }
+    if (&rBox != m_xBtnCase.get())                    // value lists
+        return;
+
+    for (auto& a : m_pEntryLists)
+        a.reset();
+
+    OUString aCurVal1 = m_xEdVal1->get_active_text();
+    OUString aCurVal2 = m_xEdVal2->get_active_text();
+    OUString aCurVal3 = m_xEdVal3->get_active_text();
+    UpdateValueList( 1 );
+    UpdateValueList( 2 );
+    UpdateValueList( 3 );
+    m_xEdVal1->set_entry_text(aCurVal1);
+    m_xEdVal2->set_entry_text(aCurVal2);
+    m_xEdVal3->set_entry_text(aCurVal3);
 }
 
 IMPL_LINK( ScPivotFilterDlg, ValModifyHdl, weld::ComboBox&, rEd, void )
diff --git a/sc/source/ui/dbgui/tpsort.cxx b/sc/source/ui/dbgui/tpsort.cxx
index 2e7ed6e3af8d..5ad843793a37 100644
--- a/sc/source/ui/dbgui/tpsort.cxx
+++ b/sc/source/ui/dbgui/tpsort.cxx
@@ -276,23 +276,23 @@ void ScTabPageSortFields::ActivatePage( const SfxItemSet& rSet )
 {
     // Refresh local copy with shared data
     aSortData = static_cast<const ScSortItem&>(rSet.Get( SCITEM_SORTDATA )).GetSortData();
-    if (ScSortDlg* pDlg = static_cast<ScSortDlg*>(GetDialogController()))
-    {
-        if ( bHasHeader  != pDlg->GetHeaders()
-             || bSortByRows != pDlg->GetByRows() )
-        {
-            std::vector<sal_uInt16> nCurSel;
-            for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
-                nCurSel.push_back( m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->get_active() );
+    ScSortDlg* pDlg = static_cast<ScSortDlg*>(GetDialogController());
+    if (!pDlg)
+        return;
 
-            bHasHeader  = pDlg->GetHeaders();
-            bSortByRows = pDlg->GetByRows();
-            FillFieldLists(0);
+    if ( bHasHeader == pDlg->GetHeaders() && bSortByRows == pDlg->GetByRows() )
+        return;
 
-            for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
-                m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->set_active(nCurSel[i]);
-        }
-    }
+    std::vector<sal_uInt16> nCurSel;
+    for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
+        nCurSel.push_back( m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->get_active() );
+
+    bHasHeader  = pDlg->GetHeaders();
+    bSortByRows = pDlg->GetByRows();
+    FillFieldLists(0);
+
+    for ( sal_uInt16 i=0; i<nSortKeyCount; i++ )
+        m_aSortWin.m_aSortKeyItems[i]->m_xLbSort->set_active(nCurSel[i]);
 }
 
 DeactivateRC ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
@@ -314,77 +314,77 @@ DeactivateRC ScTabPageSortFields::DeactivatePage( SfxItemSet* pSetP )
 
 void ScTabPageSortFields::FillFieldLists( sal_uInt16 nStartField )
 {
-    if ( pViewData )
+    if ( !pViewData )
+        return;
+
+    ScDocument* pDoc = pViewData->GetDocument();
+
+    if ( !pDoc )
+        return;
+
+    for (sal_uInt16 j = nStartField; j < nSortKeyCount; ++j)
+    {
+        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->clear();
+        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->freeze();
+        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->append_text(aStrUndefined);
+    }
+
+    SCCOL   nFirstSortCol   = aSortData.nCol1;
+    SCROW   nFirstSortRow   = aSortData.nRow1;
+    SCTAB   nTab        = pViewData->GetTabNo();
+    sal_uInt16  i           = 1;
+    nFieldArr.clear();
+    nFieldArr.push_back(0);
+
+    if ( bSortByRows )
     {
-        ScDocument* pDoc = pViewData->GetDocument();
+        OUString  aFieldName;
+        SCCOL   nMaxCol = pDoc->ClampToAllocatedColumns(nTab, aSortData.nCol2);
+        SCCOL   col;
 
-        if ( pDoc )
+        for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
         {
-            for (sal_uInt16 j = nStartField; j < nSortKeyCount; ++j)
+            aFieldName = pDoc->GetString(col, nFirstSortRow, nTab);
+            if ( !bHasHeader || aFieldName.isEmpty() )
             {
-                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->clear();
-                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->freeze();
-                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->append_text(aStrUndefined);
+                aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
             }
+            nFieldArr.push_back( col );
 
-            SCCOL   nFirstSortCol   = aSortData.nCol1;
-            SCROW   nFirstSortRow   = aSortData.nRow1;
-            SCTAB   nTab        = pViewData->GetTabNo();
-            sal_uInt16  i           = 1;
-            nFieldArr.clear();
-            nFieldArr.push_back(0);
+            for ( sal_uInt16 j=nStartField; j<nSortKeyCount; j++ )
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->insert_text(i, aFieldName);
 
-            if ( bSortByRows )
-            {
-                OUString  aFieldName;
-                SCCOL   nMaxCol = pDoc->ClampToAllocatedColumns(nTab, aSortData.nCol2);
-                SCCOL   col;
-
-                for ( col=nFirstSortCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
-                {
-                    aFieldName = pDoc->GetString(col, nFirstSortRow, nTab);
-                    if ( !bHasHeader || aFieldName.isEmpty() )
-                    {
-                        aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
-                    }
-                    nFieldArr.push_back( col );
-
-                    for ( sal_uInt16 j=nStartField; j<nSortKeyCount; j++ )
-                        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->insert_text(i, aFieldName);
-
-                    i++;
-                }
-            }
-            else
-            {
-                OUString  aFieldName;
-                SCROW   nMaxRow = aSortData.nRow2;
-                SCROW   row;
-
-                for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ )
-                {
-                    aFieldName = pDoc->GetString(nFirstSortCol, row, nTab);
-                    if ( !bHasHeader || aFieldName.isEmpty() )
-                    {
-                        aFieldName = ScGlobal::ReplaceOrAppend( aStrRow, "%1", OUString::number( row+1));
-                    }
-                    nFieldArr.push_back( row );
-
-                    for ( sal_uInt16 j=nStartField; j<nSortKeyCount; j++ )
-                        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->insert_text(i, aFieldName);
-
-                    i++;
-                }
-            }
+            i++;
+        }
+    }
+    else
+    {
+        OUString  aFieldName;
+        SCROW   nMaxRow = aSortData.nRow2;
+        SCROW   row;
 
-            for (sal_uInt16 j=nStartField; j < nSortKeyCount; ++j)
+        for ( row=nFirstSortRow; row<=nMaxRow && i<SC_MAXFIELDS; row++ )
+        {
+            aFieldName = pDoc->GetString(nFirstSortCol, row, nTab);
+            if ( !bHasHeader || aFieldName.isEmpty() )
             {
-                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->thaw();
+                aFieldName = ScGlobal::ReplaceOrAppend( aStrRow, "%1", OUString::number( row+1));
             }
+            nFieldArr.push_back( row );
 
-            nFieldCount = i;
+            for ( sal_uInt16 j=nStartField; j<nSortKeyCount; j++ )
+                m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->insert_text(i, aFieldName);
+
+            i++;
         }
     }
+
+    for (sal_uInt16 j=nStartField; j < nSortKeyCount; ++j)
+    {
+        m_aSortWin.m_aSortKeyItems[j]->m_xLbSort->thaw();
+    }
+
+    nFieldCount = i;
 }
 
 sal_uInt16 ScTabPageSortFields::GetFieldSelPos( SCCOLROW nField )
@@ -449,22 +449,22 @@ IMPL_LINK( ScTabPageSortFields, SelectHdl, weld::ComboBox&, rLb, void )
 
     // If not selecting the last Listbox, modify the succeeding ones
     ++pIter;
-    if ( std::distance(m_aSortWin.m_aSortKeyItems.begin(), pIter) < nSortKeyCount )
+    if ( std::distance(m_aSortWin.m_aSortKeyItems.begin(), pIter) >= nSortKeyCount )
+        return;
+
+    if ( aSelEntry == aStrUndefined )
     {
-        if ( aSelEntry == aStrUndefined )
+        for ( ; pIter != m_aSortWin.m_aSortKeyItems.end(); ++pIter )
         {
-            for ( ; pIter != m_aSortWin.m_aSortKeyItems.end(); ++pIter )
-            {
-                (*pIter)->m_xLbSort->set_active(0);
+            (*pIter)->m_xLbSort->set_active(0);
 
-                (*pIter)->DisableField();
-            }
-        }
-        else
-        {
-            (*pIter)->EnableField();
+            (*pIter)->DisableField();
         }
-     }
+    }
+    else
+    {
+        (*pIter)->EnableField();
+    }
 }
 
 IMPL_LINK_NOARG(ScTabPageSortFields, ScrollToEndHdl, Timer*, void)
@@ -709,23 +709,24 @@ void ScTabPageSortOptions::ActivatePage( const SfxItemSet& rSet )
 {
     // Refresh local copy with shared data
     aSortData = static_cast<const ScSortItem&>(rSet.Get( SCITEM_SORTDATA )).GetSortData();
-    if (ScSortDlg* pDlg = static_cast<ScSortDlg*>(GetDialogController()))
-    {
-        if ( m_xBtnHeader->get_active() != pDlg->GetHeaders() )
-        {
-            m_xBtnHeader->set_active( pDlg->GetHeaders() );
-        }
+    ScSortDlg* pDlg = static_cast<ScSortDlg*>(GetDialogController());
+    if (!pDlg)
+        return;
 
-        if ( m_xBtnTopDown->get_active() != pDlg->GetByRows() )
-        {
-            m_xBtnTopDown->set_active( pDlg->GetByRows() );
-            m_xBtnLeftRight->set_active( !pDlg->GetByRows() );
-        }
+    if ( m_xBtnHeader->get_active() != pDlg->GetHeaders() )
+    {
+        m_xBtnHeader->set_active( pDlg->GetHeaders() );
+    }
 
-        m_xBtnHeader->set_label( (pDlg->GetByRows())
-                            ? aStrColLabel
-                            : aStrRowLabel );
+    if ( m_xBtnTopDown->get_active() != pDlg->GetByRows() )
+    {
+        m_xBtnTopDown->set_active( pDlg->GetByRows() );
+        m_xBtnLeftRight->set_active( !pDlg->GetByRows() );
     }
+
+    m_xBtnHeader->set_label( (pDlg->GetByRows())
+                        ? aStrColLabel
+                        : aStrRowLabel );
 }
 
 DeactivateRC ScTabPageSortOptions::DeactivatePage( SfxItemSet* pSetP )
@@ -852,23 +853,23 @@ void ScTabPageSortOptions::EdOutPosModHdl()
     OUString  theCurPosStr = m_xEdOutPos->get_text();
     ScRefFlags  nResult = ScAddress().Parse( theCurPosStr, pDoc, pDoc->GetAddressConvention() );
 
-    if ( (nResult & ScRefFlags::VALID) == ScRefFlags::VALID )
-    {
-        bool    bFound  = false;
-        sal_Int32 i = 0;
-        const int nCount = m_xLbOutPos->get_count();
+    if ( (nResult & ScRefFlags::VALID) != ScRefFlags::VALID )
+        return;
 
-        for ( i=2; i<nCount && !bFound; i++ )
-        {
-            OUString aStr = m_xLbOutPos->get_id(i);
-            bFound = (theCurPosStr == aStr);
-        }
+    bool    bFound  = false;
+    sal_Int32 i = 0;
+    const int nCount = m_xLbOutPos->get_count();
 
-        if ( bFound )
-            m_xLbOutPos->set_active(--i);
-        else
-            m_xLbOutPos->set_active(0);
+    for ( i=2; i<nCount && !bFound; i++ )
+    {
+        OUString aStr = m_xLbOutPos->get_id(i);
+        bFound = (theCurPosStr == aStr);
     }
+
+    if ( bFound )
+        m_xLbOutPos->set_active(--i);
+    else
+        m_xLbOutPos->set_active(0);
 }
 
 void ScTabPageSortOptions::FillAlgor()
diff --git a/sc/source/ui/dbgui/tpsubt.cxx b/sc/source/ui/dbgui/tpsubt.cxx
index ed23b10017a6..92ff178eeaef 100644
--- a/sc/source/ui/dbgui/tpsubt.cxx
+++ b/sc/source/ui/dbgui/tpsubt.cxx
@@ -235,38 +235,38 @@ void ScTpSubTotalGroup::FillListBoxes()
 {
     OSL_ENSURE( pViewData && pDoc, "ViewData or Document not found :-/" );
 
-    if ( pViewData && pDoc )
+    if ( !(pViewData && pDoc) )
+        return;
+
+    SCCOL   nFirstCol   = rSubTotalData.nCol1;
+    SCROW   nFirstRow   = rSubTotalData.nRow1;
+    SCTAB   nTab        = pViewData->GetTabNo();
+    SCCOL   nMaxCol     = rSubTotalData.nCol2;
+    SCCOL   col;
+    OUString  aFieldName;
+
+    mxLbGroup->clear();
+    mxLbColumns->clear();
+    mxLbGroup->insert_text(0, aStrNone );
+
+    sal_uInt16 i=0;
+    for ( col=nFirstCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
     {
-        SCCOL   nFirstCol   = rSubTotalData.nCol1;
-        SCROW   nFirstRow   = rSubTotalData.nRow1;
-        SCTAB   nTab        = pViewData->GetTabNo();
-        SCCOL   nMaxCol     = rSubTotalData.nCol2;
-        SCCOL   col;
-        OUString  aFieldName;
-
-        mxLbGroup->clear();
-        mxLbColumns->clear();
-        mxLbGroup->insert_text(0, aStrNone );
-
-        sal_uInt16 i=0;
-        for ( col=nFirstCol; col<=nMaxCol && i<SC_MAXFIELDS; col++ )
+        aFieldName = pDoc->GetString(col, nFirstRow, nTab);
+        if ( aFieldName.isEmpty() )
         {
-            aFieldName = pDoc->GetString(col, nFirstRow, nTab);
-            if ( aFieldName.isEmpty() )
-            {
-                aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
-            }
-            nFieldArr[i] = col;
-            mxLbGroup->insert_text(i+1, aFieldName);
-            mxLbColumns->insert(i);
-            mxLbColumns->set_toggle(i, TRISTATE_FALSE);
-            mxLbColumns->set_text(i, aFieldName, 0);
-            mxLbColumns->set_id(i, "0");
-            i++;
+            aFieldName = ScGlobal::ReplaceOrAppend( aStrColumn, "%1", ScColToAlpha( col ));
         }
-        // subsequent initialization of the constant:
-        nFieldCount = i;
+        nFieldArr[i] = col;
+        mxLbGroup->insert_text(i+1, aFieldName);
+        mxLbColumns->insert(i);
+        mxLbColumns->set_toggle(i, TRISTATE_FALSE);
+        mxLbColumns->set_text(i, aFieldName, 0);
+        mxLbColumns->set_id(i, "0");
+        i++;
     }
+    // subsequent initialization of the constant:
+    nFieldCount = i;
 }
 
 sal_uInt16 ScTpSubTotalGroup::GetFieldSelPos( SCCOL nField )
@@ -345,20 +345,20 @@ IMPL_LINK(ScTpSubTotalGroup, SelectListBoxHdl, weld::ComboBox&, rLb, void)
 void ScTpSubTotalGroup::SelectHdl(const weld::Widget *pLb)
 {
     const sal_Int32 nColumn = mxLbColumns->get_selected_index();
-    if (nColumn != -1)
-    {
-        const sal_Int32 nFunction   = mxLbFunctions->get_selected_index();
-        sal_uInt16      nOldFunction  = mxLbColumns->get_id(nColumn).toUInt32();
+    if (nColumn == -1)
+        return;
 
-        if ( pLb == mxLbColumns.get() )
-        {
-            mxLbFunctions->select(nOldFunction);
-        }
-        else if ( pLb == mxLbFunctions.get() )
-        {
-            mxLbColumns->set_id(nColumn, OUString::number(nFunction));
-            mxLbColumns->set_toggle(nColumn, TRISTATE_TRUE);
-        }
+    const sal_Int32 nFunction   = mxLbFunctions->get_selected_index();
+    sal_uInt16      nOldFunction  = mxLbColumns->get_id(nColumn).toUInt32();
+
+    if ( pLb == mxLbColumns.get() )
+    {
+        mxLbFunctions->select(nOldFunction);
+    }
+    else if ( pLb == mxLbFunctions.get() )
+    {
+        mxLbColumns->set_id(nColumn, OUString::number(nFunction));
+        mxLbColumns->set_toggle(nColumn, TRISTATE_TRUE);
     }
 }