loplugin:staticmethods

Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0

16 files changed, 55 insertions, 55 deletions

diff --git a/cui/source/customize/acccfg.cxx b/cui/source/customize/acccfg.cxx
index 8baa1c228527..f26e00ccd606 100644
--- a/cui/source/customize/acccfg.cxx
+++ b/cui/source/customize/acccfg.cxx
@@ -953,7 +953,7 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
 
         pEntry->m_bIsConfigurable = true;
         pEntry->m_sCommand = sCommand;
-        CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), sLabel);
+        CreateCustomItems(pLBEntry, SvTabListBox::GetEntryText(pLBEntry, 0), sLabel);
     }
 
     // Map the VCL hardcoded key codes and mark them as not changeable
@@ -972,7 +972,7 @@ void SfxAcceleratorConfigPage::Init(const uno::Reference<ui::XAcceleratorConfigu
         TAccInfo* pEntry = static_cast<TAccInfo*>(pLBEntry->GetUserData());
 
         pEntry->m_bIsConfigurable = false;
-        CreateCustomItems(pLBEntry, m_pEntriesBox->GetEntryText(pLBEntry, 0), OUString());
+        CreateCustomItems(pLBEntry, SvTabListBox::GetEntryText(pLBEntry, 0), OUString());
     }
 }
 
@@ -1052,7 +1052,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, Default)
 
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
 {
-    sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() );
+    sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
     TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
     OUString sNewCommand = m_pFunctionBox->GetCurCommand();
     OUString sLabel = m_pFunctionBox->GetCurLabel();
@@ -1070,7 +1070,7 @@ IMPL_LINK_NOARG(SfxAcceleratorConfigPage, ChangeHdl)
 IMPL_LINK_NOARG(SfxAcceleratorConfigPage, RemoveHdl)
 {
     // get selected entry
-    sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() );
+    sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
     TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
 
     // remove function name from selected entry
@@ -1088,7 +1088,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
     Help::ShowBalloon( this, Point(), OUString() );
     if (pListBox == m_pEntriesBox)
     {
-        sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( m_pEntriesBox->FirstSelected() );
+        sal_uLong nPos = SvTreeList::GetRelPos( m_pEntriesBox->FirstSelected() );
         TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
         OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand();
 
@@ -1117,7 +1117,7 @@ IMPL_LINK( SfxAcceleratorConfigPage, SelectHdl, Control*, pListBox )
         SvTreeListEntry* pLBEntry = m_pEntriesBox->FirstSelected();
         if ( pLBEntry != 0 )
         {
-            sal_uLong nPos = m_pEntriesBox->GetModel()->GetRelPos( pLBEntry );
+            sal_uLong nPos = SvTreeList::GetRelPos( pLBEntry );
             TAccInfo* pEntry = static_cast<TAccInfo*>(m_pEntriesBox->GetEntry(0, nPos)->GetUserData());
             OUString sPossibleNewCommand = m_pFunctionBox->GetCurCommand();
 
diff --git a/cui/source/customize/cfg.cxx b/cui/source/customize/cfg.cxx
index a8a749616092..5d6b74ae0b81 100644
--- a/cui/source/customize/cfg.cxx
+++ b/cui/source/customize/cfg.cxx
@@ -2112,12 +2112,12 @@ void SvxConfigPage::MoveEntry( bool bMoveUp )
     {
         // Move Up is just a Move Down with the source and target reversed
         pTargetEntry = pSourceEntry;
-        pSourceEntry = m_pContentsListBox->PrevSibling( pTargetEntry );
+        pSourceEntry = SvTreeListBox::PrevSibling( pTargetEntry );
         pToSelect = pTargetEntry;
     }
     else
     {
-        pTargetEntry = m_pContentsListBox->NextSibling( pSourceEntry );
+        pTargetEntry = SvTreeListBox::NextSibling( pSourceEntry );
         pToSelect = pSourceEntry;
     }
 
@@ -2709,13 +2709,13 @@ IMPL_LINK( SvxMainMenuOrganizerDialog, MoveHdl, Button *, pButton )
 
     if (pButton == m_pMoveDownButton)
     {
-        pTargetEntry = m_pMenuListBox->NextSibling( pSourceEntry );
+        pTargetEntry = SvTreeListBox::NextSibling( pSourceEntry );
     }
     else if (pButton == m_pMoveUpButton)
     {
         // Move Up is just a Move Down with the source and target reversed
         pTargetEntry = pSourceEntry;
-        pSourceEntry = m_pMenuListBox->PrevSibling( pTargetEntry );
+        pSourceEntry = SvTreeListBox::PrevSibling( pTargetEntry );
     }
 
     if ( pSourceEntry != NULL && pTargetEntry != NULL )
diff --git a/cui/source/customize/eventdlg.cxx b/cui/source/customize/eventdlg.cxx
index eb474ff4a58a..e466d526a747 100644
--- a/cui/source/customize/eventdlg.cxx
+++ b/cui/source/customize/eventdlg.cxx
@@ -111,7 +111,7 @@ SvxEventConfigPage::~SvxEventConfigPage()
         OUString const * pEventName = static_cast<OUString const *>(pE->GetUserData());
         delete pEventName;
         pE->SetUserData((void*)0);
-        pE = rListBox.NextSibling( pE );
+        pE = SvTreeListBox::NextSibling( pE );
     }
 }
 
