From 4b313fd5661ca5ac096e60d46691b1a9857877d9 Mon Sep 17 00:00:00 2001 From: Kohei Yoshida Date: Thu, 18 Oct 2012 16:28:20 +0200 Subject: Merge SvListEntry and SvLBoxEntry into SvTreeListEntry. Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee --- cui/source/options/certpath.cxx | 16 +++---- cui/source/options/certpath.hxx | 2 +- cui/source/options/dbregister.cxx | 14 +++--- cui/source/options/fontsubs.cxx | 26 +++++------ cui/source/options/fontsubs.hxx | 10 ++--- cui/source/options/optHeaderTabListbox.cxx | 8 ++-- cui/source/options/optHeaderTabListbox.hxx | 2 +- cui/source/options/optdict.cxx | 20 ++++----- cui/source/options/optfltr.cxx | 16 +++---- cui/source/options/optfltr.hxx | 6 +-- cui/source/options/optjava.cxx | 16 +++---- cui/source/options/optjava.hxx | 2 +- cui/source/options/optlingu.cxx | 72 +++++++++++++++--------------- cui/source/options/optpath.cxx | 10 ++--- cui/source/options/radiobtnbox.cxx | 6 +-- cui/source/options/treeopt.cxx | 38 ++++++++-------- cui/source/options/webconninfo.cxx | 10 ++--- 17 files changed, 137 insertions(+), 137 deletions(-) (limited to 'cui/source/options') diff --git a/cui/source/options/certpath.cxx b/cui/source/options/certpath.cxx index 667e72bf725c..d7a0b83f7e68 100644 --- a/cui/source/options/certpath.cxx +++ b/cui/source/options/certpath.cxx @@ -104,7 +104,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) : ::rtl::OUString sProfilePath = xMozillaBootstrap->getProfilePath( productTypes[i], profile ); rtl::OUStringBuffer sEntry; sEntry.append('\t').appendAscii(productNames[i]).append(':').append(profile).append('\t').append(sProfilePath); - SvLBoxEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); + SvTreeListEntry *pEntry = m_aCertPathList.InsertEntry(sEntry.makeStringAndClear()); rtl::OUString* pCertPath = new rtl::OUString(sProfilePath); pEntry->SetUserData(pCertPath); } @@ -114,7 +114,7 @@ CertPathDialog::CertPathDialog( Window* pParent ) : { } - SvLBoxEntry *pEntry = m_aCertPathList.GetEntry(0); + SvTreeListEntry *pEntry = m_aCertPathList.GetEntry(0); if (pEntry) { m_aCertPathList.SetCheckButtonState(pEntry, SV_BUTTON_CHECKED); @@ -163,14 +163,14 @@ IMPL_LINK_NOARG(CertPathDialog, OKHdl_Impl) rtl::OUString CertPathDialog::getDirectory() const { - SvLBoxEntry* pEntry = m_aCertPathList.FirstSelected(); + SvTreeListEntry* pEntry = m_aCertPathList.FirstSelected(); void* pCertPath = pEntry ? pEntry->GetUserData() : NULL; return pCertPath ? *static_cast(pCertPath) : rtl::OUString(); } CertPathDialog::~CertPathDialog() { - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { rtl::OUString* pCertPath = static_cast(pEntry->GetUserData()); @@ -181,14 +181,14 @@ CertPathDialog::~CertPathDialog() IMPL_LINK( CertPathDialog, CheckHdl_Impl, SvxSimpleTable *, pList ) { - SvLBoxEntry* pEntry = pList ? m_aCertPathList.GetEntry(m_aCertPathList.GetCurMousePoint()) + SvTreeListEntry* pEntry = pList ? m_aCertPathList.GetEntry(m_aCertPathList.GetCurMousePoint()) : m_aCertPathList.FirstSelected(); if (pEntry) m_aCertPathList.HandleEntryChecked(pEntry); return 0; } -void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) +void CertPathDialog::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_aCertPathList.Select( _pEntry, true ); SvButtonState eState = m_aCertPathList.GetCheckButtonState( _pEntry ); @@ -196,7 +196,7 @@ void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) if (SV_BUTTON_CHECKED == eState) { // uncheck the other entries - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { if (pEntry != _pEntry) @@ -210,7 +210,7 @@ void CertPathDialog::HandleCheckEntry( SvLBoxEntry* _pEntry ) void CertPathDialog::AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath) { - SvLBoxEntry* pEntry = m_aCertPathList.First(); + SvTreeListEntry* pEntry = m_aCertPathList.First(); while (pEntry) { rtl::OUString* pCertPath = static_cast(pEntry->GetUserData()); diff --git a/cui/source/options/certpath.hxx b/cui/source/options/certpath.hxx index 8c54c3f2b95d..65d9a77e1fdb 100644 --- a/cui/source/options/certpath.hxx +++ b/cui/source/options/certpath.hxx @@ -55,7 +55,7 @@ private: DECL_LINK(AddHdl_Impl, void *); DECL_LINK(OKHdl_Impl, void *); - void HandleCheckEntry(SvLBoxEntry* _pEntry); + void HandleCheckEntry(SvTreeListEntry* _pEntry); void AddCertPath(const rtl::OUString &rProfile, const rtl::OUString &rPath); public: CertPathDialog(Window* pParent); diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx index 7d1ef86a0a50..590d0fb79912 100644 --- a/cui/source/options/dbregister.cxx +++ b/cui/source/options/dbregister.cxx @@ -197,7 +197,7 @@ sal_Bool DbRegistrationOptionsPage::FillItemSet( SfxItemSet& rCoreSet ) sal_uLong nCount = pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = pPathBox->GetEntry(i); + SvTreeListEntry* pEntry = pPathBox->GetEntry(i); DatabaseRegistration* pRegistration = static_cast< DatabaseRegistration* >( pEntry->GetUserData() ); if ( pRegistration && !pRegistration->sLocation.isEmpty() ) { @@ -276,7 +276,7 @@ void DbRegistrationOptionsPage::FillUserData() IMPL_LINK_NOARG(DbRegistrationOptionsPage, DeleteHdl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); if ( pEntry ) { QueryBox aQuery(this,CUI_RES(QUERY_DELETE_CONFIRM)); @@ -297,7 +297,7 @@ IMPL_LINK_NOARG(DbRegistrationOptionsPage, NewHdl) IMPL_LINK_NOARG(DbRegistrationOptionsPage, EditHdl) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); if ( !pEntry ) return 0L; @@ -376,7 +376,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderEndDrag_Impl, HeaderBar*, pBar ) IMPL_LINK_NOARG(DbRegistrationOptionsPage, PathSelect_Impl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); bool bReadOnly = true; if ( pEntry ) @@ -396,7 +396,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co aStr += '\t'; aStr += String(_sLocation); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( _bReadOnly ) { Image aLocked( CUI_RES( RID_SVXBMP_LOCK ) ); @@ -411,7 +411,7 @@ void DbRegistrationOptionsPage::insertNewEntry( const ::rtl::OUString& _sName,co } // ----------------------------------------------------------------------------- -void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvLBoxEntry* _pEntry) +void DbRegistrationOptionsPage::openLinkDialog(const String& _sOldName,const String& _sOldLocation,SvTreeListEntry* _pEntry) { ODocumentLinkDialog aDlg(this,_pEntry == NULL); @@ -442,7 +442,7 @@ IMPL_LINK( DbRegistrationOptionsPage, NameValidator, String*, _pName ) sal_uLong nCount = pPathBox->GetEntryCount(); for ( sal_uLong i = 0; i < nCount; ++i ) { - SvLBoxEntry* pEntry = pPathBox->GetEntry(i); + SvTreeListEntry* pEntry = pPathBox->GetEntry(i); if ( (!m_pCurEntry || m_pCurEntry != pEntry) && pPathBox->GetEntryText(pEntry,0) == *_pName ) return 0L; } diff --git a/cui/source/options/fontsubs.cxx b/cui/source/options/fontsubs.cxx index 13ef512dbbb6..edc27c6d5975 100644 --- a/cui/source/options/fontsubs.cxx +++ b/cui/source/options/fontsubs.cxx @@ -146,9 +146,9 @@ SvxFontSubstTabPage::SvxFontSubstTabPage( Window* pParent, aFontHeightLB.InsertEntry(String::CreateFromInt32(nHeight)); } -SvLBoxEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) +SvTreeListEntry* SvxFontSubstTabPage::CreateEntry(String& rFont1, String& rFont2) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); @@ -186,7 +186,7 @@ sal_Bool SvxFontSubstTabPage::FillItemSet( SfxItemSet& ) pConfig->Enable(aUseTableCB.IsChecked()); - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -240,7 +240,7 @@ void SvxFontSubstTabPage::Reset( const SfxItemSet& ) const SubstitutionStruct* pSubs = pConfig->GetSubstitution(i); String aTmpStr1(pSubs->sFont); String aTmpStr2(pSubs->sReplaceBy); - SvLBoxEntry* pEntry = CreateEntry(aTmpStr1, aTmpStr2); + SvTreeListEntry* pEntry = CreateEntry(aTmpStr1, aTmpStr2); aCheckLB.Insert(pEntry); aCheckLB.CheckEntry(pEntry, 0, pSubs->bReplaceAlways); aCheckLB.CheckEntry(pEntry, 1, pSubs->bReplaceOnScreenOnly); @@ -273,7 +273,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) { if (pWin == &aNewDelTBX) { - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; // nCol is stupidly the nCol'th text column, not counted! // Therefor "0" as column. sal_uLong nPos = aCheckLB.GetEntryPos(aFont1CB.GetText(), 0); @@ -309,7 +309,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) pEntry = aCheckLB.FirstSelected(); while (pEntry) { - SvLBoxEntry* pDelEntry = pEntry; + SvTreeListEntry* pDelEntry = pEntry; pEntry = aCheckLB.NextSelected(pEntry); aCheckLB.RemoveEntry(pDelEntry); } @@ -321,7 +321,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) if (pWin == &aCheckLB) { - SvLBoxEntry* pEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pEntry = aCheckLB.FirstSelected(); if (aCheckLB.NextSelected(pEntry) == 0) { @@ -336,7 +336,7 @@ IMPL_LINK(SvxFontSubstTabPage, SelectHdl, Window*, pWin) if (nPos != 0xffffffff) { - SvLBoxEntry* pEntry = aCheckLB.GetEntry(nPos); + SvTreeListEntry* pEntry = aCheckLB.GetEntry(nPos); if (pEntry != aCheckLB.FirstSelected()) { @@ -378,7 +378,7 @@ void SvxFontSubstTabPage::CheckEnable() { sal_Bool bApply, bDelete; - SvLBoxEntry* pEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pEntry = aCheckLB.FirstSelected(); String sEntry = aFont1CB.GetText(); sEntry += '\t'; @@ -480,7 +480,7 @@ void SvxFontSubstCheckListBox::CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sa SvButtonState( SV_BUTTON_UNCHECKED ) ); } -void SvxFontSubstCheckListBox::CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) +void SvxFontSubstCheckListBox::CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked) { if ( pEntry ) SetCheckButtonState( @@ -495,12 +495,12 @@ sal_Bool SvxFontSubstCheckListBox::IsChecked(sal_uLong nPos, sal_uInt16 nCol) return GetCheckButtonState( GetEntry(nPos), nCol ) == SV_BUTTON_CHECKED; } -sal_Bool SvxFontSubstCheckListBox::IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol) +sal_Bool SvxFontSubstCheckListBox::IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol) { return GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED; } -void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) +void SvxFontSubstCheckListBox::SetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -525,7 +525,7 @@ void SvxFontSubstCheckListBox::SetCheckButtonState( SvLBoxEntry* pEntry, sal_uIn } } -SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const +SvButtonState SvxFontSubstCheckListBox::GetCheckButtonState( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); diff --git a/cui/source/options/fontsubs.hxx b/cui/source/options/fontsubs.hxx index 9775991da304..04afa3ebc13a 100644 --- a/cui/source/options/fontsubs.hxx +++ b/cui/source/options/fontsubs.hxx @@ -48,11 +48,11 @@ class SvxFontSubstCheckListBox : public SvxSimpleTable inline void SetUserData(sal_uLong nPos, void *pData ) { GetEntry(nPos)->SetUserData(pData); } sal_Bool IsChecked(sal_uLong nPos, sal_uInt16 nCol = 0); - sal_Bool IsChecked(SvLBoxEntry* pEntry, sal_uInt16 nCol = 0); + sal_Bool IsChecked(SvTreeListEntry* pEntry, sal_uInt16 nCol = 0); void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - void CheckEntry(SvLBoxEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState ); + void CheckEntry(SvTreeListEntry* pEntry, sal_uInt16 nCol, sal_Bool bChecked); + SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); }; // class SvxFontSubstTabPage ---------------------------------------------------- @@ -92,7 +92,7 @@ class SvxFontSubstTabPage : public SfxTabPage DECL_LINK(SelectHdl, Window *pWin = 0); DECL_LINK(NonPropFontsHdl, CheckBox* pBox); - SvLBoxEntry* CreateEntry(String& rFont1, String& rFont2); + SvTreeListEntry* CreateEntry(String& rFont1, String& rFont2); void CheckEnable(); diff --git a/cui/source/options/optHeaderTabListbox.cxx b/cui/source/options/optHeaderTabListbox.cxx index a479751a3986..6149c15b8f1c 100644 --- a/cui/source/options/optHeaderTabListbox.cxx +++ b/cui/source/options/optHeaderTabListbox.cxx @@ -29,15 +29,15 @@ namespace svx class OptLBoxString_Impl : public SvLBoxString { public: - OptLBoxString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : + OptLBoxString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rTxt ) : SvLBoxString( pEntry, nFlags, rTxt ) {} - virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ); + virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, SvTreeListEntry* pEntry ); }; // ----------------------------------------------------------------------- -void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvLBoxEntry* pEntry ) +void OptLBoxString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, SvTreeListEntry* pEntry ) { Font aOldFont( rDev.GetFont() ); Font aFont( aOldFont ); @@ -57,7 +57,7 @@ OptHeaderTabListBox::OptHeaderTabListBox( Window* pParent, WinBits nWinStyle ) : } // ----------------------------------------------------------------------- -void OptHeaderTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rTxt, +void OptHeaderTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rTxt, const Image& rImg1, const Image& rImg2, SvLBoxButtonKind eButtonKind ) { diff --git a/cui/source/options/optHeaderTabListbox.hxx b/cui/source/options/optHeaderTabListbox.hxx index dc28269a7998..472dcc13449b 100644 --- a/cui/source/options/optHeaderTabListbox.hxx +++ b/cui/source/options/optHeaderTabListbox.hxx @@ -30,7 +30,7 @@ namespace svx public: OptHeaderTabListBox( Window* pParent, WinBits nBits ); - virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); + virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind ); }; } // svx #endif // SVX_OPTHEADERTABLISTBOX_HXX diff --git a/cui/source/options/optdict.cxx b/cui/source/options/optdict.cxx index d478723adc70..e16644890006 100644 --- a/cui/source/options/optdict.cxx +++ b/cui/source/options/optdict.cxx @@ -381,7 +381,7 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) sal_uInt16 j; for( j = 0; j < aWordsLB.GetEntryCount(); j++ ) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry(j); + SvTreeListEntry* pEntry = aWordsLB.GetEntry(j); DBG_ASSERT( pEntry, "NULL pointer"); String aNormEntry( getNormDicEntry_Impl( rDicWord ) ); StringCompare eCmpRes = (StringCompare)pCollator-> @@ -395,7 +395,7 @@ sal_uInt16 SvxEditDictionaryDialog::GetLBInsertPos(const String &rDicWord) return nPos; } -void SvxEditDictionaryDialog::RemoveDictEntry(SvLBoxEntry* pEntry) +void SvxEditDictionaryDialog::RemoveDictEntry(SvTreeListEntry* pEntry) { sal_uInt16 nLBPos = aAllDictsLB.GetSelectEntryPos(); @@ -551,7 +551,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) { if(!bFirstSelect) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); String sTmpShort(pBox->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 @@ -574,7 +574,7 @@ IMPL_LINK(SvxEditDictionaryDialog, SelectHdl, SvTabListBox*, pBox) IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) { - SvLBoxEntry* pEntry = aWordsLB.FirstSelected(); + SvTreeListEntry* pEntry = aWordsLB.FirstSelected(); if(pBtn == &aDeletePB) { @@ -589,7 +589,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) } if(pBtn == &aNewReplacePB || aNewReplacePB.IsEnabled()) { - SvLBoxEntry* _pEntry = aWordsLB.FirstSelected(); + SvTreeListEntry* _pEntry = aWordsLB.FirstSelected(); XubString aNewWord(aWordED.GetText()); String sEntry(aNewWord); XubString aReplaceStr(aReplaceED.GetText()); @@ -638,7 +638,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) sEntry += aReplaceStr; } - SvLBoxEntry* pNewEntry = NULL; + SvTreeListEntry* pNewEntry = NULL; if(_pEntry) // entry selected in aWordsLB ie action = modify entry { aWordsLB.SetEntryText( sEntry, _pEntry ); @@ -647,7 +647,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) else { _nPos = GetLBInsertPos( aNewWord ); - SvLBoxEntry* pInsEntry = aWordsLB.InsertEntry(sEntry, 0, sal_False, + SvTreeListEntry* pInsEntry = aWordsLB.InsertEntry(sEntry, 0, sal_False, _nPos == USHRT_MAX ? LIST_APPEND : (sal_uInt32)_nPos); pNewEntry = pInsEntry; } @@ -673,7 +673,7 @@ IMPL_LINK(SvxEditDictionaryDialog, NewDelHdl, PushButton*, pBtn) IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) { - SvLBoxEntry* pFirstSel = aWordsLB.FirstSelected(); + SvTreeListEntry* pFirstSel = aWordsLB.FirstSelected(); String rEntry = pEdt->GetText(); xub_StrLen nWordLen=rEntry.Len(); @@ -693,7 +693,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) for(sal_uInt16 i = 0; i < aWordsLB.GetEntryCount(); i++) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry( i ); + SvTreeListEntry* pEntry = aWordsLB.GetEntry( i ); String aTestStr( aWordsLB.GetEntryText(pEntry, 0) ); eCmpRes = cmpDicEntry_Impl( rEntry, aTestStr ); if(CDE_DIFFERENT != eCmpRes) @@ -740,7 +740,7 @@ IMPL_LINK(SvxEditDictionaryDialog, ModifyHdl, Edit*, pEdt) } else if(aWordsLB.GetEntryCount()>0) { - SvLBoxEntry* pEntry = aWordsLB.GetEntry( 0 ); + SvTreeListEntry* pEntry = aWordsLB.GetEntry( 0 ); bDoNothing=sal_True; aWordsLB.MakeVisible(pEntry); bDoNothing=sal_False; diff --git a/cui/source/options/optfltr.cxx b/cui/source/options/optfltr.cxx index 6afeba5bdbfe..eddd6573151e 100644 --- a/cui/source/options/optfltr.cxx +++ b/cui/source/options/optfltr.cxx @@ -205,7 +205,7 @@ sal_Bool OfaMSFilterTabPage2::FillItemSet( SfxItemSet& ) InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { sal_uInt16 nCol = bFirst ? 1 : 2; - SvLBoxEntry* pEntry = GetEntry4Type( pArr->eType ); + SvTreeListEntry* pEntry = GetEntry4Type( pArr->eType ); if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); @@ -263,7 +263,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) InvalidCBEntry != pArr->eType; ++pArr, bFirst = !bFirst ) { sal_uInt16 nCol = bFirst ? 1 : 2; - SvLBoxEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) ); + SvTreeListEntry* pEntry = GetEntry4Type( static_cast< sal_IntPtr >( pArr->eType ) ); if( pEntry ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem( nCol )); @@ -282,7 +282,7 @@ void OfaMSFilterTabPage2::Reset( const SfxItemSet& ) void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aCheckLB ); @@ -298,9 +298,9 @@ void OfaMSFilterTabPage2::InsertEntry( const String& _rTxt, sal_IntPtr _nType ) aCheckLB.Insert( pEntry ); } -SvLBoxEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const +SvTreeListEntry* OfaMSFilterTabPage2::GetEntry4Type( sal_IntPtr _nType ) const { - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while ( pEntry ) { if ( _nType == sal_IntPtr( pEntry->GetUserData() ) ) @@ -335,7 +335,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::HBarClick() } void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( - SvLBoxEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) + SvTreeListEntry* pEntry, sal_uInt16 nCol, SvButtonState eState) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -361,7 +361,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::SetCheckButtonState( } SvButtonState OfaMSFilterTabPage2::MSFltrSimpleTable::GetCheckButtonState( - SvLBoxEntry* pEntry, sal_uInt16 nCol ) const + SvTreeListEntry* pEntry, sal_uInt16 nCol ) const { SvButtonState eState = SV_BUTTON_UNCHECKED; SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetItem(nCol + 1)); @@ -395,7 +395,7 @@ void OfaMSFilterTabPage2::MSFltrSimpleTable::KeyInput( const KeyEvent& rKEvt ) sal_uInt16 nCol = GetCurrentTabPos() - 1; if ( nCol < 2 ) { - SvLBoxEntry* pEntry = GetEntry( nSelPos ); + SvTreeListEntry* pEntry = GetEntry( nSelPos ); sal_Bool bIsChecked = ( GetCheckButtonState( pEntry, nCol ) == SV_BUTTON_CHECKED ); CheckEntryPos( nSelPos, nCol, !bIsChecked ); CallImplEventListeners( VCLEVENT_CHECKBOX_TOGGLE, (void*)pEntry ); diff --git a/cui/source/options/optfltr.hxx b/cui/source/options/optfltr.hxx index 7502703073dc..655bc106f5b1 100644 --- a/cui/source/options/optfltr.hxx +++ b/cui/source/options/optfltr.hxx @@ -64,8 +64,8 @@ class OfaMSFilterTabPage2 : public SfxTabPage using SvxSimpleTable::SetTabs; void CheckEntryPos(sal_uLong nPos, sal_uInt16 nCol, sal_Bool bChecked); - SvButtonState GetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol ) const; - void SetCheckButtonState( SvLBoxEntry*, sal_uInt16 nCol, SvButtonState ); + SvButtonState GetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol ) const; + void SetCheckButtonState( SvTreeListEntry*, sal_uInt16 nCol, SvButtonState ); protected: virtual void SetTabs(); virtual void HBarClick(); @@ -92,7 +92,7 @@ class OfaMSFilterTabPage2 : public SfxTabPage virtual ~OfaMSFilterTabPage2(); void InsertEntry( const String& _rTxt, sal_IntPtr _nType ); - SvLBoxEntry* GetEntry4Type( sal_IntPtr _nType ) const; + SvTreeListEntry* GetEntry4Type( sal_IntPtr _nType ) const; public: diff --git a/cui/source/options/optjava.cxx b/cui/source/options/optjava.cxx index d2d0347c5902..5157dae4cdc3 100644 --- a/cui/source/options/optjava.cxx +++ b/cui/source/options/optjava.cxx @@ -207,7 +207,7 @@ IMPL_LINK_NOARG(SvxJavaOptionsPage, EnableHdl_Impl) IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) { - SvLBoxEntry* pEntry = pList ? m_aJavaList.GetEntry( m_aJavaList.GetCurMousePoint() ) + SvTreeListEntry* pEntry = pList ? m_aJavaList.GetEntry( m_aJavaList.GetCurMousePoint() ) : m_aJavaList.FirstSelected(); if ( pEntry ) m_aJavaList.HandleEntryChecked( pEntry ); @@ -219,7 +219,7 @@ IMPL_LINK( SvxJavaOptionsPage, CheckHdl_Impl, SvxSimpleTable *, pList ) IMPL_LINK_NOARG(SvxJavaOptionsPage, SelectHdl_Impl) { // set installation directory info - SvLBoxEntry* pEntry = m_aJavaList.FirstSelected(); + SvTreeListEntry* pEntry = m_aJavaList.FirstSelected(); DBG_ASSERT( pEntry, "SvxJavaOptionsPage::SelectHdl_Impl(): no entry" ); String* pLocation = static_cast< String* >( pEntry->GetUserData() ); DBG_ASSERT( pLocation, "invalid location string" ); @@ -414,7 +414,7 @@ void SvxJavaOptionsPage::ClearJavaInfo() void SvxJavaOptionsPage::ClearJavaList() { - SvLBoxEntry* pEntry = m_aJavaList.First(); + SvTreeListEntry* pEntry = m_aJavaList.First(); while ( pEntry ) { String* pLocation = static_cast< String* >( pEntry->GetUserData() ); @@ -457,7 +457,7 @@ void SvxJavaOptionsPage::LoadJREs() JavaInfo* pCmpInfo = *parInfo++; if ( jfw_areEqualJavaInfo( pCmpInfo, pSelectedJava ) ) { - SvLBoxEntry* pEntry = m_aJavaList.GetEntry(i); + SvTreeListEntry* pEntry = m_aJavaList.GetEntry(i); if ( pEntry ) m_aJavaList.HandleEntryChecked( pEntry ); break; @@ -480,7 +480,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) sEntry.append('\t'); if ( ( _pInfo->nFeatures & JFW_FEATURE_ACCESSBRIDGE ) == JFW_FEATURE_ACCESSBRIDGE ) sEntry.append(m_sAccessibilityText); - SvLBoxEntry* pEntry = m_aJavaList.InsertEntry(sEntry.makeStringAndClear()); + SvTreeListEntry* pEntry = m_aJavaList.InsertEntry(sEntry.makeStringAndClear()); INetURLObject aLocObj( ::rtl::OUString( _pInfo->sLocation ) ); String* pLocation = new String( aLocObj.getFSysPath( INetURLObject::FSYS_DETECT ) ); pEntry->SetUserData( pLocation ); @@ -488,7 +488,7 @@ void SvxJavaOptionsPage::AddJRE( JavaInfo* _pInfo ) // ----------------------------------------------------------------------- -void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) +void SvxJavaOptionsPage::HandleCheckEntry( SvTreeListEntry* _pEntry ) { m_aJavaList.Select( _pEntry, sal_True ); SvButtonState eState = m_aJavaList.GetCheckButtonState( _pEntry ); @@ -496,7 +496,7 @@ void SvxJavaOptionsPage::HandleCheckEntry( SvLBoxEntry* _pEntry ) if ( SV_BUTTON_CHECKED == eState ) { // we have radio button behavior -> so uncheck the other entries - SvLBoxEntry* pEntry = m_aJavaList.First(); + SvTreeListEntry* pEntry = m_aJavaList.First(); while ( pEntry ) { if ( pEntry != _pEntry ) @@ -555,7 +555,7 @@ void SvxJavaOptionsPage::AddFolder( const ::rtl::OUString& _rFolder ) else jfw_freeJavaInfo( pInfo ); - SvLBoxEntry* pEntry = m_aJavaList.GetEntry( nPos ); + SvTreeListEntry* pEntry = m_aJavaList.GetEntry( nPos ); m_aJavaList.Select( pEntry ); m_aJavaList.SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); HandleCheckEntry( pEntry ); diff --git a/cui/source/options/optjava.hxx b/cui/source/options/optjava.hxx index d59f507fa85d..aed4aef70269 100644 --- a/cui/source/options/optjava.hxx +++ b/cui/source/options/optjava.hxx @@ -90,7 +90,7 @@ private: void ClearJavaList(); void LoadJREs(); void AddJRE( JavaInfo* _pInfo ); - void HandleCheckEntry( SvLBoxEntry* _pEntry ); + void HandleCheckEntry( SvTreeListEntry* _pEntry ); void AddFolder( const ::rtl::OUString& _rFolder ); public: diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx index 9beea46dd176..f732a6aade39 100644 --- a/cui/source/options/optlingu.cxx +++ b/cui/source/options/optlingu.cxx @@ -261,7 +261,7 @@ void DicUserData::SetChecked( sal_Bool bVal ) // class BrwString_Impl ------------------------------------------------- -static void lcl_SetCheckButton( SvLBoxEntry* pEntry, sal_Bool bCheck ) +static void lcl_SetCheckButton( SvTreeListEntry* pEntry, sal_Bool bCheck ) { SvLBoxButton* pItem = (SvLBoxButton*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXBUTTON)); @@ -280,15 +280,15 @@ class BrwStringDic_Impl : public SvLBoxString { public: - BrwStringDic_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + BrwStringDic_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; void BrwStringDic_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); Point aPos(rPos); @@ -447,15 +447,15 @@ class BrwString_Impl : public SvLBoxString { public: - BrwString_Impl( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + BrwString_Impl( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString( pEntry, nFlags, rStr ) {} virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; void BrwString_Impl::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { Point aPos(rPos); aPos.X() += 20; @@ -1271,7 +1271,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) aActiveDics.realloc( nDics ); OUString *pActiveDic = aActiveDics.getArray(); - SvLBoxEntry *pEntry = aLinguDicsCLB.GetEntry( i ); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetEntry( i ); if (pEntry) { DicUserData aData( (sal_uLong)pEntry->GetUserData() ); @@ -1305,7 +1305,7 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) nEntries = aLinguOptionsCLB.GetEntryCount(); for (sal_uInt16 j = 0; j < nEntries; ++j) { - SvLBoxEntry *pEntry = aLinguOptionsCLB.GetEntry( j ); + SvTreeListEntry *pEntry = aLinguOptionsCLB.GetEntry( j ); OptionsUserData aData( (sal_uLong)pEntry->GetUserData() ); String aPropName( lcl_GetPropertyName( (EID_OPTIONS) aData.GetEntryId() ) ); @@ -1327,8 +1327,8 @@ sal_Bool SvxLinguTabPage::FillItemSet( SfxItemSet& rCoreSet ) aLngCfg.SetProperty( aPropName, aAny ); } - SvLBoxEntry *pPreBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_PRE_BREAK ); - SvLBoxEntry *pPostBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_POST_BREAK ); + SvTreeListEntry *pPreBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_PRE_BREAK ); + SvTreeListEntry *pPostBreakEntry = aLinguOptionsCLB.GetEntry( (sal_uInt16) EID_NUM_POST_BREAK ); DBG_ASSERT( pPreBreakEntry, "NULL Pointer" ); DBG_ASSERT( pPostBreakEntry, "NULL Pointer" ); if (pPreBreakEntry && pPostBreakEntry) @@ -1389,7 +1389,7 @@ void SvxLinguTabPage::AddDicBoxEntry( SvxLocaleToLanguage( rxDic->getLocale() ), DictionaryType_NEGATIVE == rxDic->getDictionaryType() ) ); aLinguDicsCLB.InsertEntry( aTxt, (sal_uInt16)LISTBOX_APPEND ); // append at end - SvLBoxEntry* pEntry = aLinguDicsCLB.GetEntry( aLinguDicsCLB.GetEntryCount() - 1 ); + SvTreeListEntry* pEntry = aLinguDicsCLB.GetEntry( aLinguDicsCLB.GetEntryCount() - 1 ); DBG_ASSERT( pEntry, "failed to add entry" ); if (pEntry) { @@ -1435,7 +1435,7 @@ void SvxLinguTabPage::UpdateModulesBox_Impl() { const ServiceInfo_Impl &rInfo = rAllDispSrvcArr[i]; aLinguModulesCLB.InsertEntry( rInfo.sDisplayName, (sal_uInt16)LISTBOX_APPEND ); - SvLBoxEntry* pEntry = aLinguModulesCLB.GetEntry(i); + SvTreeListEntry* pEntry = aLinguModulesCLB.GetEntry(i); pEntry->SetUserData( (void *) &rInfo ); aLinguModulesCLB.CheckEntryPos( i, rInfo.bConfigured ); } @@ -1466,7 +1466,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet ) aLinguOptionsCLB.Clear(); SvLBoxTreeList *pModel = aLinguOptionsCLB.GetModel(); - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; sal_Int16 nVal = 0; sal_Bool bVal = sal_False; @@ -1619,7 +1619,7 @@ IMPL_LINK( SvxLinguTabPage, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) const uno::Reference< XDictionary > &rDic = aDics.getConstArray()[ nPos ]; if (SvxGetIgnoreAllList() == rDic) { - SvLBoxEntry* pEntry = aLinguDicsCLB.GetEntry( nPos ); + SvTreeListEntry* pEntry = aLinguDicsCLB.GetEntry( nPos ); if (pEntry) lcl_SetCheckButton( pEntry, sal_True ); } @@ -1690,7 +1690,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else if (&aLinguDicsEditPB == pBtn) { - SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1721,7 +1721,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) QueryBox( this, CUI_RES( RID_SFXQB_DELDICT ) ).Execute() ) return 0; - SvLBoxEntry *pEntry = aLinguDicsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguDicsCLB.GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1759,7 +1759,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) sal_uLong nCnt = aLinguDicsCLB.GetEntryCount(); for (sal_uLong i = 0; i < nCnt; ++i) { - SvLBoxEntry *pDicEntry = aLinguDicsCLB.GetEntry( i ); + SvTreeListEntry *pDicEntry = aLinguDicsCLB.GetEntry( i ); DBG_ASSERT( pDicEntry, "missing entry" ); if (pDicEntry) { @@ -1780,7 +1780,7 @@ IMPL_LINK( SvxLinguTabPage, ClickHdl_Impl, PushButton *, pBtn ) } else if (&aLinguOptionsEditPB == pBtn) { - SvLBoxEntry *pEntry = aLinguOptionsCLB.GetCurEntry(); + SvTreeListEntry *pEntry = aLinguOptionsCLB.GetCurEntry(); DBG_ASSERT( pEntry, "no entry selected" ); if (pEntry) { @@ -1829,7 +1829,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else if (&aLinguDicsCLB == pBox) { - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { DicUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1841,7 +1841,7 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) } else if (&aLinguOptionsCLB == pBox) { - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { OptionsUserData aData( (sal_uLong) pEntry->GetUserData() ); @@ -1858,9 +1858,9 @@ IMPL_LINK( SvxLinguTabPage, SelectHdl_Impl, SvxCheckListBox *, pBox ) // ----------------------------------------------------------------------- -SvLBoxEntry* SvxLinguTabPage::CreateEntry( String& rTxt, sal_uInt16 nCol ) +SvTreeListEntry* SvxLinguTabPage::CreateEntry( String& rTxt, sal_uInt16 nCol ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) pCheckButtonData = new SvLBoxButtonData( &aLinguOptionsCLB ); @@ -2021,9 +2021,9 @@ SvxEditModulesDlg::~SvxEditModulesDlg() } -SvLBoxEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) +SvTreeListEntry* SvxEditModulesDlg::CreateEntry( String& rTxt, sal_uInt16 nCol ) { - SvLBoxEntry* pEntry = new SvLBoxEntry; + SvTreeListEntry* pEntry = new SvTreeListEntry; if( !pCheckButtonData ) { pCheckButtonData = new SvLBoxButtonData( &aModulesCLB ); @@ -2047,7 +2047,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) { sal_Bool bDisableUp = sal_True; sal_Bool bDisableDown = sal_True; - SvLBoxEntry *pEntry = pBox->GetCurEntry(); + SvTreeListEntry *pEntry = pBox->GetCurEntry(); if (pEntry) { ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); @@ -2080,7 +2080,7 @@ IMPL_LINK( SvxEditModulesDlg, SelectHdl_Impl, SvxCheckListBox *, pBox ) IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { pBox = &aModulesCLB; - SvLBoxEntry *pCurEntry = pBox->GetCurEntry(); + SvTreeListEntry *pCurEntry = pBox->GetCurEntry(); if (pCurEntry) { ModuleUserData_Impl* pData = (ModuleUserData_Impl *) @@ -2089,7 +2089,7 @@ IMPL_LINK( SvxEditModulesDlg, BoxCheckButtonHdl_Impl, SvTreeListBox *, pBox ) { // make hyphenator checkboxes function as radio-buttons // (at most one box may be checked) - SvLBoxEntry *pEntry = pBox->First(); + SvTreeListEntry *pEntry = pBox->First(); while (pEntry) { pData = (ModuleUserData_Impl *) pEntry->GetUserData(); @@ -2127,7 +2127,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) sal_Bool bChanged = sal_False; for(sal_uInt16 i = 0; i < aModulesCLB.GetEntryCount(); i++) { - SvLBoxEntry *pEntry = aModulesCLB.GetEntry(i); + SvTreeListEntry *pEntry = aModulesCLB.GetEntry(i); ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); if(pData->IsParent()) { @@ -2185,7 +2185,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) // // spellchecker entries // - SvLBoxEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); + SvTreeListEntry* pEntry = CreateEntry( sSpell, CBCOL_SECOND ); ModuleUserData_Impl* pUserData = new ModuleUserData_Impl( String(), sal_True, sal_False, TYPE_SPELL, 0 ); pEntry->SetUserData( (void *)pUserData ); @@ -2210,7 +2210,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetSpellTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2254,7 +2254,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetGrammarTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2298,7 +2298,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetHyphTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2342,7 +2342,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox ) if (!aImplName.isEmpty() && bIsSuppLang) { String aTxt( pInfo->sDisplayName ); - SvLBoxEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); + SvTreeListEntry* pNewEntry = CreateEntry( aTxt, CBCOL_FIRST ); LangImplNameTable &rTable = rLinguData.GetThesTable(); const bool bHasLang = rTable.count( eCurLanguage ); @@ -2368,7 +2368,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) { sal_Bool bUp = &aPrioUpPB == pBtn; sal_uInt16 nCurPos = aModulesCLB.GetSelectEntryPos(); - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; if (nCurPos != LISTBOX_ENTRY_NOTFOUND && 0 != (pEntry = aModulesCLB.GetEntry(nCurPos))) { @@ -2377,7 +2377,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn ) ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData(); String aStr(aModulesCLB.GetEntryText(pEntry)); - SvLBoxEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); + SvTreeListEntry* pToInsert = CreateEntry( aStr, CBCOL_FIRST ); pToInsert->SetUserData( (void *)pData); sal_Bool bIsChecked = aModulesCLB.IsChecked(nCurPos); diff --git a/cui/source/options/optpath.cxx b/cui/source/options/optpath.cxx index 90c0f2aa6939..6a8b4b4c0334 100644 --- a/cui/source/options/optpath.cxx +++ b/cui/source/options/optpath.cxx @@ -335,7 +335,7 @@ void SvxPathTabPage::Reset( const SfxItemSet& ) String aValue( sTmpPath ); aStr += '\t'; aStr += Convert_Impl( aValue ); - SvLBoxEntry* pEntry = pPathBox->InsertEntry( aStr ); + SvTreeListEntry* pEntry = pPathBox->InsertEntry( aStr ); if ( bReadOnly ) { pPathBox->SetCollapsedEntryBmp( pEntry, pImpl->m_aLockImage ); @@ -391,7 +391,7 @@ void SvxPathTabPage::FillUserData() IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) { sal_uInt16 nSelCount = 0; - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); //the entry image indicates whether the path is write protected Image aEntryImage; @@ -413,7 +413,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, PathSelect_Impl) IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) { - SvLBoxEntry* pEntry = pPathBox->FirstSelected(); + SvTreeListEntry* pEntry = pPathBox->FirstSelected(); while ( pEntry ) { PathUserData_Impl* pPathImpl = (PathUserData_Impl*)pEntry->GetUserData(); @@ -469,7 +469,7 @@ IMPL_LINK_NOARG(SvxPathTabPage, StandardHdl_Impl) void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); if ( !pEntry ) { SAL_WARN( "cui.options", "SvxPathTabPage::ChangeCurrentEntry(): no entry" ); @@ -534,7 +534,7 @@ void SvxPathTabPage::ChangeCurrentEntry( const String& _rFolder ) IMPL_LINK_NOARG(SvxPathTabPage, PathHdl_Impl) { - SvLBoxEntry* pEntry = pPathBox->GetCurEntry(); + SvTreeListEntry* pEntry = pPathBox->GetCurEntry(); sal_uInt16 nPos = ( pEntry != NULL ) ? ( (PathUserData_Impl*)pEntry->GetUserData() )->nRealId : 0; String sInternal, sUser, sWritable; if ( pEntry ) diff --git a/cui/source/options/radiobtnbox.cxx b/cui/source/options/radiobtnbox.cxx index dd5fb5979c7d..599b573c9835 100644 --- a/cui/source/options/radiobtnbox.cxx +++ b/cui/source/options/radiobtnbox.cxx @@ -52,7 +52,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) { if ( !rKEvt.GetKeyCode().GetModifier() && KEY_SPACE == rKEvt.GetKeyCode().GetCode() ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( GetCheckButtonState( pEntry ) == SV_BUTTON_UNCHECKED ) { SetCheckButtonState( pEntry, SV_BUTTON_CHECKED ); @@ -64,7 +64,7 @@ void SvxRadioButtonListBox::KeyInput( const KeyEvent& rKEvt ) SvxSimpleTable::KeyInput( rKEvt ); } -void SvxRadioButtonListBox::HandleEntryChecked( SvLBoxEntry* _pEntry ) +void SvxRadioButtonListBox::HandleEntryChecked( SvTreeListEntry* _pEntry ) { Select( _pEntry, sal_True ); SvButtonState eState = GetCheckButtonState( _pEntry ); @@ -72,7 +72,7 @@ void SvxRadioButtonListBox::HandleEntryChecked( SvLBoxEntry* _pEntry ) if ( SV_BUTTON_CHECKED == eState ) { // we have radio button behavior -> so uncheck the other entries - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { if ( pEntry != _pEntry ) diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx index b61ddd8c7e40..050d750b8f1b 100644 --- a/cui/source/options/treeopt.cxx +++ b/cui/source/options/treeopt.cxx @@ -535,7 +535,7 @@ OfaTreeOptionsDialog::OfaTreeOptionsDialog( Window* pParent, const rtl::OUString OfaTreeOptionsDialog::~OfaTreeOptionsDialog() { - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); // first children while(pEntry) { @@ -594,9 +594,9 @@ OptionsPageInfo* OfaTreeOptionsDialog::AddTabPage( sal_uInt16 nId, const String& rPageName, sal_uInt16 nGroup ) { OptionsPageInfo* pPageInfo = new OptionsPageInfo( nId ); - SvLBoxEntry* pParent = aTreeLB.GetEntry( 0, nGroup ); + SvTreeListEntry* pParent = aTreeLB.GetEntry( 0, nGroup ); DBG_ASSERT( pParent, "OfaTreeOptionsDialog::AddTabPage(): no group found" ); - SvLBoxEntry* pEntry = aTreeLB.InsertEntry( rPageName, pParent ); + SvTreeListEntry* pEntry = aTreeLB.InsertEntry( rPageName, pParent ); pEntry->SetUserData( pPageInfo ); return pPageInfo; } @@ -607,7 +607,7 @@ sal_uInt16 OfaTreeOptionsDialog::AddGroup(const String& rGroupName, SfxModule* pCreateModule, sal_uInt16 nDialogId ) { - SvLBoxEntry* pEntry = aTreeLB.InsertEntry(rGroupName); + SvTreeListEntry* pEntry = aTreeLB.InsertEntry(rGroupName); OptionsGroupInfo* pInfo = new OptionsGroupInfo( pCreateShell, pCreateModule, nDialogId ); pEntry->SetUserData(pInfo); @@ -673,7 +673,7 @@ IMPL_LINK_NOARG(OfaTreeOptionsDialog, OKHdl_Impl) } } - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); while ( pEntry ) { if ( aTreeLB.GetParent( pEntry ) ) @@ -703,12 +703,12 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) { pBox->Update(); pBox->InitStartEntry(); - SvLBoxEntry* pEntry = pBox->GetHdlEntry(); + SvTreeListEntry* pEntry = pBox->GetHdlEntry(); if(pEntry && pBox->IsExpanded(pEntry)) { sal_uInt32 nChildCount = pBox->GetChildCount( pEntry ); - SvLBoxEntry* pNext = pEntry; + SvTreeListEntry* pNext = pEntry; for(sal_uInt32 i = 0; i < nChildCount;i++) { pNext = pBox->GetNextEntryInView(pNext); @@ -735,7 +735,7 @@ IMPL_LINK(OfaTreeOptionsDialog, ExpandedHdl_Impl, SvTreeListBox*, pBox ) void OfaTreeOptionsDialog::ApplyItemSets() { - SvLBoxEntry* pEntry = aTreeLB.First(); + SvTreeListEntry* pEntry = aTreeLB.First(); while(pEntry) { if(!aTreeLB.GetParent(pEntry)) @@ -802,7 +802,7 @@ void OfaTreeOptionsDialog::ActivatePage( const String& rPageURL ) void OfaTreeOptionsDialog::ActivateLastSelection() { - SvLBoxEntry* pEntry = NULL; + SvTreeListEntry* pEntry = NULL; if ( pLastPageSaver ) { String sExpand( EXPAND_PROTOCOL ); @@ -826,7 +826,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() xContext->getValueByName( ::rtl::OUString( "/singletons/com.sun.star.util.theMacroExpander" ) ), UNO_QUERY ); } - SvLBoxEntry* pTemp = aTreeLB.First(); + SvTreeListEntry* pTemp = aTreeLB.First(); while( !pEntry && pTemp ) { // restore only selection of a leaf @@ -862,7 +862,7 @@ void OfaTreeOptionsDialog::ActivateLastSelection() pEntry = aTreeLB.Next(pEntry); } - SvLBoxEntry* pParent = aTreeLB.GetParent(pEntry); + SvTreeListEntry* pParent = aTreeLB.GetParent(pEntry); aTreeLB.Expand(pParent); aTreeLB.MakeVisible(pParent); aTreeLB.MakeVisible(pEntry); @@ -880,8 +880,8 @@ long OfaTreeOptionsDialog::Notify( NotifyEvent& rNEvt ) if( aKeyCode.GetCode() == KEY_PAGEUP || aKeyCode.GetCode() == KEY_PAGEDOWN) { - SvLBoxEntry* pCurEntry = aTreeLB.FirstSelected(); - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pCurEntry = aTreeLB.FirstSelected(); + SvTreeListEntry* pTemp = 0; if(aKeyCode.GetCode() == KEY_PAGEDOWN) { pTemp = aTreeLB.Next( pCurEntry ) ; @@ -923,8 +923,8 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() return; } - SvLBoxEntry* pEntry = pBox->GetCurEntry(); - SvLBoxEntry* pParent = pBox->GetParent(pEntry); + SvTreeListEntry* pEntry = pBox->GetCurEntry(); + SvTreeListEntry* pParent = pBox->GetParent(pEntry); // If the user has selected a category, automatically switch to a suitable // default sub-page instead. @@ -1009,7 +1009,7 @@ void OfaTreeOptionsDialog::SelectHdl_Impl() if(bIdentical) pGroupInfo->m_pShell = pGroupInfo->m_pModule; // now test whether there was the same module in other groups, too (e. g. Text+HTML) - SvLBoxEntry* pTemp = aTreeLB.First(); + SvTreeListEntry* pTemp = aTreeLB.First(); while(pTemp) { if(!aTreeLB.GetParent(pTemp) && pTemp != pEntry) @@ -1841,7 +1841,7 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void ) SvLBoxTreeList* pTreeList = aTreeLB.GetModel(); DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" ); - SvLBoxEntry* pEntry = pTreeList->First(); + SvTreeListEntry* pEntry = pTreeList->First(); while( pEntry ) { long n = aTreeLB.GetTextWidth(aTreeLB.GetEntryText(pEntry)); @@ -2166,7 +2166,7 @@ static sal_uInt16 lcl_getGroupId( const rtl::OUString& rGroupName, const SvTreeL { String sGroupName( rGroupName ); sal_uInt16 nRet = 0; - SvLBoxEntry* pEntry = rTreeLB.First(); + SvTreeListEntry* pEntry = rTreeLB.First(); while( pEntry ) { if ( !rTreeLB.GetParent( pEntry ) ) @@ -2192,7 +2192,7 @@ static void lcl_insertLeaf( nGrpId = pDlg->AddGroup( pNode->m_sLabel, NULL, NULL, nNodeGrpId ); if ( !pNode->m_sPageURL.isEmpty() ) { - SvLBoxEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); + SvTreeListEntry* pGrpEntry = rTreeLB.GetEntry( 0, nGrpId ); DBG_ASSERT( pGrpEntry, "OfaTreeOptionsDialog::InsertNodes(): no group" ); if ( pGrpEntry ) { diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx index 133932276dee..b6f1bdc755ad 100644 --- a/cui/source/options/webconninfo.cxx +++ b/cui/source/options/webconninfo.cxx @@ -191,7 +191,7 @@ void WebConnectionInfoDialog::FillPasswordList() ::rtl::OUString aUIEntry( aURLEntries[nURLInd].Url ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += aURLEntries[nURLInd].UserList[nUserInd].UserName; - SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); + SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -207,7 +207,7 @@ void WebConnectionInfoDialog::FillPasswordList() ::rtl::OUString aUIEntry( aUrls[ nURLIdx ] ); aUIEntry += ::rtl::OUString::valueOf( (sal_Unicode)'\t' ); aUIEntry += ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "*" ) ); - SvLBoxEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); + SvTreeListEntry* pEntry = m_aPasswordsLB.InsertEntry( aUIEntry ); pEntry->SetUserData( (void*)(sal_IntPtr)(nCount++) ); } } @@ -221,7 +221,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, RemovePasswordHdl) { try { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( pEntry ) { ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); @@ -277,7 +277,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) { try { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( pEntry ) { ::rtl::OUString aURL = m_aPasswordsLB.GetEntryText( pEntry, 0 ); @@ -314,7 +314,7 @@ IMPL_LINK_NOARG(WebConnectionInfoDialog, ChangePasswordHdl) // ----------------------------------------------------------------------- IMPL_LINK_NOARG(WebConnectionInfoDialog, EntrySelectedHdl) { - SvLBoxEntry* pEntry = m_aPasswordsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aPasswordsLB.GetCurEntry(); if ( !pEntry ) { m_aRemoveBtn.Enable( sal_False ); -- cgit v1.2.3