diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-07 16:18:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-09 11:01:06 +0200 |
| commit | 14505bb67eb671ebcb91c81cbefbbc1aab930b44 (patch) | |
| tree | 0ad2166f5c6c95d01f2f7204b13aaa0ca8119acc | |
| parent | 6ea42ddf8f06b7551e80a906908dbad0766a68c6 (diff) | |
loplugin:staticmethods
Change-Id: I715374b531da2850434b2436633b6042ecb9ebe0
81 files changed, 254 insertions, 250 deletions
diff --git a/accessibility/source/extended/accessiblelistbox.cxx b/accessibility/source/extended/accessiblelistbox.cxx index 5cf07bc2bf31..3b1800ed99f8 100644 --- a/accessibility/source/extended/accessiblelistbox.cxx +++ b/accessibility/source/extended/accessiblelistbox.cxx @@ -287,7 +287,7 @@ namespace accessibility while (pEntryChild) { RemoveChildEntries(pEntryChild); - pEntryChild = pBox->NextSibling(pEntryChild); + pEntryChild = SvTreeListBox::NextSibling(pEntryChild); } } diff --git a/accessibility/source/extended/accessibletablistboxtable.cxx b/accessibility/source/extended/accessibletablistboxtable.cxx index bebfe7a81223..085bfb437bdc 100644 --- a/accessibility/source/extended/accessibletablistboxtable.cxx +++ b/accessibility/source/extended/accessibletablistboxtable.cxx @@ -205,7 +205,7 @@ namespace accessibility m_pTabListBox->CreateAccessibleCell( nRow, nCol ); AccessibleCheckBoxCell* pCell = static_cast< AccessibleCheckBoxCell* >( xChild.get() ); - pCell->SetChecked( m_pTabListBox->IsItemChecked( pEntry, nCol ) ); + pCell->SetChecked( SvHeaderTabListBox::IsItemChecked( pEntry, nCol ) ); } } } diff --git a/basctl/source/basicide/moduldl2.cxx b/basctl/source/basicide/moduldl2.cxx index 114cfd0bda2d..ea06d718b3cb 100644 --- a/basctl/source/basicide/moduldl2.cxx +++ b/basctl/source/basicide/moduldl2.cxx @@ -489,7 +489,7 @@ void LibPage::CheckButtons() SvTreeListEntry* pCur = m_pLibBox->GetCurEntry(); if ( pCur ) { - OUString aLibName = m_pLibBox->GetEntryText( pCur, 0 ); + OUString aLibName = SvTabListBox::GetEntryText( pCur, 0 ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); @@ -572,7 +572,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) SfxUsrAnyItem aDocItem( SID_BASICIDE_ARG_DOCUMENT_MODEL, makeAny( m_aCurDocument.getDocumentOrNull() ) ); SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); DBG_ASSERT( pCurEntry, "Entry?!" ); - OUString aLibName( m_pLibBox->GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); SfxStringItem aLibNameItem( SID_BASICIDE_ARG_LIBNAME, aLibName ); if (SfxDispatcher* pDispatcher = GetDispatcher()) pDispatcher->Execute( SID_BASICIDE_LIBSELECTED, @@ -591,7 +591,7 @@ IMPL_LINK( LibPage, ButtonHdl, Button *, pButton ) else if (pButton == m_pPasswordButton) { SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); - OUString aLibName( m_pLibBox->GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); // load module library (if not loaded) Reference< script::XLibraryContainer > xModLibContainer = m_aCurDocument.getLibraryContainer( E_SCRIPTS ); @@ -655,7 +655,7 @@ IMPL_LINK_INLINE_START( LibPage, CheckPasswordHdl, SvxPasswordDialog *, pDlg ) long nRet = 0; SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); - OUString aLibName( m_pLibBox->GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); Reference< script::XLibraryContainerPassword > xPasswd( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); if ( xPasswd.is() ) @@ -817,7 +817,7 @@ void LibPage::InsertLib() { SvTreeListEntry* pEntry = pLibDlg->GetLibBox().GetEntry( nLib ); DBG_ASSERT( pEntry, "Entry?!" ); - OUString aLibName( pLibDlg->GetLibBox().GetEntryText( pEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pEntry, 0 ) ); Reference< script::XLibraryContainer2 > xModLibContainer( m_aCurDocument.getLibraryContainer( E_SCRIPTS ), UNO_QUERY ); Reference< script::XLibraryContainer2 > xDlgLibContainer( m_aCurDocument.getLibraryContainer( E_DIALOGS ), UNO_QUERY ); @@ -1044,7 +1044,7 @@ void LibPage::InsertLib() void LibPage::Export( void ) { SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); - OUString aLibName( m_pLibBox->GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); // Password verification OUString aOULibName( aLibName ); @@ -1285,7 +1285,7 @@ void LibPage::ExportAsBasic( const OUString& aLibName ) void LibPage::DeleteCurrent() { SvTreeListEntry* pCurEntry = m_pLibBox->GetCurEntry(); - OUString aLibName( m_pLibBox->GetEntryText( pCurEntry, 0 ) ); + OUString aLibName( SvTabListBox::GetEntryText( pCurEntry, 0 ) ); // check, if library is link bool bIsLibraryLink = false; diff --git a/basctl/source/basicide/moduldlg.cxx b/basctl/source/basicide/moduldlg.cxx index 57b9e110a9cc..dd39719b39da 100644 --- a/basctl/source/basicide/moduldlg.cxx +++ b/basctl/source/basicide/moduldlg.cxx @@ -331,7 +331,7 @@ TriState ExtTreeListBox::NotifyCopyingMoving( SvTreeListEntry* pTarget, SvTreeLi { // Target = module/dialog => put module/dialog under the superordinate Basic rpNewParent = GetParent( pTarget ); - rNewChildPos = GetModel()->GetRelPos( pTarget ) + 1; + rNewChildPos = SvTreeList::GetRelPos( pTarget ) + 1; } // get target shell and target library name diff --git a/chart2/source/controller/dialogs/tp_DataSource.cxx b/chart2/source/controller/dialogs/tp_DataSource.cxx index 14da20cbaaf6..8e7416b1bdf2 100644 --- a/chart2/source/controller/dialogs/tp_DataSource.cxx +++ b/chart2/source/controller/dialogs/tp_DataSource.cxx @@ -102,7 +102,7 @@ OUString lcl_GetSelectedRole( const SvTabListBox & rRoleListBox, bool bUITransla OUString aResult; SvTreeListEntry * pEntry = rRoleListBox.FirstSelected(); if( pEntry ) - aResult = OUString( rRoleListBox.GetEntryText( pEntry, + aResult = OUString( SvTabListBox::GetEntryText( pEntry, bUITranslated ? 1 : 0 )); return aResult; } @@ -112,7 +112,7 @@ OUString lcl_GetSelectedRolesRange( const SvTabListBox & rRoleListBox ) OUString aResult; SvTreeListEntry * pEntry = rRoleListBox.FirstSelected(); if( pEntry ) - aResult = OUString( rRoleListBox.GetEntryText( pEntry, 2 )); + aResult = OUString( SvTabListBox::GetEntryText( pEntry, 2 )); return aResult; } diff --git a/compilerplugins/clang/staticmethods.cxx b/compilerplugins/clang/staticmethods.cxx index 243666d6937b..5ac9da42f9aa 100644 --- a/compilerplugins/clang/staticmethods.cxx +++ b/compilerplugins/clang/staticmethods.cxx @@ -133,8 +133,13 @@ bool StaticMethods::TraverseCXXMethodDecl(const CXXMethodDecl * pCXXMethodDecl) if (startsWith(getFilename(pCXXMethodDecl->getCanonicalDecl()->getLocStart()), SRCDIR "/include/svl")) { return true; } - // another one of those classes that has static data and some kind of weird reference-counting trick in it's constructor - if (aParentName == "LinguOptions") { + // classes that have static data and some kind of weird reference-counting trick in it's constructor + if (aParentName == "LinguOptions" || aParentName == "svtools::EditableExtendedColorConfig" + || aParentName == "svtools::ExtendedColorConfig" || aParentName == "SvtMiscOptions" + || aParentName == "SvtAccessibilityOptions" || aParentName == "svtools::ColorConfig" + || aParentName == "SvtOptionsDrawinglayer" || aParentName == "SvtMenuOptions" + || aParentName == "SvtToolPanelOptions" || aParentName == "SvtSlideSorterBarOptions") + { return true; } 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) diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx index 31b2691f2dd6..f01c26bcf9ef 100644 --- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx +++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx @@ -114,7 +114,7 @@ namespace } } else - pEntry = rTree.NextSibling(pEntry); + pEntry = SvTreeListBox::NextSibling(pEntry); } return pReturn; } diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx index 429bd4335396..7ec0b2add7d3 100644 --- a/dbaccess/source/ui/browser/unodatbr.cxx +++ b/dbaccess/source/ui/browser/unodatbr.cxx @@ -1403,7 +1403,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing( const com::sun::star::lang::Event break; } - pDSLoop = m_pTreeView->getListBox().NextSibling(pDSLoop); + pDSLoop = SvTreeList::NextSibling(pDSLoop); } } else @@ -2741,7 +2741,7 @@ SvTreeListEntry* SbaTableQueryBrowser::getEntryFromContainer(const Reference<XNa if ( pTablesData && pTablesData->xContainer == _rxNameAccess ) break; - pDSLoop = rListBox.NextSibling(pDSLoop); + pDSLoop = SvTreeList::NextSibling(pDSLoop); pContainer = NULL; } return pContainer; @@ -2833,7 +2833,7 @@ void SAL_CALL SbaTableQueryBrowser::elementRemoved( const ContainerEvent& _rEven m_pTreeModel->Remove(pChild); break; } - pChild = m_pTreeModel->NextSibling(pChild); + pChild = SvTreeList::NextSibling(pChild); } } @@ -2898,7 +2898,7 @@ void SAL_CALL SbaTableQueryBrowser::elementReplaced( const ContainerEvent& _rEve } break; } - pChild = m_pTreeModel->NextSibling(pChild); + pChild = SvTreeList::NextSibling(pChild); } } @@ -2965,7 +2965,7 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry, bool _bDi unloadAndCleanup(_bDisposeConnection); // collapse the query/table container - for (SvTreeListEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers= m_pTreeModel->NextSibling(pContainers)) + for (SvTreeListEntry* pContainers = m_pTreeModel->FirstChild(_pDSEntry); pContainers; pContainers = SvTreeList::NextSibling(pContainers)) { SvTreeListEntry* pElements = m_pTreeModel->FirstChild(pContainers); if ( pElements ) @@ -2975,7 +2975,7 @@ void SbaTableQueryBrowser::closeConnection(SvTreeListEntry* _pDSEntry, bool _bDi for (; pElements; ) { SvTreeListEntry* pRemove = pElements; - pElements= m_pTreeModel->NextSibling(pElements); + pElements = SvTreeList::NextSibling(pElements); DBTreeListUserData* pData = static_cast<DBTreeListUserData*>(pRemove->GetUserData()); pRemove->SetUserData(NULL); delete pData; @@ -3751,7 +3751,7 @@ void SbaTableQueryBrowser::impl_cleanupDataSourceEntry( const OUString& _rDataSo if ( m_pTreeView->getListBox().GetEntryText( pDataSourceEntry ) == _rDataSourceName ) break; - pDataSourceEntry = m_pTreeView->getListBox().NextSibling( pDataSourceEntry ); + pDataSourceEntry = SvTreeList::NextSibling( pDataSourceEntry ); } OSL_ENSURE( pDataSourceEntry, "SbaTableQueryBrowser::impl_cleanupDataSourceEntry: do not know this data source!" ); diff --git a/dbaccess/source/ui/control/marktree.cxx b/dbaccess/source/ui/control/marktree.cxx index d51db97fb548..2fc45e769fa2 100644 --- a/dbaccess/source/ui/control/marktree.cxx +++ b/dbaccess/source/ui/control/marktree.cxx @@ -110,7 +110,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) ++nCheckedChildren; ++nChildrenOverall; - pChildLoop = GetModel()->NextSibling(pChildLoop); + pChildLoop = SvTreeList::NextSibling(pChildLoop); } if (pChildLoop) @@ -124,7 +124,7 @@ SvButtonState OMarkableTreeListBox::implDetermineState(SvTreeListEntry* _pEntry) while (pChildLoop) { implDetermineState(pChildLoop); - pChildLoop = GetModel()->NextSibling(pChildLoop); + pChildLoop = SvTreeList::NextSibling(pChildLoop); } } else @@ -153,7 +153,7 @@ void OMarkableTreeListBox::CheckButtons() while (pEntry) { implDetermineState(pEntry); - pEntry = GetModel()->NextSibling(pEntry); + pEntry = SvTreeList::NextSibling(pEntry); } } @@ -170,7 +170,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) if (GetModel()->HasChildren(_pEntry)) // if it has children, check those too { SvTreeListEntry* pChildEntry = GetModel()->Next(_pEntry); - SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(_pEntry); + SvTreeListEntry* pSiblingEntry = SvTreeList::NextSibling(_pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry, eState); @@ -185,7 +185,7 @@ void OMarkableTreeListBox::checkedButton_noBroadcast(SvTreeListEntry* _pEntry) if(GetModel()->HasChildren(pEntry)) // if it has children, check those too { SvTreeListEntry* pChildEntry = GetModel()->Next(pEntry); - SvTreeListEntry* pSiblingEntry = GetModel()->NextSibling(pEntry); + SvTreeListEntry* pSiblingEntry = SvTreeList::NextSibling(pEntry); while(pChildEntry && pChildEntry != pSiblingEntry) { SetCheckButtonState(pChildEntry,eState); diff --git a/dbaccess/source/ui/dlg/tablespage.cxx b/dbaccess/source/ui/dlg/tablespage.cxx index 062983ea43c5..ee89c63ef83a 100644 --- a/dbaccess/source/ui/dlg/tablespage.cxx +++ b/dbaccess/source/ui/dlg/tablespage.cxx @@ -367,7 +367,7 @@ namespace dbaui { m_pTablesList->Expand(pExpand); pExpand = m_pTablesList->FirstChild(pExpand); - if (pExpand && m_pTablesList->NextSibling(pExpand)) + if (pExpand && SvTreeList::NextSibling(pExpand)) pExpand = NULL; } @@ -536,7 +536,7 @@ namespace dbaui SvTreeListEntry* pReturn = NULL; if (_pEntry) { - pReturn = m_pTablesList->NextSibling(_pEntry); + pReturn = SvTreeList::NextSibling(_pEntry); if (!pReturn) pReturn = implNextSibling(m_pTablesList->GetParent(_pEntry)); } diff --git a/fpicker/source/office/iodlg.cxx b/fpicker/source/office/iodlg.cxx index ab74874c35f7..2a4b1fa7b7d4 100644 --- a/fpicker/source/office/iodlg.cxx +++ b/fpicker/source/office/iodlg.cxx @@ -1369,7 +1369,7 @@ void SvtFileDialog::OpenMultiSelection_Impl() SvTreeListEntry* pEntry = nCount ? _pFileView->FirstSelected() : NULL; if ( nCount && pEntry ) - _aPath = _pFileView->GetURL( pEntry ); + _aPath = SvtFileView::GetURL( pEntry ); // notify interested parties long nRet; @@ -1471,7 +1471,7 @@ IMPL_LINK( SvtFileDialog, SelectHdl_Impl, SvTabListBox*, pBox ) { if ( !pUserData->mbIsFolder ) { - OUString aName = pBox->GetEntryText( pEntry, 0 ); + OUString aName = SvTabListBox::GetEntryText( pEntry, 0 ); _pImp->_pEdFileName->SetText( aName ); _pImp->_pEdFileName->SetSelection( Selection( 0, aName.getLength() ) ); _aPath = pUserData->maURL; @@ -2248,7 +2248,7 @@ std::vector<OUString> SvtFileDialog::GetPathList() const { while ( pEntry ) { - aList.push_back(_pFileView->GetURL(pEntry)); + aList.push_back(SvtFileView::GetURL(pEntry)); pEntry = _pFileView->NextSelected( pEntry ); } } diff --git a/include/svtools/addresstemplate.hxx b/include/svtools/addresstemplate.hxx index 020d38c70e55..d771efb5e473 100644 --- a/include/svtools/addresstemplate.hxx +++ b/include/svtools/addresstemplate.hxx @@ -113,7 +113,7 @@ namespace svt // implementations void implScrollFields(sal_Int32 _nPos, bool _bAdjustFocus, bool _bAdjustScrollbar); - void implSelectField(ListBox* _pBox, const OUString& _rText); + static void implSelectField(ListBox* _pBox, const OUString& _rText); void initalizeListBox(ListBox* _pList); void resetTables(); diff --git a/include/svtools/brwbox.hxx b/include/svtools/brwbox.hxx index 009b4242c508..9248d6134667 100644 --- a/include/svtools/brwbox.hxx +++ b/include/svtools/brwbox.hxx @@ -458,7 +458,7 @@ public: virtual void CursorMoved(); virtual void ColumnMoved( sal_uInt16 nColId ); virtual void ColumnResized( sal_uInt16 nColId ); - long QueryColumnResize( sal_uInt16 nColId, long nWidth ); + static long QueryColumnResize( sal_uInt16 nColId, long nWidth ); /// called when the row height has been changed interactively virtual void RowHeightChanged(); virtual long QueryMinimumRowHeight(); diff --git a/include/svtools/ctrltool.hxx b/include/svtools/ctrltool.hxx index 4cecae8859cd..23f07b093c14 100644 --- a/include/svtools/ctrltool.hxx +++ b/include/svtools/ctrltool.hxx @@ -191,8 +191,8 @@ public: } const vcl::FontInfo& GetFontName( sal_uInt16 nFont ) const; sal_Handle GetFirstFontInfo( const OUString& rName ) const; - sal_Handle GetNextFontInfo( sal_Handle hFontInfo ) const; - const vcl::FontInfo& GetFontInfo( sal_Handle hFontInfo ) const; + static sal_Handle GetNextFontInfo( sal_Handle hFontInfo ); + static const vcl::FontInfo& GetFontInfo( sal_Handle hFontInfo ); const sal_IntPtr* GetSizeAry( const vcl::FontInfo& rInfo ) const; static const sal_IntPtr* GetStdSizeAry() { return aStdSizeAry; } diff --git a/include/svtools/editbrowsebox.hxx b/include/svtools/editbrowsebox.hxx index 9d39b57e0d22..30789c325c56 100644 --- a/include/svtools/editbrowsebox.hxx +++ b/include/svtools/editbrowsebox.hxx @@ -661,7 +661,7 @@ namespace svt using Control::ImplInitSettings; SVT_DLLPRIVATE void ImplInitSettings( bool bFont, bool bForeground, bool bBackground ); SVT_DLLPRIVATE void DetermineFocus( const sal_uInt16 _nGetFocusFlags = 0); - inline void HideAndDisable(CellControllerRef& rController); + static inline void HideAndDisable(CellControllerRef& rController); inline void EnableAndShow() const; SVT_DLLPRIVATE void implActivateCellOnMouseEvent(const BrowserMouseEvent& _rEvt, bool _bUp); diff --git a/include/svtools/fileview.hxx b/include/svtools/fileview.hxx index f8fc70b0cc63..b123f14a5c41 100644 --- a/include/svtools/fileview.hxx +++ b/include/svtools/fileview.hxx @@ -86,7 +86,7 @@ public: virtual Size GetOptimalSize() const SAL_OVERRIDE; const OUString& GetViewURL() const; - OUString GetURL( SvTreeListEntry* pEntry ) const; + static OUString GetURL( SvTreeListEntry* pEntry ); OUString GetCurrentURL() const; bool GetParentURL( OUString& _rParentURL ) const; diff --git a/include/svtools/grfmgr.hxx b/include/svtools/grfmgr.hxx index 57dd14c207ae..f75db3dfb471 100644 --- a/include/svtools/grfmgr.hxx +++ b/include/svtools/grfmgr.hxx @@ -535,7 +535,7 @@ private: bool& rCached ); - bool SVT_DLLPRIVATE ImplCreateOutput( + static bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, @@ -544,7 +544,7 @@ private: const sal_uLong nFlags, BitmapEx* pBmpEx = NULL ); - bool SVT_DLLPRIVATE ImplCreateOutput( + static bool SVT_DLLPRIVATE ImplCreateOutput( OutputDevice* pOut, const Point& rPt, const Size& rSz, diff --git a/include/svtools/htmlcfg.hxx b/include/svtools/htmlcfg.hxx index b26391755b78..272dc98f80bd 100644 --- a/include/svtools/htmlcfg.hxx +++ b/include/svtools/htmlcfg.hxx @@ -38,7 +38,7 @@ struct HtmlOptions_Impl; class SVT_DLLPUBLIC SvxHtmlOptions : public utl::ConfigItem { HtmlOptions_Impl*pImp; - const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); + static const com::sun::star::uno::Sequence<OUString>& GetPropertyNames(); void Load( const com::sun::star::uno::Sequence< OUString >& rPropertyNames ); void CallListeners(); diff --git a/include/svtools/imap.hxx b/include/svtools/imap.hxx index adc0a08b0ada..8255cb7bf9cc 100644 --- a/include/svtools/imap.hxx +++ b/include/svtools/imap.hxx @@ -53,15 +53,15 @@ protected: sal_uLong ImpReadNCSA( SvStream& rOStm, const OUString& rBaseURL ); void ImpReadCERNLine( const OString& rLine, const OUString& rBaseURL ); - Point ImpReadCERNCoords( const char** ppStr ); - long ImpReadCERNRadius( const char** ppStr ); - OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ); + static Point ImpReadCERNCoords( const char** ppStr ); + static long ImpReadCERNRadius( const char** ppStr ); + static OUString ImpReadCERNURL( const char** ppStr, const OUString& rBaseURL ); void ImpReadNCSALine( const OString& rLine, const OUString& rBaseURL ); - OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ); - Point ImpReadNCSACoords( const char** ppStr ); + static OUString ImpReadNCSAURL( const char** ppStr, const OUString& rBaseURL ); + static Point ImpReadNCSACoords( const char** ppStr ); - sal_uLong ImpDetectFormat( SvStream& rIStm ); + static sal_uLong ImpDetectFormat( SvStream& rIStm ); public: diff --git a/include/svtools/imapobj.hxx b/include/svtools/imapobj.hxx index 633945614538..5fcd543e6383 100644 --- a/include/svtools/imapobj.hxx +++ b/include/svtools/imapobj.hxx @@ -69,9 +69,9 @@ protected: virtual void ReadIMapObject( SvStream& rIStm ) = 0; // helper methods - void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const; + static void AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100); void AppendCERNURL(OStringBuffer& rBuf, const OUString& rBaseURL) const; - void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const; + static void AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100); void AppendNCSAURL(OStringBuffer&rBuf, const OUString& rBaseURL) const; public: diff --git a/include/svtools/ivctrl.hxx b/include/svtools/ivctrl.hxx index b8e54755665d..db64201768b5 100644 --- a/include/svtools/ivctrl.hxx +++ b/include/svtools/ivctrl.hxx @@ -242,12 +242,12 @@ protected: virtual void StateChanged( StateChangedType nType ) SAL_OVERRIDE; virtual void DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE; virtual void RequestHelp( const HelpEvent& rHEvt ) SAL_OVERRIDE; - void DrawEntryImage( + static void DrawEntryImage( SvxIconChoiceCtrlEntry* pEntry, const Point& rPos, OutputDevice& rDev ); - OUString GetEntryText( + static OUString GetEntryText( SvxIconChoiceCtrlEntry* pEntry, bool bInplaceEdit ); diff --git a/include/svtools/popupmenucontrollerbase.hxx b/include/svtools/popupmenucontrollerbase.hxx index 739969500232..60dd06511029 100644 --- a/include/svtools/popupmenucontrollerbase.hxx +++ b/include/svtools/popupmenucontrollerbase.hxx @@ -107,10 +107,10 @@ namespace svt */ virtual void SAL_CALL disposing() SAL_OVERRIDE; - void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); + static void resetPopupMenu( com::sun::star::uno::Reference< com::sun::star::awt::XPopupMenu >& rPopupMenu ); virtual void impl_setPopupMenu(); virtual void impl_select(const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XDispatch >& _xDispatch,const ::com::sun::star::util::URL& aURL); - OUString determineBaseURL( const OUString& aURL ); + static OUString determineBaseURL( const OUString& aURL ); DECL_STATIC_LINK( PopupMenuControllerBase, ExecuteHdl_Impl, PopupMenuControllerBaseDispatchInfo* ); diff --git a/include/svtools/svlbitm.hxx b/include/svtools/svlbitm.hxx index e0cd847fe426..263e7a04cd3c 100644 --- a/include/svtools/svlbitm.hxx +++ b/include/svtools/svlbitm.hxx @@ -77,7 +77,7 @@ public: ~SvLBoxButtonData(); - SvBmp GetIndex( SvItemStateFlags nItemState ); + static SvBmp GetIndex( SvItemStateFlags nItemState ); long Width(); long Height(); void SetLink( const Link& rLink) { aLink=rLink; } @@ -87,7 +87,7 @@ public: void CallLink(); void StoreButtonState( SvTreeListEntry* pEntry, SvItemStateFlags nItemFlags ); - SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ) const; + static SvButtonState ConvertToButtonState( SvItemStateFlags nItemFlags ); SvButtonState GetActButtonState() const { return eState; } @@ -159,7 +159,7 @@ class SVT_DLLPUBLIC SvLBoxButton : public SvLBoxItem SvLBoxButtonKind eKind; SvItemStateFlags nItemFlags; - void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); + static void ImplAdjustBoxSize( Size& io_rCtrlSize, ControlType i_eType, vcl::Window* pParent ); public: // An SvLBoxButton can be of three different kinds: an // enabled checkbox (the normal kind), a disabled checkbox diff --git a/include/svtools/svtabbx.hxx b/include/svtools/svtabbx.hxx index b9239404ad21..92c04fc489da 100644 --- a/include/svtools/svtabbx.hxx +++ b/include/svtools/svtabbx.hxx @@ -94,7 +94,7 @@ public: sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ); virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const SAL_OVERRIDE; - OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const; + static OUString GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ); OUString GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const; using SvTreeListBox::SetEntryText; void SetEntryText(const OUString&, sal_uLong, sal_uInt16 nCol=0xffff); @@ -143,7 +143,7 @@ public: virtual void Paint( const Rectangle& ) SAL_OVERRIDE; void InitHeaderBar( HeaderBar* pHeaderBar ); - bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const; + static bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ); virtual SvTreeListEntry* InsertEntryToColumn( const OUString&, sal_uLong nPos = TREELIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL ) SAL_OVERRIDE; diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx index 79b6ff640c19..22689dcf844c 100644 --- a/include/svtools/treelist.hxx +++ b/include/svtools/treelist.hxx @@ -100,12 +100,12 @@ class SVT_DLLPUBLIC SvTreeList SvTreeListEntry* PrevSelected( const SvListView*,SvTreeListEntry* pEntry ) const; SvTreeListEntry* LastSelected( const SvListView*) const; - bool Select( SvListView*,SvTreeListEntry* pEntry, bool bSelect=true ); + static bool Select( SvListView*,SvTreeListEntry* pEntry, bool bSelect=true ); void SelectAll( SvListView*, bool bSelect ); // Does not call Select Handler sal_uLong GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const; - void Expand( SvListView*,SvTreeListEntry* pParent ); - void Collapse( SvListView*,SvTreeListEntry* pParent ); + static void Expand( SvListView*,SvTreeListEntry* pParent ); + static void Collapse( SvListView*,SvTreeListEntry* pParent ); SVT_DLLPRIVATE void SetAbsolutePositions(); @@ -166,9 +166,9 @@ public: SvTreeListEntry* Last() const; SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; - SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const; + static SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ); sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos = TREELIST_APPEND); sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = TREELIST_APPEND ) @@ -206,7 +206,7 @@ public: GetChildIterators(SvTreeListEntry* pParent); sal_uLong GetAbsPos( const SvTreeListEntry* pEntry ) const; - sal_uLong GetRelPos( const SvTreeListEntry* pChild ) const; + static sal_uLong GetRelPos( const SvTreeListEntry* pChild ); sal_uLong GetChildCount( const SvTreeListEntry* pParent ) const; sal_uInt16 GetDepth( const SvTreeListEntry* pEntry ) const; @@ -225,7 +225,7 @@ public: { return aCloneLink; } SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link - SvTreeListEntry* CreateEntry() const; // To create Entries + static SvTreeListEntry* CreateEntry(); // To create Entries sal_uInt16 GetRefCount() const { return nRefCount; } void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; } @@ -265,13 +265,13 @@ protected: SvTreeList* pModel; void ExpandListEntry( SvTreeListEntry* pParent ) - { pModel->Expand((SvListView*)this,pParent); } + { SvTreeList::Expand((SvListView*)this,pParent); } void CollapseListEntry( SvTreeListEntry* pParent ) - { pModel->Collapse((SvListView*)this,pParent); } + { SvTreeList::Collapse((SvListView*)this,pParent); } bool SelectListEntry( SvTreeListEntry* pEntry, bool bSelect ) - { return pModel->Select((SvListView*)this,pEntry,bSelect); } + { return SvTreeList::Select((SvListView*)this,pEntry,bSelect); } public: SvListView(); // Sets the Model to 0 diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index bdf27d136ae2..f7c1af30cc4b 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -143,7 +143,7 @@ public: virtual ~SvLBoxItem(); virtual sal_uInt16 GetType() const = 0; const Size& GetSize(const SvTreeListBox* pView, const SvTreeListEntry* pEntry) const; - const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const; + static const Size& GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos); virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev, const SvViewDataEntry* pView, const SvTreeListEntry* pEntry) = 0; @@ -368,8 +368,8 @@ public: } SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const; - SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const; - SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const; + static SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ); + static SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ); bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget ); @@ -476,7 +476,7 @@ public: void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; } sal_Int8 GetDragOptions() const { return nDragOptions; } - SvTreeListBox* GetSourceView() const; + static SvTreeListBox* GetSourceView(); virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ); virtual SvTreeListEntry* CreateEntry() const; // To create new Entries @@ -652,8 +652,8 @@ public: void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage ); virtual OUString GetEntryText( SvTreeListEntry* pEntry ) const; - const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ) const; - const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ) const; + static const Image& GetExpandedEntryBmp(const SvTreeListEntry* _pEntry ); + static const Image& GetCollapsedEntryBmp(const SvTreeListEntry* _pEntry ); void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; } Link GetCheckButtonHdl() const { return aCheckButtonHdl; } diff --git a/sc/source/ui/dialogs/searchresults.cxx b/sc/source/ui/dialogs/searchresults.cxx index fcc55f3166eb..f9384ac281e0 100644 --- a/sc/source/ui/dialogs/searchresults.cxx +++ b/sc/source/ui/dialogs/searchresults.cxx @@ -91,8 +91,8 @@ IMPL_LINK_NOARG( SearchResultsDlg, ListSelectHdl ) return 0; SvTreeListEntry *pEntry = mpList->FirstSelected(); - OUString aTabStr = mpList->GetEntryText(pEntry, 0); - OUString aPosStr = mpList->GetEntryText(pEntry, 1); + OUString aTabStr = SvTabListBox::GetEntryText(pEntry, 0); + OUString aPosStr = SvTabListBox::GetEntryText(pEntry, 1); SCTAB nTab = -1; if (!mpDoc->GetTable(aTabStr, nTab)) diff --git a/sc/source/ui/miscdlgs/acredlin.cxx b/sc/source/ui/miscdlgs/acredlin.cxx index cdd661dd36fc..76363796d8de 100644 --- a/sc/source/ui/miscdlgs/acredlin.cxx +++ b/sc/source/ui/miscdlgs/acredlin.cxx @@ -1535,7 +1535,7 @@ void ScAcceptChgDlg::UpdateEntrys(ScChangeTrack* pChgTrack, sal_uLong nStartActi SvTreeListEntry* pEntry=pTheView->First(); - SvTreeListEntry* pNextEntry = (pEntry ? pTheView->NextSibling(pEntry) : NULL); + SvTreeListEntry* pNextEntry = (pEntry ? SvTreeListBox::NextSibling(pEntry) : NULL); SvTreeListEntry* pLastEntry=NULL; while(pEntry!=NULL) { diff --git a/sc/source/ui/miscdlgs/conflictsdlg.cxx b/sc/source/ui/miscdlgs/conflictsdlg.cxx index 27ab197d1726..02d3a317c397 100644 --- a/sc/source/ui/miscdlgs/conflictsdlg.cxx +++ b/sc/source/ui/miscdlgs/conflictsdlg.cxx @@ -520,7 +520,7 @@ void ScConflictsDlg::HandleListBoxSelection( bool bSelectHandle ) { m_pLbConflicts->Select( pEntry ); } - pEntry = m_pLbConflicts->NextSibling( pEntry ); + pEntry = SvTreeListBox::NextSibling( pEntry ); } } } @@ -634,7 +634,7 @@ void ScConflictsDlg::KeepAllHandler( bool bMine ) while ( pRootEntry ) { SetConflictAction( pRootEntry, eConflictAction ); - pRootEntry = m_pLbConflicts->NextSibling( pRootEntry ); + pRootEntry = SvTreeListBox::NextSibling( pRootEntry ); } m_pLbConflicts->SetUpdateMode( false ); m_pLbConflicts->Clear(); diff --git a/sc/source/ui/xmlsource/xmlsourcedlg.cxx b/sc/source/ui/xmlsource/xmlsourcedlg.cxx index 8a3026b89315..e789276d6a0b 100644 --- a/sc/source/ui/xmlsource/xmlsourcedlg.cxx +++ b/sc/source/ui/xmlsource/xmlsourcedlg.cxx @@ -319,7 +319,7 @@ void ScXMLSourceDlg::DefaultElementSelected(SvTreeListEntry& rEntry) { // Only an element with no child elements (leaf element) can be linked. bool bHasChild = false; - for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = mpLbTree->NextSibling(pChild)) + for (SvTreeListEntry* pChild = mpLbTree->FirstChild(&rEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); OSL_ASSERT(pUserData); @@ -465,7 +465,7 @@ bool ScXMLSourceDlg::IsParentDirty(SvTreeListEntry* pEntry) const bool ScXMLSourceDlg::IsChildrenDirty(SvTreeListEntry* pEntry) const { - for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = mpLbTree->NextSibling(pChild)) + for (SvTreeListEntry* pChild = mpLbTree->FirstChild(pEntry); pChild; pChild = SvTreeListBox::NextSibling(pChild)) { ScOrcusXMLTreeParam::EntryData* pUserData = ScOrcusXMLTreeParam::getUserData(*pChild); OSL_ASSERT(pUserData); diff --git a/sd/source/ui/dlg/sdtreelb.cxx b/sd/source/ui/dlg/sdtreelb.cxx index 51c860914b73..12c2bcb08ebc 100644 --- a/sd/source/ui/dlg/sdtreelb.cxx +++ b/sd/source/ui/dlg/sdtreelb.cxx @@ -1440,7 +1440,7 @@ TriState SdPageObjsTLB::NotifyMoving( else { rpNewParent = GetParent(pDestination); - rNewChildPos = pModel->GetRelPos(pDestination) + 1; + rNewChildPos = SvTreeList::GetRelPos(pDestination) + 1; rNewChildPos += nCurEntrySelPos; nCurEntrySelPos++; } diff --git a/sfx2/source/dialog/versdlg.cxx b/sfx2/source/dialog/versdlg.cxx index ec29b3dcce23..403f581efd34 100644 --- a/sfx2/source/dialog/versdlg.cxx +++ b/sfx2/source/dialog/versdlg.cxx @@ -338,7 +338,7 @@ void SfxVersionDialog::Open_Impl() SfxObjectShell *pObjShell = pViewFrame->GetObjectShell(); SvTreeListEntry *pEntry = m_pVersionBox->FirstSelected(); - sal_uIntPtr nPos = m_pVersionBox->GetModel()->GetRelPos( pEntry ); + sal_uIntPtr nPos = SvTreeList::GetRelPos( pEntry ); SfxInt16Item aItem( SID_VERSION, (short)nPos+1 ); SfxStringItem aTarget( SID_TARGETNAME, "_blank" ); SfxStringItem aReferer( SID_REFERER, "private:user" ); @@ -432,7 +432,7 @@ IMPL_LINK( SfxVersionDialog, ButtonHdl_Impl, Button*, pButton ) else if (pEntry && pButton == m_pCompareButton) { SfxAllItemSet aSet( pObjShell->GetPool() ); - sal_uIntPtr nPos = m_pVersionBox->GetModel()->GetRelPos( pEntry ); + sal_uIntPtr nPos = SvTreeList::GetRelPos( pEntry ); aSet.Put( SfxInt16Item( SID_VERSION, (short)nPos+1 ) ); aSet.Put( SfxStringItem( SID_FILE_NAME, pObjShell->GetMedium()->GetName() ) ); diff --git a/svtools/source/config/helpopt.cxx b/svtools/source/config/helpopt.cxx index 972f9a087d17..f19ecd3b3b8d 100644 --- a/svtools/source/config/helpopt.cxx +++ b/svtools/source/config/helpopt.cxx @@ -58,7 +58,7 @@ class SvtHelpOptions_Impl : public utl::ConfigItem typedef std::map <OUString, sal_Int32> MapString2Int; MapString2Int aURLIgnoreCounters; - Sequence< OUString > GetPropertyNames(); + static Sequence< OUString > GetPropertyNames(); virtual void ImplCommit() SAL_OVERRIDE; diff --git a/svtools/source/config/itemholder2.hxx b/svtools/source/config/itemholder2.hxx index 9e12ecfc39ce..e1363a5aa52d 100644 --- a/svtools/source/config/itemholder2.hxx +++ b/svtools/source/config/itemholder2.hxx @@ -57,8 +57,8 @@ class ItemHolder2 : private ItemHolderMutexBase void impl_addItem(EItem eItem); void impl_releaseAllItems(); - void impl_newItem(TItemInfo& rItem); - void impl_deleteItem(TItemInfo& rItem); + static void impl_newItem(TItemInfo& rItem); + static void impl_deleteItem(TItemInfo& rItem); }; } // namespace svtools diff --git a/svtools/source/config/miscopt.cxx b/svtools/source/config/miscopt.cxx index 0dd13809f899..58fb45ae76e7 100644 --- a/svtools/source/config/miscopt.cxx +++ b/svtools/source/config/miscopt.cxx @@ -157,7 +157,7 @@ class SvtMiscOptions_Impl : public ConfigItem void SetSymbolsSize( sal_Int16 nSet ); - OUString GetIconTheme() const; + static OUString GetIconTheme(); enum SetModifiedFlag { SET_MODIFIED, DONT_SET_MODIFIED }; @@ -528,7 +528,7 @@ void SvtMiscOptions_Impl::SetSymbolsSize( sal_Int16 nSet ) CallListeners(); } -OUString SvtMiscOptions_Impl::GetIconTheme() const +OUString SvtMiscOptions_Impl::GetIconTheme() { return Application::GetSettings().GetStyleSettings().DetermineIconTheme(); } @@ -784,7 +784,7 @@ bool SvtMiscOptions::AreCurrentSymbolsLarge() const OUString SvtMiscOptions::GetIconTheme() const { - return m_pDataContainer->GetIconTheme(); + return SvtMiscOptions_Impl::GetIconTheme(); } void SvtMiscOptions::SetIconTheme(const OUString& iconTheme) diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx index 8ef7f1867411..8ec816f3af49 100644 --- a/svtools/source/contnr/fileview.cxx +++ b/svtools/source/contnr/fileview.cxx @@ -462,7 +462,7 @@ public: void OpenFolder_Impl(); // #83004# ------- - void ReplaceTabWithString( OUString& aValue ); + static void ReplaceTabWithString( OUString& aValue ); void CreateDisplayText_Impl(); void SortFolderContent_Impl(); @@ -1117,7 +1117,7 @@ Size SvtFileView::GetOptimalSize() const -OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) const +OUString SvtFileView::GetURL( SvTreeListEntry* pEntry ) { OUString aURL; if ( pEntry && pEntry->GetUserData() ) diff --git a/svtools/source/contnr/imivctl.hxx b/svtools/source/contnr/imivctl.hxx index 9e6b3bfcdae4..da249561ffe4 100644 --- a/svtools/source/contnr/imivctl.hxx +++ b/svtools/source/contnr/imivctl.hxx @@ -235,7 +235,7 @@ class SvxIconChoiceCtrl_Impl void AdjustScrollBars( bool bVirtSizeGrowedOnly = false); void PositionScrollBars( long nRealWidth, long nRealHeight ); - long GetScrollBarPageSize( long nVisibleRange ) const + static long GetScrollBarPageSize( long nVisibleRange ) { return ((nVisibleRange*75)/100); } @@ -397,7 +397,7 @@ public: SvxIconChoiceCtrlEntry* GetEntry( const Point& rDocPos, bool bHit = false ); - Point GetEntryPos( SvxIconChoiceCtrlEntry* ); + static Point GetEntryPos( SvxIconChoiceCtrlEntry* ); void MakeEntryVisible( SvxIconChoiceCtrlEntry* pEntry, bool bBound = true ); void Arrange( @@ -432,7 +432,7 @@ public: rRect.Right() = LONG_MAX; bBoundRectsDirty = true; } - bool IsBoundingRectValid( const Rectangle& rRect ) const { return ( rRect.Right() != LONG_MAX ); } + static bool IsBoundingRectValid( const Rectangle& rRect ) { return ( rRect.Right() != LONG_MAX ); } void PaintEmphasis( const Rectangle& rRect1, @@ -469,10 +469,10 @@ public: void HideDDIcon(); - bool IsOver( + static bool IsOver( std::vector<Rectangle*>* pSelectedRectList, const Rectangle& rEntryBoundRect - ) const; + ); void SelectRect( const Rectangle&, diff --git a/svtools/source/contnr/imivctl1.cxx b/svtools/source/contnr/imivctl1.cxx index 0e3d008cdce7..c46df0507255 100644 --- a/svtools/source/contnr/imivctl1.cxx +++ b/svtools/source/contnr/imivctl1.cxx @@ -1628,7 +1628,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect, { OUString aText; if( !pStr ) - aText = pView->GetEntryText( pEntry, false ); + aText = SvtIconChoiceCtrl::GetEntryText( pEntry, false ); else aText = *pStr; @@ -1672,7 +1672,7 @@ void SvxIconChoiceCtrl_Impl::PaintItem( const Rectangle& rRect, aPos.X() += (rRect.GetWidth() - aImageSize.Width() ) / 2; if( nPaintFlags & PAINTFLAG_VER_CENTERED ) aPos.Y() += (rRect.GetHeight() - aImageSize.Height() ) / 2; - pView->DrawEntryImage( pEntry, aPos, *pOut ); + SvtIconChoiceCtrl::DrawEntryImage( pEntry, aPos, *pOut ); } } @@ -1740,7 +1740,7 @@ void SvxIconChoiceCtrl_Impl::PaintEntry( SvxIconChoiceCtrlEntry* pEntry, const P } */ - OUString aEntryText( pView->GetEntryText( pEntry, false ) ); + OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) ); Rectangle aTextRect( CalcTextRect(pEntry,&rPos,false,&aEntryText)); Rectangle aBmpRect( CalcBmpRect(pEntry, &rPos ) ); @@ -1982,7 +1982,7 @@ Rectangle SvxIconChoiceCtrl_Impl::CalcTextRect( SvxIconChoiceCtrlEntry* pEntry, { OUString aEntryText; if( !pStr ) - aEntryText = pView->GetEntryText( pEntry, bEdit ); + aEntryText = SvtIconChoiceCtrl::GetEntryText( pEntry, bEdit ); else aEntryText = *pStr; @@ -2811,7 +2811,7 @@ void SvxIconChoiceCtrl_Impl::SelectRange( } } -bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<Rectangle*>* pRectList, const Rectangle& rBoundRect ) const +bool SvxIconChoiceCtrl_Impl::IsOver( std::vector<Rectangle*>* pRectList, const Rectangle& rBoundRect ) { const sal_uInt16 nCount = pRectList->size(); for( sal_uInt16 nCur = 0; nCur < nCount; nCur++ ) @@ -3127,7 +3127,7 @@ void SvxIconChoiceCtrl_Impl::EditEntry( SvxIconChoiceCtrlEntry* pEntry ) SetNoSelection(); pCurEditedEntry = pEntry; - OUString aEntryText( pView->GetEntryText( pEntry, true ) ); + OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, true ) ); Rectangle aRect( CalcTextRect( pEntry, 0, true, &aEntryText ) ); MakeVisible( aRect ); Point aPos( aRect.TopLeft() ); @@ -3585,7 +3585,7 @@ bool SvxIconChoiceCtrl_Impl::RequestHelp( const HelpEvent& rHEvt ) return false; OUString sQuickHelpText = pEntry->GetQuickHelpText(); - OUString aEntryText( pView->GetEntryText( pEntry, false ) ); + OUString aEntryText( SvtIconChoiceCtrl::GetEntryText( pEntry, false ) ); Rectangle aTextRect( CalcTextRect( pEntry, 0, false, &aEntryText ) ); if ( ( !aTextRect.IsInside( aPos ) || aEntryText.isEmpty() ) && sQuickHelpText.isEmpty() ) return false; diff --git a/svtools/source/contnr/imivctl2.cxx b/svtools/source/contnr/imivctl2.cxx index 88d6f0ad7714..659be51ba254 100644 --- a/svtools/source/contnr/imivctl2.cxx +++ b/svtools/source/contnr/imivctl2.cxx @@ -713,7 +713,7 @@ GridId IcnGridMap_Impl::GetUnoccupiedGrid( bool bOccupyFound ) // lead to small overlaps. void IcnGridMap_Impl::OccupyGrids( const SvxIconChoiceCtrlEntry* pEntry, bool bOccupy ) { - if( !_pGridMap || !_pView->IsBoundingRectValid( pEntry->aRect )) + if( !_pGridMap || !SvxIconChoiceCtrl_Impl::IsBoundingRectValid( pEntry->aRect )) return; OccupyGrid( GetGrid( pEntry->aRect.Center()), bOccupy ); } diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx index c069bef5b569..39eb1dc3ac88 100644 --- a/svtools/source/contnr/svimpbox.cxx +++ b/svtools/source/contnr/svimpbox.cxx @@ -1104,7 +1104,7 @@ void SvImpLBox::DrawNet() pChild = pView->FirstChild( pEntry ); DBG_ASSERT(pChild,"Child?"); - pChild = pTree->LastSibling( pChild ); + pChild = SvTreeList::LastSibling( pChild ); nDistance = (sal_uInt16)(pView->GetVisiblePos(pChild) - pView->GetVisiblePos(pEntry)); aPos2 = aPos1; @@ -1145,7 +1145,7 @@ void SvImpLBox::DrawNet() aPos1.X() -= pView->GetIndent(); aPos1.Y() = GetEntryLine( pEntry ); aPos1.Y() += nEntryHeightDIV2; - pChild = pTree->LastSibling( pEntry ); + pChild = SvTreeList::LastSibling( pEntry ); aPos2.X() = aPos1.X(); aPos2.Y() = GetEntryLine( pChild ); aPos2.Y() += nEntryHeightDIV2; @@ -1689,7 +1689,7 @@ void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry ) pView->Select( pCursor, false ); ShowCursor( false ); // focus rectangle gone // NextSibling, because we also delete the children of the cursor - pTemp = pView->NextSibling( pCursor ); + pTemp = SvTreeListBox::NextSibling( pCursor ); if( !pTemp ) pTemp = pView->PrevVisible(pCursor); @@ -1697,7 +1697,7 @@ void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry ) } if( pStartEntry && pStartEntry == pEntry ) { - pTemp = pView->NextSibling( pStartEntry ); + pTemp = SvTreeListBox::NextSibling( pStartEntry ); if( !pTemp ) pTemp = pView->PrevVisible(pStartEntry); pStartEntry = pTemp; @@ -1787,9 +1787,9 @@ void SvImpLBox::MovingEntry( SvTreeListEntry* pEntry ) } else { - pNew = pTree->NextSibling( pEntry ); + pNew = SvTreeList::NextSibling( pEntry ); if( !pNew ) - pNew = pTree->PrevSibling( pEntry ); + pNew = SvTreeList::PrevSibling( pEntry ); } pStartEntry = pNew; } diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx index 00e65e34cc56..b63059251b62 100644 --- a/svtools/source/contnr/svlbitm.cxx +++ b/svtools/source/contnr/svlbitm.cxx @@ -111,7 +111,7 @@ void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, SvItemState eState = ConvertToButtonState( nItemFlags ); } -SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) const +SvButtonState SvLBoxButtonData::ConvertToButtonState( SvItemStateFlags nItemFlags ) { nItemFlags &= (SvItemStateFlags::UNCHECKED | SvItemStateFlags::CHECKED | @@ -342,7 +342,7 @@ void SvLBoxButton::Paint( const SvTreeListEntry* /*pEntry*/) { SvBmp nIndex = eKind == SvLBoxButtonKind_staticImage - ? SvBmp::STATICIMAGE : pData->GetIndex( nItemFlags ); + ? SvBmp::STATICIMAGE : SvLBoxButtonData::GetIndex( nItemFlags ); sal_uInt16 nStyle = eKind != SvLBoxButtonKind_disabledCheckbox && rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE; diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx index 94e237df5545..b078a9c559a2 100644 --- a/svtools/source/contnr/svtabbx.cxx +++ b/svtools/source/contnr/svtabbx.cxx @@ -250,7 +250,7 @@ OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry ) const return GetEntryText( pEntry, 0xffff ); } -OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const +OUString SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) { DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry"); OUString aResult; @@ -547,7 +547,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar ) -bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const +bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = static_cast<SvLBoxButton*>( pEntry->GetItem( nCol + 1 ) ); @@ -555,7 +555,7 @@ bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol if (pItem && pItem->GetType() == SV_ITEM_ID_LBOXBUTTON) { SvItemStateFlags nButtonFlags = pItem->GetButtonFlags(); - eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); + eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags ); } return ( eState == SV_BUTTON_CHECKED ); diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx index d684e4b3fd7b..dcc622edaadb 100644 --- a/svtools/source/contnr/treelist.cxx +++ b/svtools/source/contnr/treelist.cxx @@ -359,7 +359,7 @@ SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const return pEntry; } -SvTreeListEntry* SvTreeList::CreateEntry() const +SvTreeListEntry* SvTreeList::CreateEntry() { return new SvTreeListEntry; } @@ -807,7 +807,7 @@ SvTreeListEntry* SvTreeList::FirstChild( SvTreeListEntry* pParent ) const return pResult; } -SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) @@ -819,7 +819,7 @@ SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const return nPos < rList.size() ? &rList[nPos] : NULL; } -SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Entry?"); if( !pEntry ) @@ -835,7 +835,7 @@ SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const } -SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry ) const +SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"LastSibling:Entry?"); if( !pEntry ) @@ -915,7 +915,7 @@ sal_uLong SvTreeList::GetAbsPos( const SvTreeListEntry* pEntry) const return pEntry->nAbsPos; } -sal_uLong SvTreeList::GetRelPos( const SvTreeListEntry* pChild ) const +sal_uLong SvTreeList::GetRelPos( const SvTreeListEntry* pChild ) { return pChild->GetChildListPos(); } diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 1e31187cfd1b..447b9f87d72c 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -347,7 +347,7 @@ const Size& SvLBoxItem::GetSize(const SvTreeListBox* pView, const SvTreeListEntr return pViewData->maSize; } -const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) const +const Size& SvLBoxItem::GetSize(const SvViewDataEntry* pData, sal_uInt16 nItemPos) { const SvViewDataItem* pIData = pData->GetItem(nItemPos); return pIData->maSize; @@ -607,7 +607,7 @@ TriState SvTreeListBox::NotifyMoving( { // case 1 rpNewParent = GetParent( pTarget ); - rNewChildPos = pModel->GetRelPos( pTarget ) + 1; + rNewChildPos = SvTreeList::GetRelPos( pTarget ) + 1; rNewChildPos += nCurEntrySelPos; nCurEntrySelPos++; } @@ -638,14 +638,14 @@ SvTreeListEntry* SvTreeListBox::FirstChild( SvTreeListEntry* pParent ) const return pModel->FirstChild(pParent); } -SvTreeListEntry* SvTreeListBox::NextSibling( SvTreeListEntry* pEntry ) const +SvTreeListEntry* SvTreeListBox::NextSibling( SvTreeListEntry* pEntry ) { - return pModel->NextSibling(pEntry); + return SvTreeList::NextSibling(pEntry); } -SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry ) const +SvTreeListEntry* SvTreeListBox::PrevSibling( SvTreeListEntry* pEntry ) { - return pModel->PrevSibling(pEntry); + return SvTreeList::PrevSibling(pEntry); } // return: all entries copied @@ -786,7 +786,7 @@ void SvTreeListBox::RemoveSelection() pModel->Remove(*it); } -SvTreeListBox* SvTreeListBox::GetSourceView() const +SvTreeListBox* SvTreeListBox::GetSourceView() { return pDDSource; } @@ -1782,7 +1782,7 @@ OUString SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const return pItem->GetText(); } -const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) const +const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) { DBG_ASSERT(pEntry,"Entry?"); const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); @@ -1790,7 +1790,7 @@ const Image& SvTreeListBox::GetExpandedEntryBmp(const SvTreeListEntry* pEntry) c return pItem->GetBitmap2( ); } -const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry ) const +const Image& SvTreeListBox::GetCollapsedEntryBmp( const SvTreeListEntry* pEntry ) { DBG_ASSERT(pEntry,"Entry?"); const SvLBoxContextBmp* pItem = static_cast<const SvLBoxContextBmp*>(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP)); @@ -2005,7 +2005,7 @@ SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) cons if(!pItem) return SV_BUTTON_TRISTATE; SvItemStateFlags nButtonFlags = pItem->GetButtonFlags(); - eState = pCheckButtonData->ConvertToButtonState( nButtonFlags ); + eState = SvLBoxButtonData::ConvertToButtonState( nButtonFlags ); } return eState; } @@ -2305,8 +2305,7 @@ void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry ) SvViewDataEntry* pViewData = GetViewDataEntry( pEntry ); while( nCur < nCount ) { - SvLBoxItem* pItem = pEntry->GetItem( nCur ); - short nHeight = (short)(pItem->GetSize( pViewData, nCur ).Height()); + short nHeight = (short)(SvLBoxItem::GetSize( pViewData, nCur ).Height()); if( nHeight > nHeightMax ) nHeightMax = nHeight; nCur++; @@ -2932,7 +2931,7 @@ long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nT SvLBoxItem* pItem = nCurItem < nItemCount ? pEntry->GetItem(nCurItem) : 0; sal_uInt16 nFlags = pTab->nFlags; - Size aSize( pItem->GetSize( pViewDataEntry, nCurItem )); + Size aSize( SvLBoxItem::GetSize( pViewDataEntry, nCurItem )); long nTabPos = GetTabPos( pEntry, pTab ); long nNextTabPos; diff --git a/svtools/source/control/ctrlbox.cxx b/svtools/source/control/ctrlbox.cxx index 60874a7a7739..f0767ff83d87 100644 --- a/svtools/source/control/ctrlbox.cxx +++ b/svtools/source/control/ctrlbox.cxx @@ -1380,7 +1380,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) vcl::FontInfo aInfo; while ( hFontInfo ) { - aInfo = pList->GetFontInfo( hFontInfo ); + aInfo = FontList::GetFontInfo( hFontInfo ); FontWeight eWeight = aInfo.GetWeight(); FontItalic eItalic = aInfo.GetItalic(); @@ -1445,7 +1445,7 @@ void FontStyleBox::Fill( const OUString& rName, const FontList* pList ) else if ( !bBoldItalic && (aStyleText == pList->GetBoldItalicStr()) ) bBoldItalic = true; - hFontInfo = pList->GetNextFontInfo( hFontInfo ); + hFontInfo = FontList::GetNextFontInfo( hFontInfo ); } if ( bInsert ) diff --git a/svtools/source/control/ctrltool.cxx b/svtools/source/control/ctrltool.cxx index 5ba069f8b946..7babd84d5fbf 100644 --- a/svtools/source/control/ctrltool.cxx +++ b/svtools/source/control/ctrltool.cxx @@ -701,13 +701,13 @@ sal_Handle FontList::GetFirstFontInfo(const OUString& rName) const return (sal_Handle)pData->mpFirst; } -sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) const +sal_Handle FontList::GetNextFontInfo( sal_Handle hFontInfo ) { ImplFontListFontInfo* pInfo = static_cast<ImplFontListFontInfo*>((void*)hFontInfo); return (sal_Handle)(pInfo->mpNext); } -const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) const +const vcl::FontInfo& FontList::GetFontInfo( sal_Handle hFontInfo ) { ImplFontListFontInfo* pInfo = static_cast<ImplFontListFontInfo*>((void*)hFontInfo); return *pInfo; diff --git a/svtools/source/control/inettbc.cxx b/svtools/source/control/inettbc.cxx index 3e7f1357c564..f75c82c98d9a 100644 --- a/svtools/source/control/inettbc.cxx +++ b/svtools/source/control/inettbc.cxx @@ -113,7 +113,7 @@ class SvtMatchContext_Impl: public salhelper::Thread void doExecute(); void Insert( const OUString& rCompletion, const OUString& rURL, bool bForce = false); void ReadFolder( const OUString& rURL, const OUString& rMatch, bool bSmart ); - void FillPicklist(std::vector<OUString>& rPickList); + static void FillPicklist(std::vector<OUString>& rPickList); public: SvtMatchContext_Impl( SvtURLBox* pBoxP, const OUString& rText ); diff --git a/svtools/source/dialogs/roadmapwizard.cxx b/svtools/source/dialogs/roadmapwizard.cxx index 64126d7f3225..aa9fb5c0843d 100644 --- a/svtools/source/dialogs/roadmapwizard.cxx +++ b/svtools/source/dialogs/roadmapwizard.cxx @@ -75,11 +75,11 @@ namespace svt } /// returns the index of the current state in given path, or -1 - sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ); + static sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, const WizardPath& _rPath ); /// returns the index of the current state in the path with the given id, or -1 sal_Int32 getStateIndexInPath( WizardTypes::WizardState _nState, PathId _nPathId ); /// returns the index of the first state in which the two given paths differ - sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ); + static sal_Int32 getFirstDifferentIndex( const WizardPath& _rLHS, const WizardPath& _rRHS ); }; @@ -250,7 +250,7 @@ namespace svt Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath ); if ( aActivePathPos != m_pImpl->aPaths.end() ) { - if ( m_pImpl->getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) + if ( RoadmapWizardImpl::getFirstDifferentIndex( aActivePathPos->second, aNewPathPos->second ) <= nCurrentStatePathIndex ) { OSL_FAIL( "RoadmapWizard::activate: you cannot activate a path which conflicts with the current one *before* the current state!" ); return; @@ -271,7 +271,7 @@ namespace svt "RoadmapWizard::implUpdateRoadmap: there is no such path!" ); const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); - sal_Int32 nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), rActivePath ); + sal_Int32 nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath ); if (nCurrentStatePathIndex < 0) return; @@ -289,7 +289,7 @@ namespace svt // it's the path we are just activating -> no need to check anything continue; // the index from which on both paths differ - sal_Int32 nDivergenceIndex = m_pImpl->getFirstDifferentIndex( rActivePath, aPathPos->second ); + sal_Int32 nDivergenceIndex = RoadmapWizardImpl::getFirstDifferentIndex( rActivePath, aPathPos->second ); if ( nDivergenceIndex <= nCurrentStatePathIndex ) // they differ in an index which we have already left behind us // -> this is no conflict anymore @@ -379,7 +379,7 @@ namespace svt Paths::const_iterator aActivePathPos = m_pImpl->aPaths.find( m_pImpl->nActivePath ); if ( aActivePathPos != m_pImpl->aPaths.end() ) - nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( _nCurrentState, aActivePathPos->second ); + nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( _nCurrentState, aActivePathPos->second ); DBG_ASSERT( nCurrentStatePathIndex != -1, "RoadmapWizard::determineNextState: ehm - how can we travel if there is no (valid) active path?" ); if ( nCurrentStatePathIndex == -1 ) @@ -408,7 +408,7 @@ namespace svt { // check how many paths are still allowed const WizardPath& rActivePath( m_pImpl->aPaths[ m_pImpl->nActivePath ] ); - sal_Int32 nCurrentStatePathIndex = m_pImpl->getStateIndexInPath( getCurrentState(), rActivePath ); + sal_Int32 nCurrentStatePathIndex = RoadmapWizardImpl::getStateIndexInPath( getCurrentState(), rActivePath ); size_t nPossiblePaths(0); for ( Paths::const_iterator aPathPos = m_pImpl->aPaths.begin(); @@ -417,7 +417,7 @@ namespace svt ) { // the index from which on both paths differ - sal_Int32 nDivergenceIndex = m_pImpl->getFirstDifferentIndex( rActivePath, aPathPos->second ); + sal_Int32 nDivergenceIndex = RoadmapWizardImpl::getFirstDifferentIndex( rActivePath, aPathPos->second ); if ( nDivergenceIndex > nCurrentStatePathIndex ) // this path is still a possible path diff --git a/svtools/source/filter/exportdialog.hxx b/svtools/source/filter/exportdialog.hxx index d7cb0f71a595..3cc1cd6968b4 100644 --- a/svtools/source/filter/exportdialog.hxx +++ b/svtools/source/filter/exportdialog.hxx @@ -161,7 +161,7 @@ private: void GetGraphicSource(); bool GetGraphicStream(); - Bitmap GetGraphicBitmap( SvStream& rStream ); + static Bitmap GetGraphicBitmap( SvStream& rStream ); ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > GetFilterData( bool bUpdateConfig ); diff --git a/svtools/source/graphic/provider.cxx b/svtools/source/graphic/provider.cxx index 5a224189b3ab..1229ba122c4c 100644 --- a/svtools/source/graphic/provider.cxx +++ b/svtools/source/graphic/provider.cxx @@ -102,7 +102,7 @@ uno::Sequence< sal_Int8 > SAL_CALL GraphicProvider::getImplementationId() -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; if( rResourceURL.startsWith( UNO_NAME_GRAPHOBJ_URLPREFIX ) ) @@ -121,7 +121,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadGraphicObject( co return xRet; } -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -144,7 +144,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadMemory( const OUS -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -165,7 +165,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadRepositoryImage( -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; @@ -195,7 +195,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadStandardImage( co -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno::Reference< awt::XBitmap >& xBtm ) { uno::Reference< ::graphic::XGraphic > xRet; uno::Sequence< sal_Int8 > aBmpSeq( xBtm->getDIB() ); @@ -229,7 +229,7 @@ uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadBitmap( const uno -uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) const +uno::Reference< ::graphic::XGraphic > GraphicProvider::implLoadResource( const OUString& rResourceURL ) { uno::Reference< ::graphic::XGraphic > xRet; sal_Int32 nIndex = 0; diff --git a/svtools/source/inc/provider.hxx b/svtools/source/inc/provider.hxx index 416abbf17d45..69ab382630cd 100644 --- a/svtools/source/inc/provider.hxx +++ b/svtools/source/inc/provider.hxx @@ -53,12 +53,12 @@ protected: private: - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap ) const; - ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ) const; + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadMemory( const OUString& rResourceURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadGraphicObject( const OUString& rResourceURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadResource( const OUString& rResourceURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadRepositoryImage( const OUString& rResourceURL ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadBitmap( const ::com::sun::star::uno::Reference< ::com::sun::star::awt::XBitmap >& rBitmap ); + static ::com::sun::star::uno::Reference< ::com::sun::star::graphic::XGraphic > implLoadStandardImage( const OUString& rResourceURL ); }; } diff --git a/svtools/source/inc/unoiface.hxx b/svtools/source/inc/unoiface.hxx index 684c96457022..187956adf699 100644 --- a/svtools/source/inc/unoiface.hxx +++ b/svtools/source/inc/unoiface.hxx @@ -247,7 +247,7 @@ private: ItemListenerMultiplexer maItemListeners; RMItemData CurRMItemData; - RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent ); + static RMItemData GetRMItemData( const ::com::sun::star::container::ContainerEvent& _rEvent ); protected: ::svt::ORoadmap* GetRoadmap() const; diff --git a/svtools/source/misc/imap2.cxx b/svtools/source/misc/imap2.cxx index 5edf20315975..0ac0804d5675 100644 --- a/svtools/source/misc/imap2.cxx +++ b/svtools/source/misc/imap2.cxx @@ -39,7 +39,7 @@ TYPEINIT0_AUTOFACTORY( ImageMap ); -void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); @@ -50,7 +50,7 @@ void IMapObject::AppendCERNCoords(OStringBuffer& rBuf, const Point& rPoint100) c rBuf.append(") "); } -void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) const +void IMapObject::AppendNCSACoords(OStringBuffer& rBuf, const Point& rPoint100) { const Point aPixPt( Application::GetDefaultDevice()->LogicToPixel( rPoint100, MapMode( MAP_100TH_MM ) ) ); diff --git a/svtools/source/misc/templatefoldercache.cxx b/svtools/source/misc/templatefoldercache.cxx index 399a31562760..86fa6fb4a269 100644 --- a/svtools/source/misc/templatefoldercache.cxx +++ b/svtools/source/misc/templatefoldercache.cxx @@ -451,7 +451,7 @@ namespace svt /// read the current state of the dirs bool readCurrentState(); - OUString implParseSmart( const OUString& _rPath ); + static OUString implParseSmart( const OUString& _rPath ); bool implReadFolder( const ::rtl::Reference< TemplateContent >& _rxRoot ); diff --git a/svtools/source/table/tablecontrol_impl.hxx b/svtools/source/table/tablecontrol_impl.hxx index d490e479e2bf..5fef6fdd4062 100644 --- a/svtools/source/table/tablecontrol_impl.hxx +++ b/svtools/source/table/tablecontrol_impl.hxx @@ -197,7 +197,7 @@ namespace svt { namespace table OUString getCellContentAsString( RowPos const i_row, ColPos const i_col ); /** returns the position of the current row in the selection vector */ - int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current); + static int getRowSelectedNumber(const ::std::vector<RowPos>& selectedRows, RowPos current); void invalidateRect(const Rectangle &rInvalidateRect); diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx index cc32eb4851dd..c4a04f9ecc78 100644 --- a/svtools/source/uno/treecontrolpeer.cxx +++ b/svtools/source/uno/treecontrolpeer.cxx @@ -1121,13 +1121,13 @@ void TreeControlPeer::updateChildNodes( UnoTreeListBoxImpl& rTree, const Referen updateEntry( pCurrentChild ); } - pCurrentChild = dynamic_cast< UnoTreeListEntry* >( rTree.NextSibling( pCurrentChild ) ); + pCurrentChild = dynamic_cast< UnoTreeListEntry* >( SvTreeListBox::NextSibling( pCurrentChild ) ); } // check if we have entries without nodes left, we need to remove them while( pCurrentChild ) { - UnoTreeListEntry* pNextChild = dynamic_cast< UnoTreeListEntry* >( rTree.NextSibling( pCurrentChild ) ); + UnoTreeListEntry* pNextChild = dynamic_cast< UnoTreeListEntry* >( SvTreeListBox::NextSibling( pCurrentChild ) ); rTree.GetModel()->Remove( pCurrentChild ); pCurrentChild = pNextChild; } diff --git a/svtools/source/uno/treecontrolpeer.hxx b/svtools/source/uno/treecontrolpeer.hxx index 613d255732c4..870a34fcbc7c 100644 --- a/svtools/source/uno/treecontrolpeer.hxx +++ b/svtools/source/uno/treecontrolpeer.hxx @@ -134,7 +134,7 @@ private: void updateNode( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xNode, bool bRecursive ); void updateChildNodes( UnoTreeListBoxImpl& rTree, const ::com::sun::star::uno::Reference< ::com::sun::star::awt::tree::XTreeNode >& xParentNode, UnoTreeListEntry* pParentEntry ); - OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); + static OUString getEntryString( const ::com::sun::star::uno::Any& rValue ); UnoTreeListBoxImpl& getTreeListBoxOrThrow() const throw (::com::sun::star::uno::RuntimeException ); void ChangeNodesSelection( const ::com::sun::star::uno::Any& rSelection, bool bSelect, bool bSetSelection ) throw( ::com::sun::star::uno::RuntimeException, ::com::sun::star::lang::IllegalArgumentException ); diff --git a/svtools/source/uno/unoimap.cxx b/svtools/source/uno/unoimap.cxx index a368c9c0046e..ba7be37d2020 100644 --- a/svtools/source/uno/unoimap.cxx +++ b/svtools/source/uno/unoimap.cxx @@ -527,7 +527,7 @@ public: virtual ~SvUnoImageMap(); bool fillImageMap( ImageMap& rMap ) const; - SvUnoImageMapObject* getObject( const Any& aElement ) const throw( IllegalArgumentException ); + static SvUnoImageMapObject* getObject( const Any& aElement ) throw( IllegalArgumentException ); UNO3_GETIMPLEMENTATION_DECL( SvUnoImageMap ) @@ -587,7 +587,7 @@ SvUnoImageMap::~SvUnoImageMap() } } -SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) const +SvUnoImageMapObject* SvUnoImageMap::getObject( const Any& aElement ) throw( IllegalArgumentException ) { Reference< XInterface > xObject; diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index da52985db230..8ecf292a752d 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2904,10 +2904,10 @@ namespace svxform ManageNamespaceDialog aDlg( this, m_pConditionDlg, true ); SvTreeListEntry* pEntry = m_pNamespacesList->FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); - OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) ); + OUString sPrefix( SvTabListBox::GetEntryText( pEntry, 0 ) ); aDlg.SetNamespace( sPrefix, - m_pNamespacesList->GetEntryText( pEntry, 1 ) ); + SvTabListBox::GetEntryText( pEntry, 1 ) ); if ( aDlg.Execute() == RET_OK ) { // if a prefix was changed, mark the old prefix as 'removed' @@ -2922,7 +2922,7 @@ namespace svxform { SvTreeListEntry* pEntry = m_pNamespacesList->FirstSelected(); DBG_ASSERT( pEntry, "NamespaceItemDialog::ClickHdl(): no entry" ); - OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) ); + OUString sPrefix( SvTabListBox::GetEntryText( pEntry, 0 ) ); m_aRemovedList.push_back( sPrefix ); m_pNamespacesList->GetModel()->Remove( pEntry ); } @@ -2949,8 +2949,8 @@ namespace svxform for( i = 0; i < nEntryCount; ++i ) { SvTreeListEntry* pEntry = m_pNamespacesList->GetEntry(i); - OUString sPrefix( m_pNamespacesList->GetEntryText( pEntry, 0 ) ); - OUString sURL( m_pNamespacesList->GetEntryText( pEntry, 1 ) ); + OUString sPrefix( SvTabListBox::GetEntryText( pEntry, 0 ) ); + OUString sURL( SvTabListBox::GetEntryText( pEntry, 1 ) ); if ( m_rNamespaces->hasByName( sPrefix ) ) m_rNamespaces->replaceByName( sPrefix, makeAny( sURL ) ); diff --git a/sw/source/filter/html/svxcss1.cxx b/sw/source/filter/html/svxcss1.cxx index 93ba8b334cda..88cb86c71dc1 100644 --- a/sw/source/filter/html/svxcss1.cxx +++ b/sw/source/filter/html/svxcss1.cxx @@ -1100,7 +1100,7 @@ static void ParseCSS1_font_family( const CSS1Expression *pExpr, sal_Handle hFont = pFList->GetFirstFontInfo( aIdent ); if( 0 != hFont ) { - const vcl::FontInfo& rFInfo = pFList->GetFontInfo( hFont ); + const vcl::FontInfo& rFInfo = FontList::GetFontInfo( hFont ); if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() ) { bFound = true; diff --git a/sw/source/filter/html/swhtml.cxx b/sw/source/filter/html/swhtml.cxx index f7699c78766d..5f59460e8672 100644 --- a/sw/source/filter/html/swhtml.cxx +++ b/sw/source/filter/html/swhtml.cxx @@ -3790,7 +3790,7 @@ void SwHTMLParser::NewFontAttr( int nToken ) sal_Handle hFont = pFList->GetFirstFontInfo( aFName ); if( 0 != hFont ) { - const vcl::FontInfo& rFInfo = pFList->GetFontInfo( hFont ); + const vcl::FontInfo& rFInfo = FontList::GetFontInfo( hFont ); if( RTL_TEXTENCODING_DONTKNOW != rFInfo.GetCharSet() ) { bFound = true; diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 8942afc698db..63bcbca4c579 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -281,7 +281,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if(pSelect) { - const OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); + const OUString sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); if (sCommand.isEmpty()) return 0; @@ -298,7 +298,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) xMgr->createInstance("com.sun.star.sdb.RowSet"), UNO_QUERY); uno::Reference<XPropertySet> xRowProperties(xRowSet, UNO_QUERY); xRowProperties->setPropertyValue("DataSourceName", - makeAny(m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1))); + makeAny(SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1))); xRowProperties->setPropertyValue("Command", makeAny(sCommand)); xRowProperties->setPropertyValue("CommandType", makeAny(pUserData->nCommandType)); xRowProperties->setPropertyValue("ActiveConnection", makeAny(pUserData->xConnection.getTyped())); @@ -473,7 +473,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt AddressUserData_Impl* pUserData = 0; if(pSelect) { - const OUString sTable(pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1)); + const OUString sTable(SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1)); if(sTable.isEmpty()) { pThis->m_pListLB->SetEntryText(pThis->m_sConnecting, pSelect, ITEMID_TABLE - 1); @@ -503,12 +503,12 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEnt else { //otherwise set the selected db-data - pThis->m_aDBData.sDataSource = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1); - pThis->m_aDBData.sCommand = pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); + pThis->m_aDBData.sDataSource = SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1); + pThis->m_aDBData.sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); pThis->m_aDBData.nCommandType = pUserData->nCommandType; pThis->m_pOK->Enable(true); } - if(pThis->m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1) == pThis->m_sConnecting) + if(SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1) == pThis->m_sConnecting) pThis->m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1); } pThis->m_pEditPB->Enable(pUserData && !pUserData->sURL.isEmpty() && @@ -531,7 +531,7 @@ void SwAddressListDialog::DetectTablesAndQueries( uno::Reference<XCompletedConnection> xComplConnection; if(!pUserData->xConnection.is()) { - m_aDBData.sDataSource = m_pListLB->GetEntryText(pSelect, ITEMID_NAME - 1); + m_aDBData.sDataSource = SvTabListBox::GetEntryText(pSelect, ITEMID_NAME - 1); m_xDBContext->getByName(m_aDBData.sDataSource) >>= xComplConnection; pUserData->xSource = uno::Reference<XDataSource>(xComplConnection, UNO_QUERY); @@ -563,7 +563,7 @@ void SwAddressListDialog::DetectTablesAndQueries( { //now call the table select dialog - if more than one table exists boost::scoped_ptr<SwSelectDBTableDialog> pDlg(new SwSelectDBTableDialog(this, pUserData->xConnection)); - const OUString sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); + const OUString sTable = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); if(!sTable.isEmpty()) pDlg->SetSelectedTable(sTable, pUserData->nCommandType == CommandType::TABLE); if(RET_OK == pDlg->Execute()) @@ -604,7 +604,7 @@ void SwAddressListDialog::DetectTablesAndQueries( else m_pListLB->SetEntryText(OUString(), pSelect, ITEMID_TABLE - 1); } - const OUString sCommand = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); + const OUString sCommand = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); m_pOK->Enable(pSelect && !sCommand.isEmpty()); m_pFilterPB->Enable( pUserData->xConnection.is() && !sCommand.isEmpty() ); m_pTablePB->Enable( pUserData->nTableAndQueryCount > 1 ); @@ -625,7 +625,7 @@ IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); //only call the table select dialog if tables have not been searched for or there //are more than 1 - const OUString sTable = m_pListLB->GetEntryText(pSelect, ITEMID_TABLE - 1); + const OUString sTable = SvTabListBox::GetEntryText(pSelect, ITEMID_TABLE - 1); if( pUserData->nTableAndQueryCount > 1 || pUserData->nTableAndQueryCount == -1) { DetectTablesAndQueries(pSelect, (pButton != 0) || sTable.isEmpty()); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index 9978bd22d6ce..1b8ca4eec2dc 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -155,7 +155,7 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) SvTreeListEntry* pEntry = m_pTable->FirstSelected(); if(pEntry) { - OUString sTableOrQuery = m_pTable->GetEntryText(pEntry, 0); + OUString sTableOrQuery = SvTabListBox::GetEntryText(pEntry, 0); sal_Int32 nCommandType = 0 == pEntry->GetUserData() ? 0 : 1; OUString sDataSourceName; @@ -191,7 +191,7 @@ OUString SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable) { SvTreeListEntry* pEntry = m_pTable->FirstSelected(); bIsTable = pEntry->GetUserData() ? false : true; - return m_pTable->GetEntryText(pEntry, 0); + return SvTabListBox::GetEntryText(pEntry, 0); } void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsTable) @@ -199,8 +199,8 @@ void SwSelectDBTableDialog::SetSelectedTable(const OUString& rTable, bool bIsT SvTreeListEntry* pEntry = m_pTable->First(); while(pEntry) { - if((m_pTable->GetEntryText(pEntry, 0) == rTable) && - ((pEntry->GetUserData() == 0 ) == bIsTable)) + if((SvTabListBox::GetEntryText(pEntry, 0) == rTable) && + ((pEntry->GetUserData() == 0 ) == bIsTable)) { m_pTable->Select(pEntry); break; diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index faa738fb3582..fbe660f9fedc 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -908,7 +908,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) // because of the repositioning we have to start at the beginning again bRestart = true; pParent = m_pTree->GetParent(pEntry); - m_pTree->GetModel()->Move(pChild, pParent, m_pTree->GetModel()->GetRelPos(pEntry)); + m_pTree->GetModel()->Move(pChild, pParent, SvTreeList::GetRelPos(pEntry)); } pRemove = pEntry; } diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 08decd16e133..6f99aa25cebd 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -691,7 +691,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(vcl::Window* pParent, if (!aName.isEmpty()) { SvTreeListEntry* pEntry = m_pHeaderTree->First(); - while (pEntry && m_pHeaderTree->GetEntryText(pEntry, 0) != aName) + while (pEntry && SvTabListBox::GetEntryText(pEntry, 0) != aName) { pEntry = m_pHeaderTree->Next(pEntry); } @@ -722,7 +722,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) { if(!pStyleArr[nLevel].isEmpty()) pStyleArr[nLevel] += OUString(TOX_STYLE_DELIMITER); - pStyleArr[nLevel] += m_pHeaderTree->GetEntryText(pEntry, 0); + pStyleArr[nLevel] += SvTabListBox::GetEntryText(pEntry, 0); } pEntry = m_pHeaderTree->Next(pEntry); } |