diff --git a/cui/source/customize/selector.cxx b/cui/source/customize/selector.cxx
index 1701d60386af..761cd4f831d0 100644
--- a/cui/source/customize/selector.cxx
+++ b/cui/source/customize/selector.cxx
@@ -982,7 +982,7 @@ IMPL_LINK( SvxScriptSelectorDialog, ClickHdl, Button *, pButton )
         {
             // Select the next entry in the list if possible
             SvTreeListEntry* current = m_pCommands->FirstSelected();
-            SvTreeListEntry* next = m_pCommands->NextSibling( current );
+            SvTreeListEntry* next = SvTreeListBox::NextSibling( current );
 
             if ( next != NULL )
             {
diff --git a/cui/source/dialogs/hlmarkwn.cxx b/cui/source/dialogs/hlmarkwn.cxx
index bd3584743e03..a2b83836abf2 100644
--- a/cui/source/dialogs/hlmarkwn.cxx
+++ b/cui/source/dialogs/hlmarkwn.cxx
@@ -228,7 +228,7 @@ namespace
                 }
                 break;
             }
-            pEntry = rLbTree.NextSibling(pEntry);
+            pEntry = SvTreeListBox::NextSibling(pEntry);
         }
     }
 }
diff --git a/cui/source/dialogs/linkdlg.cxx b/cui/source/dialogs/linkdlg.cxx
index 7b8e25e6a3cc..e27b6fb85512 100644
--- a/cui/source/dialogs/linkdlg.cxx
+++ b/cui/source/dialogs/linkdlg.cxx
@@ -519,7 +519,7 @@ IMPL_LINK( SvBaseLinksDlg, UpdateWaitingHdl, Timer*, pTimer )
         if( xLink.Is() )
         {
             OUString sCur( ImplGetStateStr( *xLink ) ),
-                    sOld( m_pTbLinks->GetEntryText( pBox, 3 ) );
+                    sOld( SvTabListBox::GetEntryText( pBox, 3 ) );
             if( sCur != sOld )
                 m_pTbLinks->SetEntryText( sCur, pBox, 3 );
         }
diff --git a/cui/source/dialogs/scriptdlg.cxx b/cui/source/dialogs/scriptdlg.cxx
index 6c45a05f93d0..2e4a87157ec5 100644
--- a/cui/source/dialogs/scriptdlg.cxx
+++ b/cui/source/dialogs/scriptdlg.cxx
@@ -1185,7 +1185,7 @@ void SvxScriptOrgDialog::RestorePreviousSelection()
                 pEntry = pTmpEntry;
                 break;
             }
-            pTmpEntry = m_pScriptsBox->NextSibling( pTmpEntry );
+            pTmpEntry = SvTreeListBox::NextSibling( pTmpEntry );
         }
         if ( !pTmpEntry )
             break;
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 0258322d67fe..9b50fdc1cf31 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -194,7 +194,7 @@ bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet* rCoreSet )
         DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() );
         if ( pRegistration && !pRegistration->sLocation.isEmpty() )
         {
-            OUString sName( pPathBox->GetEntryText( pEntry, 0 ) );
+            OUString sName( SvTabListBox::GetEntryText( pEntry, 0 ) );
             OFileNotation aTransformer( pRegistration->sLocation );
             aRegistrations[ sName ] = DatabaseRegistration( aTransformer.get( OFileNotation::N_URL ), pRegistration->bReadOnly );
         }
@@ -296,7 +296,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl)
     if ( !pOldRegistration || pOldRegistration->bReadOnly )
         return 0L;
 
-    OUString sOldName = pPathBox->GetEntryText(pEntry,0);
+    OUString sOldName = SvTabListBox::GetEntryText(pEntry,0);
     m_pCurEntry = pEntry;
     openLinkDialog( sOldName, pOldRegistration->sLocation, pEntry );
     m_pCurEntry = NULL;
@@ -438,7 +438,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, OUString*, _pName )
         for ( sal_uLong i = 0; i < nCount; ++i )
         {
             SvTreeListEntry* pEntry = pPathBox->GetEntry(i);
-            if ( (!m_pCurEntry || m_pCurEntry != pEntry) && pPathBox->GetEntryText(pEntry,0) == *_pName )
+            if ( (!m_pCurEntry || m_pCurEntry != pEntry) && SvTabListBox::GetEntryText(pEntry,0) == *_pName )
                 return 0L;
         }
     }
diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx
index 099f90388d80..f4f6f1821cc7 100644
--- a/cui/source/options/fontsubs.cxx
+++ b/cui/source/options/fontsubs.cxx
@@ -160,8 +160,8 @@ bool  SvxFontSubstTabPage::FillItemSet( SfxItemSet* )
     while (pEntry)
     {
         SubstitutionStruct aAdd;
-        aAdd.sFont = m_pCheckLB->GetEntryText(pEntry, 0);
-        aAdd.sReplaceBy = m_pCheckLB->GetEntryText(pEntry, 1);
+        aAdd.sFont = SvTabListBox::GetEntryText(pEntry, 0);
+        aAdd.sReplaceBy = SvTabListBox::GetEntryText(pEntry, 1);
         aAdd.bReplaceAlways = m_pCheckLB->IsChecked(pEntry, 0);
         aAdd.bReplaceOnScreenOnly = m_pCheckLB->IsChecked(pEntry, 1);
         pConfig->AddSubstitution(aAdd);
@@ -288,8 +288,8 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, vcl::Window*, pWin)
 
         if (m_pCheckLB->NextSelected(pEntry) == 0)
         {
-            m_pFont1CB->SetText(m_pCheckLB->GetEntryText(pEntry, 0));
-            m_pFont2CB->SetText(m_pCheckLB->GetEntryText(pEntry, 1));
+            m_pFont1CB->SetText(SvTabListBox::GetEntryText(pEntry, 0));
+            m_pFont2CB->SetText(SvTabListBox::GetEntryText(pEntry, 1));
         }
     }
 
@@ -517,7 +517,7 @@ SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pE
     if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
-        eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
+        eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
     return eState;
diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx
index 48a5299b96a6..56f46dbc0ada 100644
--- a/cui/source/options/optHeaderTabListbox.cxx
+++ b/cui/source/options/optHeaderTabListbox.cxx
@@ -46,7 +46,7 @@ void OptLBoxString_Impl::Paint(
     vcl::Font aOldFont( rDev.GetFont() );
     vcl::Font aFont( aOldFont );
     //detect readonly state by asking for a valid Image
-    if(pEntry && !(!static_cast<OptHeaderTabListBox&>(rDev).GetCollapsedEntryBmp(pEntry)))
+    if(pEntry && !(!SvTreeListBox::GetCollapsedEntryBmp(pEntry)))
         aFont.SetColor( Application::GetSettings().GetStyleSettings().GetDeactiveTextColor() );
     rDev.SetFont( aFont );
     rDev.DrawText( rPos, GetText() );
diff --git a/cui/source/options/optaboutconfig.cxx b/cui/source/options/optaboutconfig.cxx
index 78412052212f..c5ef749ec20f 100644
--- a/cui/source/options/optaboutconfig.cxx
+++ b/cui/source/options/optaboutconfig.cxx
@@ -487,10 +487,10 @@ IMPL_LINK_NOARG( CuiAboutConfigTabPage, StandardHdl_Impl )
 {
     SvTreeListEntry* pEntry = m_pPrefBox->FirstSelected();
 
-    OUString sPropertyPath = m_pPrefBox->GetEntryText( pEntry, 0 );
-    OUString sPropertyName = m_pPrefBox->GetEntryText( pEntry, 1 );
-    OUString sPropertyType = m_pPrefBox->GetEntryText( pEntry, 2 );
-    OUString sPropertyValue = m_pPrefBox->GetEntryText( pEntry, 3 );
+    OUString sPropertyPath = SvTabListBox::GetEntryText( pEntry, 0 );
+    OUString sPropertyName = SvTabListBox::GetEntryText( pEntry, 1 );
+    OUString sPropertyType = SvTabListBox::GetEntryText( pEntry, 2 );
+    OUString sPropertyValue = SvTabListBox::GetEntryText( pEntry, 3 );
 
     boost::shared_ptr< Prop_Impl > pProperty (new Prop_Impl( sPropertyPath, sPropertyName, makeAny( sPropertyValue ) ) );
 
diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx
index f30171a278d2..d7d0c7297b2c 100644
--- a/cui/source/options/optdict.cxx
+++ b/cui/source/options/optdict.cxx
@@ -389,7 +389,7 @@ sal_uLong SvxEditDictionaryDialog::GetLBInsertPos(const OUString &rDicWord)
         DBG_ASSERT( pEntry, "NULL pointer");
         OUString aNormEntry( getNormDicEntry_Impl( rDicWord ) );
         sal_Int32 nCmpRes = pCollator->
-            compareString( aNormEntry, getNormDicEntry_Impl( pWordsLB->GetEntryText(pEntry, 0) ) );
+            compareString( aNormEntry, getNormDicEntry_Impl( SvTabListBox::GetEntryText(pEntry, 0) ) );
         if (nCmpRes < 0)
             break;
     }
@@ -405,7 +405,7 @@ void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry)
 
     if ( pEntry != NULL && nLBPos != LISTBOX_ENTRY_NOTFOUND )
     {
-        OUString sTmpShort(pWordsLB->GetEntryText(pEntry, 0));
+        OUString sTmpShort(SvTabListBox::GetEntryText(pEntry, 0));
 
         Reference< XDictionary >  xDic = aDics.getConstArray()[ nLBPos ];
         if (xDic->remove( sTmpShort ))  // sal_True on success
@@ -556,12 +556,12 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox)
         if(!bFirstSelect)
         {
             SvTreeListEntry* pEntry = pBox->FirstSelected();
-            OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
+            OUString sTmpShort(SvTabListBox::GetEntryText(pEntry, 0));
             // without this the curser is always at the beginning of a word, if the text
             // is set over the ModifyHdl, although you're editing there at the moment
             if(pWordED->GetText() != sTmpShort)
                 pWordED->SetText(sTmpShort);
-            pReplaceED->SetText(pBox->GetEntryText(pEntry, 1));
+            pReplaceED->SetText(SvTabListBox::GetEntryText(pEntry, 1));
         }
         else
             bFirstSelect = false;
@@ -616,7 +616,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn)
                     aRplcText = aReplaceStr;
 
                 if (_pEntry) // entry selected in pWordsLB ie action = modify entry
-                    xDic->remove( pWordsLB->GetEntryText( _pEntry, 0 ) );
+                    xDic->remove( SvTabListBox::GetEntryText( _pEntry, 0 ) );
                 // if remove has failed the following add should fail too
                 // and thus a warning message should be triggered...
 
@@ -696,7 +696,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
             for(sal_uLong i = 0; i < pWordsLB->GetEntryCount(); i++)
             {
                 SvTreeListEntry*  pEntry = pWordsLB->GetEntry( i );
-                OUString aTestStr( pWordsLB->GetEntryText(pEntry, 0) );
+                OUString aTestStr( SvTabListBox::GetEntryText(pEntry, 0) );
                 eCmpRes = cmpDicEntry_Impl( rEntry, aTestStr );
                 if(CDE_DIFFERENT != eCmpRes)
                 {
@@ -705,7 +705,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
                     bDoNothing=true;
                     pWordsLB->SetCurEntry(pEntry);
                     bDoNothing=false;
-                    pReplaceED->SetText(pWordsLB->GetEntryText(pEntry, 1));
+                    pReplaceED->SetText(SvTabListBox::GetEntryText(pEntry, 1));
 
                     if (CDE_SIMILAR == eCmpRes)
                     {
@@ -753,8 +753,8 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt)
         SvTreeListEntry* pFirstSel = pWordsLB->FirstSelected();
         if (pFirstSel)  // a pWordsLB entry is selected
         {
-            aWordText    = pWordsLB->GetEntryText( pFirstSel, 0 );
-            aReplaceText = pWordsLB->GetEntryText( pFirstSel, 1 );
+            aWordText    = SvTabListBox::GetEntryText( pFirstSel, 0 );
+            aReplaceText = SvTabListBox::GetEntryText( pFirstSel, 1 );
 
             aNewReplaceText = sModify;
             bEnableDelete = true;
diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx
index 1216c4a28b4c..46051ce08c8e 100644
--- a/cui/source/options/optfltr.cxx
+++ b/cui/source/options/optfltr.cxx
@@ -216,7 +216,7 @@ bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet* )
             {
                 SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
                 bCheck = SV_BUTTON_CHECKED ==
-                        pCheckButtonData->ConvertToButtonState( nButtonFlags );
+                        SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
 
                 if( bCheck != (rOpt.*pArr->FnIs)() )
                     (rOpt.*pArr->FnSet)( bCheck );
@@ -398,7 +398,7 @@ SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState(
     if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
-        eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
+        eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
     return eState;
diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx
index 1106933ef54f..d4a16d775699 100644
--- a/cui/source/options/optpath.cxx
+++ b/cui/source/options/optpath.cxx
@@ -392,7 +392,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl)
     //the entry image indicates whether the path is write protected
     Image aEntryImage;
     if(pEntry)
-        aEntryImage = pPathBox->GetCollapsedEntryBmp( pEntry );
+        aEntryImage = SvTreeListBox::GetCollapsedEntryBmp( pEntry );
     bool bEnable = !aEntryImage;
     while ( pEntry && ( nSelCount < 2 ) )
     {
@@ -542,7 +542,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
         sWritable = pPathImpl->sWritablePath;
     }
 
-    if(pEntry && !(!((OptHeaderTabListBox*)pPathBox)->GetCollapsedEntryBmp(pEntry)))
+    if(pEntry && !(!SvTreeListBox::GetCollapsedEntryBmp(pEntry)))
         return 0;
 
     if ( IsMultiPath_Impl( nPos ) )
@@ -560,7 +560,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl)
             sPath += sWritable;
             pMultiDlg->SetPath( sPath );
 
-            OUString sPathName = pPathBox->GetEntryText( pEntry, 0 );
+            OUString sPathName = SvTabListBox::GetEntryText( pEntry, 0 );
             OUString sNewTitle( pImpl->m_sMultiPathDlg );
             sNewTitle = sNewTitle.replaceFirst( VAR_ONE, sPathName );
             pMultiDlg->SetTitle( sNewTitle );
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index 9276e02f08d1..42fe55bf150e 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -208,8 +208,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl)
         SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
         if ( pEntry )
         {
-            OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
-            OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
+            OUString aURL = SvTabListBox::GetEntryText( pEntry, 0 );
+            OUString aUserName = SvTabListBox::GetEntryText( pEntry, 1 );
 
             uno::Reference< task::XPasswordContainer2 > xPasswdContainer(
                 task::PasswordContainer::create(comphelper::getProcessComponentContext()));
@@ -264,8 +264,8 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl)
         SvTreeListEntry* pEntry = m_pPasswordsLB->GetCurEntry();
         if ( pEntry )
         {
-            OUString aURL = m_pPasswordsLB->GetEntryText( pEntry, 0 );
-            OUString aUserName = m_pPasswordsLB->GetEntryText( pEntry, 1 );
+            OUString aURL = SvTabListBox::GetEntryText( pEntry, 0 );
+            OUString aUserName = SvTabListBox::GetEntryText( pEntry, 1 );
 
             ::comphelper::SimplePasswordRequest* pPasswordRequest
                   = new ::comphelper::SimplePasswordRequest( task::PasswordRequestMode_PASSWORD_CREATE );
diff --git a/cui/source/tabpages/autocdlg.cxx b/cui/source/tabpages/autocdlg.cxx
index ceec6fcd64e8..a24210275486 100644
--- a/cui/source/tabpages/autocdlg.cxx
+++ b/cui/source/tabpages/autocdlg.cxx
@@ -792,7 +792,7 @@ SvButtonState OfaACorrCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry
     if (pItem->GetType() == SV_ITEM_ID_LBOXBUTTON)
     {
         SvItemStateFlags nButtonFlags = pItem->GetButtonFlags();
-        eState = pCheckButtonData->ConvertToButtonState( nButtonFlags );
+        eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags );
     }
 
     return eState;
@@ -992,8 +992,8 @@ void OfaAutocorrReplacePage::RefillReplaceBox(bool bFromReset,
             pArray->push_back(DoubleString());
             DoubleString& rDouble = (*pArray)[pArray->size() - 1];
             SvTreeListEntry*  pEntry = m_pReplaceTLB->GetEntry( i );
-            rDouble.sShort = m_pReplaceTLB->GetEntryText(pEntry, 0);
-            rDouble.sLong = m_pReplaceTLB->GetEntryText(pEntry, 1);
+            rDouble.sShort = SvTabListBox::GetEntryText(pEntry, 0);
+            rDouble.sLong = SvTabListBox::GetEntryText(pEntry, 1);
             rDouble.pUserData = pEntry->GetUserData();
         }
     }
@@ -1102,7 +1102,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
     if(!bFirstSelect || !bHasSelectionText)
     {
         SvTreeListEntry* pEntry = pBox->FirstSelected();
-        OUString sTmpShort(pBox->GetEntryText(pEntry, 0));
+        OUString sTmpShort(SvTabListBox::GetEntryText(pEntry, 0));
         // if the text is set via ModifyHdl, the cursor is always at the beginning
         // of a word, although you're editing here
         bool bSameContent = 0 == pCompareClass->compareString( sTmpShort, m_pShortED->GetText() );
@@ -1116,7 +1116,7 @@ IMPL_LINK(OfaAutocorrReplacePage, SelectHdl, SvTabListBox*, pBox)
                 m_pShortED->SetSelection(aSel);
             }
         }
-        m_pReplaceED->SetText( pBox->GetEntryText(pEntry, 1) );
+        m_pReplaceED->SetText( SvTabListBox::GetEntryText(pEntry, 1) );
         // with UserData there is a Formatinfo
         m_pTextOnlyCB->Check( pEntry->GetUserData() == 0);
     }
@@ -1196,7 +1196,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
         DBG_ASSERT( pEntry, "no entry selected" );
         if( pEntry )
         {
-            DeleteEntry(m_pReplaceTLB->GetEntryText(pEntry, 0), m_pReplaceTLB->GetEntryText(pEntry, 1));
+            DeleteEntry(SvTabListBox::GetEntryText(pEntry, 0), SvTabListBox::GetEntryText(pEntry, 1));
             m_pReplaceTLB->GetModel()->Remove(pEntry);
             ModifyHdl(m_pShortED);
             return 0;
@@ -1227,7 +1227,7 @@ IMPL_LINK(OfaAutocorrReplacePage, NewDelHdl, PushButton*, pBtn)
                 for( j = 0; j < m_pReplaceTLB->GetEntryCount(); j++ )
                 {
                     SvTreeListEntry* pReplaceEntry = m_pReplaceTLB->GetEntry(j);
-                    if( 0 >=  pCompareClass->compareString(sEntry, m_pReplaceTLB->GetEntryText(pReplaceEntry, 0) ) )
+                    if( 0 >=  pCompareClass->compareString(sEntry, SvTabListBox::GetEntryText(pReplaceEntry, 0) ) )
                         break;
                 }
                 nPos = j;
@@ -1277,7 +1277,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
             for(sal_uInt32 i = 0; i < m_pReplaceTLB->GetEntryCount(); i++)
             {
                 SvTreeListEntry*  pEntry = m_pReplaceTLB->GetEntry( i );
-                OUString aTestStr = m_pReplaceTLB->GetEntryText(pEntry, 0);
+                OUString aTestStr = SvTabListBox::GetEntryText(pEntry, 0);
                 if( pCompareClass->compareString(rEntry, aTestStr ) == 0 )
                 {
                     if( !rRepString.isEmpty() )
@@ -1331,7 +1331,7 @@ IMPL_LINK(OfaAutocorrReplacePage, ModifyHdl, Edit*, pEdt)
                         ( !rRepString.isEmpty() ||
                                 ( bHasSelectionText && bSWriter )) &&
                         ( !pFirstSel || rRepString !=
-                                m_pReplaceTLB->GetEntryText( pFirstSel, 1 ) );
+                                SvTabListBox::GetEntryText( pFirstSel, 1 ) );
     if( bEnableNew )
     {
         for(std::set<OUString>::iterator i = aFormatText.begin(); i != aFormatText.end(); ++i)