diff options
| author | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-18 16:28:20 +0200 |
|---|---|---|
| committer | Kohei Yoshida <kohei.yoshida@gmail.com> | 2012-10-19 11:45:36 +0200 |
| commit | 4b313fd5661ca5ac096e60d46691b1a9857877d9 (patch) | |
| tree | 59ba989a24fe1d21562f9a3c8a465b124028c62a /sw | |
| parent | d47508e036fd30f410798f37d25039bb25528f60 (diff) | |
Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.
Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee
Diffstat (limited to 'sw')
32 files changed, 310 insertions, 310 deletions
diff --git a/sw/source/ui/chrdlg/swuiccoll.cxx b/sw/source/ui/chrdlg/swuiccoll.cxx index ae6ed562a063..627dce855c4d 100644 --- a/sw/source/ui/chrdlg/swuiccoll.cxx +++ b/sw/source/ui/chrdlg/swuiccoll.cxx @@ -218,7 +218,7 @@ void SwCondCollPage::Reset(const SfxItemSet &/*rSet*/) aEntry += pCond->GetTxtFmtColl()->GetName(); } - SvLBoxEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); + SvTreeListEntry* pE = aTbLinks.InsertEntryToColumn( aEntry, n ); if(0 == n) aTbLinks.Select(pE); } @@ -248,7 +248,7 @@ IMPL_LINK( SwCondCollPage, OnOffHdl, CheckBox*, pBox ) IMPL_LINK( SwCondCollPage, AssignRemoveHdl, PushButton*, pBtn) { - SvLBoxEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = aTbLinks.FirstSelected(); sal_uLong nPos; if( !pE || LISTBOX_ENTRY_NOTFOUND == ( nPos = aTbLinks.GetModel()->GetAbsPos( pE ) ) ) @@ -299,7 +299,7 @@ IMPL_LINK( SwCondCollPage, SelectHdl, ListBox*, pBox) else { String sTbEntry; - SvLBoxEntry* pE = aTbLinks.FirstSelected(); + SvTreeListEntry* pE = aTbLinks.FirstSelected(); if(pE) sTbEntry = aTbLinks.GetEntryText(pE); sTbEntry = sTbEntry.GetToken(1, '\t'); diff --git a/sw/source/ui/config/optcomp.cxx b/sw/source/ui/config/optcomp.cxx index c008302ed1e8..e7f725fc17ce 100644 --- a/sw/source/ui/config/optcomp.cxx +++ b/sw/source/ui/config/optcomp.cxx @@ -137,7 +137,7 @@ SwCompatibilityOptPage::SwCompatibilityOptPage( Window* pParent, const SfxItemSe STR_USE_OBJPOSITIONING == nResId || STR_USE_OURTEXTWRAPPING == nResId ) ReplaceFormatName( sEntry ); - SvLBoxEntry* pEntry = m_aOptionsLB.SvTreeListBox::InsertEntry( sEntry ); + SvTreeListEntry* pEntry = m_aOptionsLB.SvTreeListBox::InsertEntry( sEntry ); if ( pEntry ) { m_aOptionsLB.SetCheckButtonState( pEntry, SV_BUTTON_UNCHECKED ); diff --git a/sw/source/ui/config/optload.cxx b/sw/source/ui/config/optload.cxx index 760cf2035103..4bd16dbca1f0 100644 --- a/sw/source/ui/config/optload.cxx +++ b/sw/source/ui/config/optload.cxx @@ -527,7 +527,7 @@ sal_Bool SwCaptionOptPage::FillItemSet( SfxItemSet& ) SaveEntry(aCheckLB.FirstSelected()); // apply current entry - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -609,7 +609,7 @@ void SwCaptionOptPage::SetOptions(const sal_uInt16 nPos, void SwCaptionOptPage::DelUserData() { - SvLBoxEntry* pEntry = aCheckLB.First(); + SvTreeListEntry* pEntry = aCheckLB.First(); while (pEntry) { @@ -621,7 +621,7 @@ void SwCaptionOptPage::DelUserData() IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) { - SvLBoxEntry* pSelEntry = aCheckLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aCheckLB.FirstSelected(); if (pSelEntry) { @@ -746,7 +746,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, ShowEntryHdl) IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) { - SvLBoxEntry* pEntry = aCheckLB.GetHdlEntry(); + SvTreeListEntry* pEntry = aCheckLB.GetHdlEntry(); if (pEntry) // save all SaveEntry(pEntry); @@ -754,7 +754,7 @@ IMPL_LINK_NOARG(SwCaptionOptPage, SaveEntryHdl) return 0; } -void SwCaptionOptPage::SaveEntry(SvLBoxEntry* pEntry) +void SwCaptionOptPage::SaveEntry(SvTreeListEntry* pEntry) { if (pEntry) { diff --git a/sw/source/ui/dbui/addresslistdialog.cxx b/sw/source/ui/dbui/addresslistdialog.cxx index 70b954e3b63f..c38b3f3baae8 100644 --- a/sw/source/ui/dbui/addresslistdialog.cxx +++ b/sw/source/ui/dbui/addresslistdialog.cxx @@ -231,7 +231,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : { if ( pNames[nName] == sBibliography ) continue; - SvLBoxEntry* pEntry = m_aListLB.InsertEntry(pNames[nName]); + SvTreeListEntry* pEntry = m_aListLB.InsertEntry(pNames[nName]); AddressUserData_Impl* pUserData = new AddressUserData_Impl(); pEntry->SetUserData(pUserData); if(pNames[nName] == rCurrentData.sDataSource) @@ -270,7 +270,7 @@ SwAddressListDialog::SwAddressListDialog(SwMailMergeAddressBlockPage* pParent) : SwAddressListDialog::~SwAddressListDialog() { - SvLBoxEntry* pEntry = m_aListLB.First(); + SvTreeListEntry* pEntry = m_aListLB.First(); while(pEntry) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pEntry->GetUserData()); @@ -281,7 +281,7 @@ SwAddressListDialog::~SwAddressListDialog() IMPL_LINK_NOARG(SwAddressListDialog, FilterHdl_Impl) { - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); uno::Reference< XMultiServiceFactory > xMgr( ::comphelper::getProcessServiceFactory() ); if(pSelect && xMgr.is()) { @@ -350,7 +350,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, LoadHdl_Impl) String sNewSource = SwNewDBMgr::LoadAndRegisterDataSource(); if(sNewSource.Len()) { - SvLBoxEntry* pNewSource = m_aListLB.InsertEntry(sNewSource); + SvTreeListEntry* pNewSource = m_aListLB.InsertEntry(sNewSource); pNewSource->SetUserData(new AddressUserData_Impl()); m_aListLB.Select(pNewSource); } @@ -449,7 +449,7 @@ IMPL_LINK(SwAddressListDialog, CreateHdl_Impl, PushButton*, pButton) IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) { - SvLBoxEntry* pEntry = m_aListLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aListLB.FirstSelected(); AddressUserData_Impl* pUserData = pEntry ? static_cast<AddressUserData_Impl*>(pEntry->GetUserData()) : 0; if(pUserData && !pUserData->sURL.isEmpty()) { @@ -481,13 +481,13 @@ IMPL_LINK(SwAddressListDialog, EditHdl_Impl, PushButton*, pButton) IMPL_LINK_NOARG(SwAddressListDialog, ListBoxSelectHdl_Impl) { - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); Application::PostUserEvent( STATIC_LINK( this, SwAddressListDialog, StaticListBoxSelectHdl_Impl ), pSelect ); return 0; } -IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*, pSelect) +IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*, pSelect) { //prevent nested calls of the select handler if(pThis->m_bInSelectHdl) @@ -547,7 +547,7 @@ IMPL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*, // detect the number of tables for a data source // if only one is available then set it at the entry void SwAddressListDialog::DetectTablesAndQueries( - SvLBoxEntry* pSelect, + SvTreeListEntry* pSelect, bool bWidthDialog) { try @@ -645,7 +645,7 @@ void SwAddressListDialog::DetectTablesAndQueries( IMPL_LINK(SwAddressListDialog, TableSelectHdl_Impl, PushButton*, pButton) { EnterWait(); - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -671,7 +671,7 @@ IMPL_LINK_NOARG(SwAddressListDialog, OKHdl_Impl) uno::Reference< XDataSource> SwAddressListDialog::GetSource() { uno::Reference< XDataSource> xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -684,7 +684,7 @@ uno::Reference< XDataSource> SwAddressListDialog::GetSource() SharedConnection SwAddressListDialog::GetConnection() { SharedConnection xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -696,7 +696,7 @@ SharedConnection SwAddressListDialog::GetConnection() uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier() { uno::Reference< XColumnsSupplier> xRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); @@ -708,7 +708,7 @@ uno::Reference< XColumnsSupplier> SwAddressListDialog::GetColumnsSupplier() ::rtl::OUString SwAddressListDialog::GetFilter() { ::rtl::OUString sRet; - SvLBoxEntry* pSelect = m_aListLB.FirstSelected(); + SvTreeListEntry* pSelect = m_aListLB.FirstSelected(); if(pSelect) { AddressUserData_Impl* pUserData = static_cast<AddressUserData_Impl*>(pSelect->GetUserData()); diff --git a/sw/source/ui/dbui/addresslistdialog.hxx b/sw/source/ui/dbui/addresslistdialog.hxx index 704682270a54..f87e6be660ce 100644 --- a/sw/source/ui/dbui/addresslistdialog.hxx +++ b/sw/source/ui/dbui/addresslistdialog.hxx @@ -78,7 +78,7 @@ class SwAddressListDialog : public SfxModalDialog String m_sConnecting; String m_sCreatedURL; - SvLBoxEntry* m_pCreatedDataSource; + SvTreeListEntry* m_pCreatedDataSource; bool m_bInSelectHdl; @@ -88,7 +88,7 @@ class SwAddressListDialog : public SfxModalDialog SwDBData m_aDBData; - void DetectTablesAndQueries(SvLBoxEntry* pSelect, bool bWidthDialog); + void DetectTablesAndQueries(SvTreeListEntry* pSelect, bool bWidthDialog); DECL_LINK(FilterHdl_Impl, void *); DECL_LINK(LoadHdl_Impl, void *); @@ -98,7 +98,7 @@ class SwAddressListDialog : public SfxModalDialog DECL_LINK(TableSelectHdl_Impl, PushButton*); DECL_LINK(OKHdl_Impl, void *); - DECL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvLBoxEntry*); + DECL_STATIC_LINK(SwAddressListDialog, StaticListBoxSelectHdl_Impl, SvTreeListEntry*); public: SwAddressListDialog(SwMailMergeAddressBlockPage* pParent); diff --git a/sw/source/ui/dbui/dbtree.cxx b/sw/source/ui/dbui/dbtree.cxx index e1b593969562..f0ddabff3e71 100644 --- a/sw/source/ui/dbui/dbtree.cxx +++ b/sw/source/ui/dbui/dbtree.cxx @@ -238,7 +238,7 @@ void SwDBTreeList::InitTreeList() void SwDBTreeList::AddDataSource(const String& rSource) { Image aImg = aImageList.GetImage(IMG_DB); - SvLBoxEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); + SvTreeListEntry* pEntry = InsertEntry(rSource, aImg, aImg, NULL, sal_True); SvTreeListBox::Select(pEntry); } @@ -252,14 +252,14 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) SetUpdateMode(sal_False); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while (pEntry) { - pEntry = (SvLBoxEntry*)GetRootLevelParent( pEntry ); + pEntry = (SvTreeListEntry*)GetRootLevelParent( pEntry ); Collapse(pEntry); // zuklappen - SvLBoxEntry* pChild; + SvTreeListEntry* pChild; while ((pChild = FirstChild(pEntry)) != 0L) GetModel()->Remove(pChild); @@ -274,7 +274,7 @@ void SwDBTreeList::ShowColumns(sal_Bool bShowCol) } } -void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) +void SwDBTreeList::RequestingChildren(SvTreeListEntry* pParent) { if (!pParent->HasChildren()) { @@ -369,7 +369,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) for (long i = 0; i < nCount; i++) { sTableName = pTblNames[i]; - SvLBoxEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns); + SvTreeListEntry* pTableEntry = InsertEntry(sTableName, aImg, aImg, pParent, bShowColumns); //to discriminate between queries and tables the user data of table entries is set pTableEntry->SetUserData((void*)0); } @@ -387,7 +387,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) for (long i = 0; i < nCount; i++) { sQueryName = pQueryNames[i]; - SvLBoxEntry* pQueryEntry = InsertEntry(sQueryName, aImg, aImg, pParent, bShowColumns); + SvTreeListEntry* pQueryEntry = InsertEntry(sQueryName, aImg, aImg, pParent, bShowColumns); pQueryEntry->SetUserData((void*)1); } } @@ -402,7 +402,7 @@ void SwDBTreeList::RequestingChildren(SvLBoxEntry* pParent) IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) { - SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight ); + SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight ); if (GetParent(pRight) && GetParent(GetParent(pRight))) return COMPARE_GREATER; // don't sort column names @@ -413,7 +413,7 @@ IMPL_LINK( SwDBTreeList, DBCompare, SvSortData*, pData ) String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, sal_Bool* pbIsTable) { String sDBName; - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if (pEntry && GetParent(pEntry)) { @@ -437,8 +437,8 @@ String SwDBTreeList::GetDBName(String& rTableName, String& rColumnName, sal_Boo ------------------------------------------------------------------------*/ void SwDBTreeList::Select(const String& rDBName, const String& rTableName, const String& rColumnName) { - SvLBoxEntry* pParent; - SvLBoxEntry* pChild; + SvTreeListEntry* pParent; + SvTreeListEntry* pChild; sal_uInt16 nParent = 0; sal_uInt16 nChild = 0; diff --git a/sw/source/ui/dbui/mmaddressblockpage.cxx b/sw/source/ui/dbui/mmaddressblockpage.cxx index 997d63e3a593..7fcf1d8b5f97 100644 --- a/sw/source/ui/dbui/mmaddressblockpage.cxx +++ b/sw/source/ui/dbui/mmaddressblockpage.cxx @@ -583,7 +583,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( { m_aFieldFT.Show(); m_aFieldCB.Show(); - SvLBoxEntry* pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_SALUTATION ))); + SvTreeListEntry* pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_SALUTATION ))); pEntry->SetUserData((void*)(sal_Int32)USER_DATA_SALUTATION ); pEntry = m_aAddressElementsLB.InsertEntry(String(SW_RES(ST_PUNCTUATION))); pEntry->SetUserData((void*)(sal_Int32)USER_DATA_PUNCTUATION ); @@ -624,7 +624,7 @@ SwCustomizeAddressBlockDialog::SwCustomizeAddressBlockDialog( for(sal_uInt16 i = 0; i < rHeaders.Count(); ++i) { const XubString& rHeader = rHeaders.GetString( i ); - SvLBoxEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader); + SvTreeListEntry* pEntry = m_aAddressElementsLB.InsertEntry(rHeader); pEntry->SetUserData((void*)(sal_IntPtr)i); } m_aOK.SetClickHdl(LINK(this, SwCustomizeAddressBlockDialog, OKHdl_Impl)); @@ -676,7 +676,7 @@ IMPL_LINK(SwCustomizeAddressBlockDialog, ImageButtonHdl_Impl, ImageButton*, pBut { if(&m_aInsertFieldIB == pButton) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); if(pEntry) { String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); @@ -711,7 +711,7 @@ sal_Int32 SwCustomizeAddressBlockDialog::GetSelectedItem_Impl() if(sSelected.Len()) for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); if( sSelected.Equals( sEntry, 1, sSelected.Len() - 2 ) ) { @@ -728,7 +728,7 @@ bool SwCustomizeAddressBlockDialog::HasItem_Impl(sal_Int32 nUserData) String sEntry; for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); if((sal_Int32)(sal_IntPtr)pEntry->GetUserData() == nUserData) { sEntry = m_aAddressElementsLB.GetEntryText(pEntry); @@ -827,7 +827,7 @@ void SwCustomizeAddressBlockDialog::UpdateImageButtons_Impl() m_aRightIB.Enable(nMove & MOVE_ITEM_RIGHT ); m_aDownIB.Enable(nMove & MOVE_ITEM_DOWN); m_aRemoveFieldIB.Enable(m_aDragED.HasCurrentItem() ? sal_True : sal_False); - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetCurEntry(); m_aInsertFieldIB.Enable( pEntry && (0 < (sal_Int32)(sal_IntPtr)pEntry->GetUserData() || m_aFieldCB.GetText().Len())); } @@ -847,7 +847,7 @@ void SwCustomizeAddressBlockDialog::SetAddress(const ::rtl::OUString& rAddress) { for(sal_uLong i = 0; i < m_aAddressElementsLB.GetEntryCount(); ++i) { - SvLBoxEntry* pEntry = m_aAddressElementsLB.GetEntry(i); + SvTreeListEntry* pEntry = m_aAddressElementsLB.GetEntry(i); String sEntry = m_aAddressElementsLB.GetEntryText(pEntry); sEntry += '>'; sEntry.Insert('<', 0); @@ -1358,7 +1358,7 @@ DDListBox::~DDListBox() void DDListBox::StartDrag( sal_Int8 /*nAction*/, const Point& /*rPosPixel*/ ) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if(pEntry) { ReleaseMouse(); diff --git a/sw/source/ui/dbui/selectdbtabledialog.cxx b/sw/source/ui/dbui/selectdbtabledialog.cxx index a8b9fab9b2cd..8e912fac17ea 100644 --- a/sw/source/ui/dbui/selectdbtabledialog.cxx +++ b/sw/source/ui/dbui/selectdbtabledialog.cxx @@ -118,7 +118,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, String sEntry = pTbls[i]; sEntry += '\t'; sEntry += m_sTable; - SvLBoxEntry* pEntry = m_aTableLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = m_aTableLB.InsertEntry(sEntry); pEntry->SetUserData((void*)0); } } @@ -133,7 +133,7 @@ SwSelectDBTableDialog::SwSelectDBTableDialog(Window* pParent, String sEntry = pQueries[i]; sEntry += '\t'; sEntry += m_sQuery; - SvLBoxEntry* pEntry = m_aTableLB.InsertEntry(sEntry); + SvTreeListEntry* pEntry = m_aTableLB.InsertEntry(sEntry); pEntry->SetUserData((void*)1); } } @@ -145,7 +145,7 @@ SwSelectDBTableDialog::~SwSelectDBTableDialog() IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) { - SvLBoxEntry* pEntry = m_aTableLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aTableLB.FirstSelected(); if(pEntry) { ::rtl::OUString sTableOrQuery = m_aTableLB.GetEntryText(pEntry, 0); @@ -184,14 +184,14 @@ IMPL_LINK(SwSelectDBTableDialog, PreviewHdl, PushButton*, pButton) String SwSelectDBTableDialog::GetSelectedTable(bool& bIsTable) { - SvLBoxEntry* pEntry = m_aTableLB.FirstSelected(); + SvTreeListEntry* pEntry = m_aTableLB.FirstSelected(); bIsTable = pEntry->GetUserData() ? false : true; return pEntry ? m_aTableLB.GetEntryText(pEntry, 0) : String(); } void SwSelectDBTableDialog::SetSelectedTable(const String& rTable, bool bIsTable) { - SvLBoxEntry* pEntry = m_aTableLB.First(); + SvTreeListEntry* pEntry = m_aTableLB.First(); while(pEntry) { if((m_aTableLB.GetEntryText(pEntry, 0) == rTable) && diff --git a/sw/source/ui/dialog/uiregionsw.cxx b/sw/source/ui/dialog/uiregionsw.cxx index 56b399a3c733..3be654ee003c 100644 --- a/sw/source/ui/dialog/uiregionsw.cxx +++ b/sw/source/ui/dialog/uiregionsw.cxx @@ -431,7 +431,7 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) if(bDontCheckPasswd) return sal_True; sal_Bool bRet = sal_True; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); while( pEntry ) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); @@ -474,10 +474,10 @@ sal_Bool SwEditRegionDlg::CheckPasswd(CheckBox* pBox) /*--------------------------------------------------------------------- Description: recursively look for child-sections ---------------------------------------------------------------------*/ -void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry ) +void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry ) { SwSection* pSect = 0; - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if (!pFmt) { @@ -506,7 +506,7 @@ void SwEditRegionDlg::RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry else { SwSections aTmpArr; - SvLBoxEntry* pNEntry; + SvTreeListEntry* pNEntry; sal_uInt16 nCnt = pFmt->GetChildSections(aTmpArr,SORTSECT_POS); if( nCnt ) { @@ -555,7 +555,7 @@ sal_uInt16 SwEditRegionDlg::FindArrPos(const SwSectionFmt* pFmt ) SwEditRegionDlg::~SwEditRegionDlg( ) { - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while( pEntry ) { delete (SectRepr*)pEntry->GetUserData(); @@ -567,7 +567,7 @@ SwEditRegionDlg::~SwEditRegionDlg( ) void SwEditRegionDlg::SelectSection(const String& rSectionName) { - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while(pEntry) { SectReprPtr pRepr = (SectReprPtr)pEntry->GetUserData(); @@ -591,7 +591,7 @@ void SwEditRegionDlg::SelectSection(const String& rSectionName) IMPL_LINK( SwEditRegionDlg, GetFirstEntryHdl, SvTreeListBox *, pBox ) { bDontCheckPasswd = sal_True; - SvLBoxEntry* pEntry=pBox->FirstSelected(); + SvTreeListEntry* pEntry=pBox->FirstSelected(); aHideCB .Enable(sal_True); // edit in readonly sections aEditInReadonlyCB.Enable(sal_True); @@ -803,7 +803,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OkHdl) rSh.StartAllAction(); rSh.StartUndo(); rSh.ResetSelect( 0,sal_False ); - SvLBoxEntry* pEntry = aTree.First(); + SvTreeListEntry* pEntry = aTree.First(); while( pEntry ) { @@ -873,7 +873,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeProtectHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); sal_Bool bCheck = STATE_CHECK == pBox->GetState(); while( pEntry ) @@ -899,7 +899,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeHideHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -928,7 +928,7 @@ IMPL_LINK( SwEditRegionDlg, ChangeEditInReadonlyHdl, TriStateBox *, pBox ) if(!CheckPasswd(pBox)) return 0; pBox->EnableTriState( sal_False ); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -948,9 +948,9 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) { if(!CheckPasswd()) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); - SvLBoxEntry* pChild; - SvLBoxEntry* pParent; + SvTreeListEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pChild; + SvTreeListEntry* pParent; // at first mark all selected while(pEntry) { @@ -963,7 +963,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, ChangeDismissHdl) while(pEntry) { const SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); - SvLBoxEntry* pRemove = 0; + SvTreeListEntry* pRemove = 0; sal_Bool bRestart = sal_False; if(pSectRepr->IsSelected()) { @@ -1015,7 +1015,7 @@ IMPL_LINK( SwEditRegionDlg, UseFileHdl, CheckBox *, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); pBox->EnableTriState(sal_False); sal_Bool bMulti = 1 < aTree.GetSelectionCount(); sal_Bool bFile = pBox->IsChecked(); @@ -1098,7 +1098,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) { if(!CheckPasswd()) return 0; - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); if(pEntry) { @@ -1165,7 +1165,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, OptionsHdl) SFX_ITEM_SET == eFrmDirState|| SFX_ITEM_SET == eLRState) { - SvLBoxEntry* pSelEntry = aTree.FirstSelected(); + SvTreeListEntry* pSelEntry = aTree.FirstSelected(); while( pSelEntry ) { SectReprPtr pRepr = (SectReprPtr)pSelEntry->GetUserData(); @@ -1204,7 +1204,7 @@ IMPL_LINK( SwEditRegionDlg, FileNameHdl, Edit *, pEdit ) if(!CheckPasswd()) return 0; pEdit->SetSelection(aSelect); - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); SectReprPtr pSectRepr = (SectRepr*)pEntry->GetUserData(); if(pEdit == &aFileNameED) @@ -1251,7 +1251,7 @@ IMPL_LINK( SwEditRegionDlg, DDEHdl, CheckBox*, pBox ) { if(!CheckPasswd(pBox)) return 0; - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); if(pEntry) { sal_Bool bFile = aFileCB.IsChecked(); @@ -1307,7 +1307,7 @@ IMPL_LINK( SwEditRegionDlg, ChangePasswdHdl, Button *, pBox ) aPasswdCB.Check(!aPasswdCB.IsChecked()); return 0; } - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); sal_Bool bSet = bChange ? bChange : aPasswdCB.IsChecked(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) @@ -1360,7 +1360,7 @@ IMPL_LINK_NOARG(SwEditRegionDlg, NameEditHdl) { if(!CheckPasswd(0)) return 0; - SvLBoxEntry* pEntry=aTree.FirstSelected(); + SvTreeListEntry* pEntry=aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); if (pEntry) { @@ -1380,7 +1380,7 @@ IMPL_LINK( SwEditRegionDlg, ConditionEditHdl, Edit *, pEdit ) if(!CheckPasswd(0)) return 0; pEdit->SetSelection(aSelect); - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); OSL_ENSURE(pEntry,"no entry found"); while( pEntry ) { @@ -1409,7 +1409,7 @@ IMPL_LINK( SwEditRegionDlg, DlgClosedHdl, sfx2::FileDialogHelper *, _pFileDlg ) } } - SvLBoxEntry* pEntry = aTree.FirstSelected(); + SvTreeListEntry* pEntry = aTree.FirstSelected(); OSL_ENSURE( pEntry, "no entry found" ); if ( pEntry ) { diff --git a/sw/source/ui/envelp/label1.cxx b/sw/source/ui/envelp/label1.cxx index e9d5e531bb43..4221967662db 100644 --- a/sw/source/ui/envelp/label1.cxx +++ b/sw/source/ui/envelp/label1.cxx @@ -606,7 +606,7 @@ void SwLabPage::Reset(const SfxItemSet& rSet) void SwVisitingCardPage::ClearUserData() { - SvLBoxEntry* pEntry = aAutoTextLB.First(); + SvTreeListEntry* pEntry = aAutoTextLB.First(); while(pEntry) { delete (String*)pEntry->GetUserData(); @@ -619,7 +619,7 @@ void SwVisitingCardPage::SetUserData( sal_uInt32 nCnt, { for( sal_uInt32 i = 0; i < nCnt; ++i ) { - SvLBoxEntry* pEntry = aAutoTextLB.InsertEntry( pNames[ i ] ); + SvTreeListEntry* pEntry = aAutoTextLB.InsertEntry( pNames[ i ] ); pEntry->SetUserData( new String( pValues[ i ] )); } } @@ -689,7 +689,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) if(pGroup) aLabItem.sGlossaryGroup = *pGroup; - SvLBoxEntry* pSelEntry = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aAutoTextLB.FirstSelected(); if(pSelEntry) aLabItem.sGlossaryBlockName = *(String*)pSelEntry->GetUserData(); rSet.Put(aLabItem); @@ -698,7 +698,7 @@ sal_Bool SwVisitingCardPage::FillItemSet(SfxItemSet& rSet) static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { - SvLBoxEntry* pEntry = rAutoTextLB.First(); + SvTreeListEntry* pEntry = rAutoTextLB.First(); while(pEntry) { if(*(String*)pEntry->GetUserData() == rBlockName) @@ -713,7 +713,7 @@ static void lcl_SelectBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName static sal_Bool lcl_FindBlock(SvTreeListBox& rAutoTextLB, const String& rBlockName) { - SvLBoxEntry* pEntry = rAutoTextLB.First(); + SvTreeListEntry* pEntry = rAutoTextLB.First(); while(pEntry) { if(*(String*)pEntry->GetUserData() == rBlockName) @@ -760,7 +760,7 @@ void SwVisitingCardPage::Reset(const SfxItemSet& rSet) } if(lcl_FindBlock(aAutoTextLB, aLabItem.sGlossaryBlockName)) { - SvLBoxEntry* pSelEntry = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSelEntry = aAutoTextLB.FirstSelected(); if( pSelEntry && *(String*)pSelEntry->GetUserData() != String(aLabItem.sGlossaryBlockName)) { diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx index 7e025963e129..b97a30eb8666 100644 --- a/sw/source/ui/envelp/labelexp.cxx +++ b/sw/source/ui/envelp/labelexp.cxx @@ -120,7 +120,7 @@ void SwVisitingCardPage::InitFrameControl() IMPL_LINK_NOARG(SwVisitingCardPage, FrameControlInitializedHdl) { - SvLBoxEntry* pSel = aAutoTextLB.FirstSelected(); + SvTreeListEntry* pSel = aAutoTextLB.FirstSelected(); String sEntry; if( pSel ) sEntry = *(String*)pSel->GetUserData(); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.cxx b/sw/source/ui/fldui/FldRefTreeListBox.cxx index 0a5ad8910e31..3b120faaa761 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.cxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.cxx @@ -40,7 +40,7 @@ void SwFldRefTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if ( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { String sEntry( GetEntryText( pEntry ) ); diff --git a/sw/source/ui/fldui/FldRefTreeListBox.hxx b/sw/source/ui/fldui/FldRefTreeListBox.hxx index 782f4571013d..b924f87c9dfb 100644 --- a/sw/source/ui/fldui/FldRefTreeListBox.hxx +++ b/sw/source/ui/fldui/FldRefTreeListBox.hxx @@ -30,7 +30,7 @@ public: SwFldRefTreeListBox(Window* pParent, const ResId& rResId); virtual ~SwFldRefTreeListBox(); -// virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); +// virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); }; #endif diff --git a/sw/source/ui/fldui/changedb.cxx b/sw/source/ui/fldui/changedb.cxx index 5c0e9c0a2523..4f7ad7736a57 100644 --- a/sw/source/ui/fldui/changedb.cxx +++ b/sw/source/ui/fldui/changedb.cxx @@ -131,8 +131,8 @@ void SwChangeDBDlg::FillDBPopup() size_t nCount = aDBNameList.size(); aUsedDBTLB.Clear(); - SvLBoxEntry *pFirst = 0; - SvLBoxEntry *pLast = 0; + SvTreeListEntry *pFirst = 0; + SvTreeListEntry *pLast = 0; for(size_t k = 0; k < nCount; k++) { @@ -151,13 +151,13 @@ void SwChangeDBDlg::FillDBPopup() } -SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) +SvTreeListEntry* SwChangeDBDlg::Insert(const String& rDBName) { String sDBName(rDBName.GetToken(0, DB_DELIM)); String sTableName(rDBName.GetToken(1, DB_DELIM)); sal_IntPtr nCommandType = rDBName.GetToken(2, DB_DELIM).ToInt32(); - SvLBoxEntry* pParent; - SvLBoxEntry* pChild; + SvTreeListEntry* pParent; + SvTreeListEntry* pChild; sal_uInt16 nParent = 0; sal_uInt16 nChild = 0; @@ -175,14 +175,14 @@ SvLBoxEntry* SwChangeDBDlg::Insert(const String& rDBName) if (sTableName == aUsedDBTLB.GetEntryText(pChild)) return pChild; } - SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); + SvTreeListEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); pRet->SetUserData((void*)nCommandType); return pRet; } } pParent = aUsedDBTLB.InsertEntry(sDBName, aDBImg, aDBImg); - SvLBoxEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); + SvTreeListEntry* pRet = aUsedDBTLB.InsertEntry(sTableName, rToInsert, rToInsert, pParent); pRet->SetUserData((void*)nCommandType); return pRet; } @@ -207,7 +207,7 @@ void SwChangeDBDlg::UpdateFlds() { std::vector<String> aDBNames; aDBNames.reserve(aUsedDBTLB.GetSelectionCount()); - SvLBoxEntry* pEntry = aUsedDBTLB.FirstSelected(); + SvTreeListEntry* pEntry = aUsedDBTLB.FirstSelected(); while( pEntry ) { @@ -256,7 +256,7 @@ IMPL_LINK_NOARG(SwChangeDBDlg, TreeSelectHdl) { sal_Bool bEnable = sal_False; - SvLBoxEntry* pEntry = aAvailDBTLB.GetCurEntry(); + SvTreeListEntry* pEntry = aAvailDBTLB.GetCurEntry(); if (pEntry) { diff --git a/sw/source/ui/fldui/flddb.cxx b/sw/source/ui/fldui/flddb.cxx index e9f543140b6d..354b88708180 100644 --- a/sw/source/ui/fldui/flddb.cxx +++ b/sw/source/ui/fldui/flddb.cxx @@ -401,7 +401,7 @@ void SwFldDBPage::CheckInsert() sal_Bool bInsert = sal_True; sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); - SvLBoxEntry* pEntry = aDatabaseTLB.GetCurEntry(); + SvTreeListEntry* pEntry = aDatabaseTLB.GetCurEntry(); if (pEntry) { @@ -427,8 +427,8 @@ void SwFldDBPage::CheckInsert() IMPL_LINK( SwFldDBPage, TreeSelectHdl, SvTreeListBox *, pBox ) { - SvLBoxEntry* pColEntry; - SvLBoxEntry* pEntry = pColEntry = pBox->GetCurEntry(); + SvTreeListEntry* pColEntry; + SvTreeListEntry* pEntry = pColEntry = pBox->GetCurEntry(); if (pEntry) { sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); diff --git a/sw/source/ui/fldui/flddinf.cxx b/sw/source/ui/fldui/flddinf.cxx index 812b2e7fa690..d368c41f347b 100644 --- a/sw/source/ui/fldui/flddinf.cxx +++ b/sw/source/ui/fldui/flddinf.cxx @@ -103,9 +103,9 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) // display SubTypes in TypeLB sal_uInt16 nTypeId = TYP_DOCINFOFLD; - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; - SvLBoxEntry* pInfo = 0; + SvTreeListEntry* pInfo = 0; sal_uInt16 nSubType = USHRT_MAX; if (IsFldEdit()) @@ -213,7 +213,7 @@ void SwFldDokInfPage::Reset(const SfxItemSet& ) IMPL_LINK_NOARG(SwFldDokInfPage, TypeHdl) { // save old ListBoxPos - SvLBoxEntry* pOldEntry = pSelEntry; + SvTreeListEntry* pOldEntry = pSelEntry; // current ListBoxPos pSelEntry = aTypeTLB.FirstSelected(); @@ -474,7 +474,7 @@ void SwFldDokInfPage::FillUserData() { String sData(rtl::OUString(USER_DATA_VERSION)); sData += ';'; - SvLBoxEntry* pEntry = aTypeTLB.FirstSelected(); + SvTreeListEntry* pEntry = aTypeTLB.FirstSelected(); sal_uInt16 nTypeSel = pEntry ? sal::static_int_cast< sal_uInt16 >(reinterpret_cast< sal_uIntPtr >(pEntry->GetUserData())) : USHRT_MAX; sData += String::CreateFromInt32( nTypeSel ); SetUserData(sData); diff --git a/sw/source/ui/fldui/flddinf.hxx b/sw/source/ui/fldui/flddinf.hxx index 0ab9d75758c4..fa13ecf5fdd0 100644 --- a/sw/source/ui/fldui/flddinf.hxx +++ b/sw/source/ui/fldui/flddinf.hxx @@ -52,7 +52,7 @@ class SwFldDokInfPage : public SwFldPage NumFormatListBox aFormatLB; CheckBox aFixedCB; - SvLBoxEntry* pSelEntry; + SvTreeListEntry* pSelEntry; com::sun::star::uno::Reference < ::com::sun::star::beans::XPropertySet > xCustomPropertySet; String aInfoStr; diff --git a/sw/source/ui/fldui/fldref.cxx b/sw/source/ui/fldui/fldref.cxx index 34f82f218d9d..837c7d42316b 100644 --- a/sw/source/ui/fldui/fldref.cxx +++ b/sw/source/ui/fldui/fldref.cxx @@ -112,7 +112,7 @@ void SwFldRefPage::SaveSelectedTxtNode() mnSavedSelectedPos = 0; if ( aSelectionToolTipLB.IsVisible() ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); if ( pEntry ) { const sal_uInt16 nTypeId = (sal_uInt16)(sal_uLong)aTypeLB.GetEntryData(GetTypeSel()); @@ -536,7 +536,7 @@ void SwFldRefPage::UpdateSubType() const IDocumentOutlineNodes* pIDoc( pSh->getIDocumentOutlineNodesAccess() ); pIDoc->getOutlineNodes( maOutlineNodes ); bool bCertainTxtNodeSelected( false ); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uInt16 nOutlIdx = 0; for ( nOutlIdx = 0; nOutlIdx < maOutlineNodes.size(); ++nOutlIdx ) { @@ -566,7 +566,7 @@ void SwFldRefPage::UpdateSubType() const IDocumentListItems* pIDoc( pSh->getIDocumentListItemsAccess() ); pIDoc->getNumItems( maNumItems ); bool bCertainTxtNodeSelected( false ); - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; sal_uInt16 nNumItemIdx = 0; for ( nNumItemIdx = 0; nNumItemIdx < maNumItems.size(); ++nNumItemIdx ) { @@ -877,7 +877,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) // #i83479# else if ( nTypeId == REFFLDFLAG_HEADING ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); OSL_ENSURE( pEntry, "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) @@ -897,7 +897,7 @@ sal_Bool SwFldRefPage::FillItemSet(SfxItemSet& ) } else if ( nTypeId == REFFLDFLAG_NUMITEM ) { - SvLBoxEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); + SvTreeListEntry* pEntry = aSelectionToolTipLB.GetCurEntry(); OSL_ENSURE( pEntry, "<SwFldRefPage::FillItemSet(..)> - no entry selected in selection tool tip listbox!" ); if ( pEntry ) diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index c7f6042c6e47..3395075623a3 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -72,7 +72,7 @@ class SwChangeDBDlg: public SvxStandardDialog virtual void Apply(); void UpdateFlds(); void FillDBPopup(); - SvLBoxEntry* Insert(const String& rDBName); + SvTreeListEntry* Insert(const String& rDBName); void ShowDBName(const SwDBData& rDBData); public: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 5725a5df0826..29445acf584d 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -110,7 +110,7 @@ class SwContentTree : public SvTreeListBox protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return @@ -127,22 +127,22 @@ protected: sal_Bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, sal_uInt8 nMode ); + void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(sal_Bool bSet) {bIsInDrag = bSet;} @@ -179,9 +179,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - sal_Bool Expand( SvLBoxEntry* pParent ); + sal_Bool Expand( SvTreeListEntry* pParent ); - sal_Bool Collapse( SvLBoxEntry* pParent ); + sal_Bool Collapse( SvTreeListEntry* pParent ); void ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier); @@ -198,12 +198,12 @@ public: DECL_LINK( ContentDoubleClickHdl, void * ); DECL_LINK( TimerUpdate, void * ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); }; @@ -215,13 +215,13 @@ class SwLBoxString : public SvLBoxString { public: - SwLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + SwLBoxString( 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); }; namespace sfx2 { class DocumentInserter; } @@ -236,8 +236,8 @@ private: ImageList aEntryImages; SwWrtShell* pActiveShell; // - SvLBoxEntry* pEmphasisEntry; // Drag'n Drop emphasis - SvLBoxEntry* pDDSource; // source for Drag'n Drop + SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis + SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content Window* pDefParentWin; @@ -269,30 +269,30 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); virtual void GetFocus(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); void Clear(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index fdcaf5368259..f4e060d13697 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); SW_DLLPRIVATE void InitTreeList(); - SW_DLLPRIVATE virtual void RequestingChildren( SvLBoxEntry* pParent ); + SW_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ); SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c707f46e25e6..5a4b26284dff 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -63,20 +63,20 @@ class SwGlTreeListBox : public SvTreeListBox { const String sReadonly; - SvLBoxEntry* pDragEntry; + SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); @@ -148,7 +148,7 @@ class SwGlossaryDlg : public SvxStandardDialog virtual void Apply(); void Init(); - SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); + SvTreeListEntry* DoesBlockExist(const String& sBlock, const String& rShort); void ShowAutoText(const String& rGroup, const String& rShortName); void ResumeShowAutoText(); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 908aa53b97ef..162bf6e95457 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -32,7 +32,7 @@ #include <caption.hxx> class SwFldMgr; -class SvLBoxEntry; +class SvTreeListEntry; class SwWrtShell; class SwLoadOptPage : public SfxTabPage @@ -171,7 +171,7 @@ private: void SetOptions( const sal_uInt16 nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); - void SaveEntry( SvLBoxEntry* pEntry ); + void SaveEntry( SvTreeListEntry* pEntry ); void DrawSample(); public: diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index c90a0edf0e18..6a47e80053c7 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -47,14 +47,14 @@ struct SwRedlineDataChild { const SwRedlineData* pChild; // link to original stacked data const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBChild; // corresponding TreeListBox entry + SvTreeListEntry* pTLBChild; // corresponding TreeListBox entry }; struct SwRedlineDataParent { const SwRedlineData* pData; // RedlineDataPtr const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBParent; // corresponding TreeListBox entry + SvTreeListEntry* pTLBParent; // corresponding TreeListBox entry String sComment; // redline comment inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const @@ -72,7 +72,7 @@ typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; -typedef SvLBoxEntry* SvLBoxEntryPtr; +typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; class SW_DLLPUBLIC SwRedlineAcceptDlg @@ -122,7 +122,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0); SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0); - SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const; public: SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False); diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 8fce92f63ed1..37193e4cda4f 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -119,7 +119,7 @@ class SwEditRegionDlg : public SfxModalDialog Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); - void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); + void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); sal_uInt16 FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); diff --git a/sw/source/ui/index/cnttab.cxx b/sw/source/ui/index/cnttab.cxx index 5bf5fc9e1497..d47939182d82 100644 --- a/sw/source/ui/index/cnttab.cxx +++ b/sw/source/ui/index/cnttab.cxx @@ -590,11 +590,11 @@ public: SvTreeListBox(pWin, rResId), pHeaderBar(0){} virtual void KeyInput( const KeyEvent& rKEvt ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); void SetHeaderBar(const HeaderBar* pHB) {pHeaderBar = pHB;} }; -long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwIndexTreeLB::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { long nData = (long)pEntry->GetUserData(); if(nData != USHRT_MAX) @@ -610,7 +610,7 @@ long SwIndexTreeLB::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) void SwIndexTreeLB::KeyInput( const KeyEvent& rKEvt ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); KeyCode aCode = rKEvt.GetKeyCode(); sal_Bool bChanged = sal_False; if(pEntry) @@ -749,7 +749,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, for(sal_uInt16 nToken = 0; nToken < comphelper::string::getTokenCount(sStyles, TOX_STYLE_DELIMITER); nToken++) { String sTmp(sStyles.GetToken(nToken, TOX_STYLE_DELIMITER)); - SvLBoxEntry* pEntry = rTLB.InsertEntry(sTmp); + SvTreeListEntry* pEntry = rTLB.InsertEntry(sTmp); pEntry->SetUserData(reinterpret_cast<void*>(i)); } } @@ -768,7 +768,7 @@ SwAddStylesDlg_Impl::SwAddStylesDlg_Impl(Window* pParent, if(rName.Len() > 0) { - SvLBoxEntry* pEntry = rTLB.First(); + SvTreeListEntry* pEntry = rTLB.First(); sal_Bool bFound = sal_False; while(pEntry && !bFound) { @@ -795,7 +795,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, OkHdl) pStyleArr[i].Erase(); SwIndexTreeLB& rTLB = aHeaderTree.GetTreeListBox(); - SvLBoxEntry* pEntry = rTLB.First(); + SvTreeListEntry* pEntry = rTLB.First(); while(pEntry) { long nLevel = (long)pEntry->GetUserData(); @@ -823,7 +823,7 @@ IMPL_LINK_NOARG(SwAddStylesDlg_Impl, HeaderDragHdl) IMPL_LINK(SwAddStylesDlg_Impl, LeftRightHdl, PushButton*, pBtn) { sal_Bool bLeft = pBtn == &aLeftPB; - SvLBoxEntry* pEntry = aHeaderTree.GetTreeListBox().FirstSelected(); + SvTreeListEntry* pEntry = aHeaderTree.GetTreeListBox().FirstSelected(); if(pEntry) { long nLevel = (long)pEntry->GetUserData(); @@ -1802,7 +1802,7 @@ void SwIdxTreeListBox::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { sal_uInt16 nLevel = static_cast< sal_uInt16 >(GetModel()->GetAbsPos(pEntry)); diff --git a/sw/source/ui/misc/glosbib.cxx b/sw/source/ui/misc/glosbib.cxx index fce09987c2de..b0cb52534d0e 100644 --- a/sw/source/ui/misc/glosbib.cxx +++ b/sw/source/ui/misc/glosbib.cxx @@ -114,7 +114,7 @@ SwGlossaryGroupDlg::SwGlossaryGroupDlg(Window * pParent, sTemp += '\t'; pData->sPath = aPathLB.GetEntry((sal_uInt16)sGroup.GetToken(1, GLOS_DELIM).ToInt32()); sTemp += pData->sPath; - SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp); + SvTreeListEntry* pEntry = aGroupTLB.InsertEntry(sTemp); pEntry->SetUserData(pData); } @@ -142,7 +142,7 @@ void SwGlossaryGroupDlg::Apply() //when the current group is deleted, the current group has to be relocated if(aGroupTLB.GetEntryCount()) { - SvLBoxEntry* pFirst = aGroupTLB.First(); + SvTreeListEntry* pFirst = aGroupTLB.First(); GlosBibUserData* pUserData = (GlosBibUserData*)pFirst->GetUserData(); pGlosHdl->SetCurGroup(pUserData->sGroupName); } @@ -192,7 +192,7 @@ void SwGlossaryGroupDlg::Apply() IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) { aNewPB.Enable(sal_False); - SvLBoxEntry* pFirstEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pFirstEntry = aGroupTLB.FirstSelected(); if(pFirstEntry) { GlosBibUserData* pUserData = (GlosBibUserData*)pFirstEntry->GetUserData(); @@ -202,7 +202,7 @@ IMPL_LINK( SwGlossaryGroupDlg, SelectHdl, SvTabListBox*, EMPTYARG ) sal_uLong nPos = aGroupTLB.GetEntryPos(sName, 0); if( 0xffffffff > nPos) { - SvLBoxEntry* pEntry = aGroupTLB.GetEntry(nPos); + SvTreeListEntry* pEntry = aGroupTLB.GetEntry(nPos); GlosBibUserData* pFoundData = (GlosBibUserData*)pEntry->GetUserData(); String sGroup = pFoundData->sGroupName; bExists = sGroup == sEntry; @@ -224,7 +224,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) String sTemp(aNameED.GetText()); sTemp += '\t'; sTemp += aPathLB.GetSelectEntry(); - SvLBoxEntry* pEntry = aGroupTLB.InsertEntry(sTemp); + SvTreeListEntry* pEntry = aGroupTLB.InsertEntry(sTemp); GlosBibUserData* pData = new GlosBibUserData; pData->sPath = aPathLB.GetSelectEntry(); pData->sGroupName = sGroup; @@ -239,7 +239,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, NewHdl) IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) { - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); if(!pEntry) { pButton->Enable(sal_False); @@ -293,7 +293,7 @@ IMPL_LINK( SwGlossaryGroupDlg, DeleteHdl, Button*, pButton ) IMPL_LINK_NOARG(SwGlossaryGroupDlg, RenameHdl) { - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); String sEntryText(aGroupTLB.GetEntryText(pEntry)); String sEntry(pUserData->sGroupName); @@ -385,7 +385,7 @@ IMPL_LINK_NOARG(SwGlossaryGroupDlg, ModifyHdl) aGroupTLB.MakeVisible(aGroupTLB.GetEntry( nPos )); } } - SvLBoxEntry* pEntry = aGroupTLB.FirstSelected(); + SvTreeListEntry* pEntry = aGroupTLB.FirstSelected(); if(pEntry) { GlosBibUserData* pUserData = (GlosBibUserData*)pEntry->GetUserData(); @@ -432,7 +432,7 @@ void FEdit::KeyInput( const KeyEvent& rKEvent ) void SwGlossaryGroupTLB::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if(pEntry) { SvLBoxTab* pTab; diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx index 7448a13f09ed..e59447e5a603 100644 --- a/sw/source/ui/misc/glossary.cxx +++ b/sw/source/ui/misc/glossary.cxx @@ -299,10 +299,10 @@ SwGlossaryDlg::~SwGlossaryDlg() ------------------------------------------------------------------------*/ IMPL_LINK( SwGlossaryDlg, GrpSelect, SvTreeListBox *, pBox ) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); if(!pEntry) return 0; - SvLBoxEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry; + SvTreeListEntry* pParent = pBox->GetParent(pEntry) ? pBox->GetParent(pEntry) : pEntry; GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData(); String *pGlosGroup = ::GetCurrGlosGroup(); (*pGlosGroup) = pGroupData->sGroupName; @@ -366,11 +366,11 @@ void SwGlossaryDlg::Apply() /* -------------------------------------------------- * does the title exist in the selected group? * --------------------------------------------------*/ -SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, +SvTreeListEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, const String& rShort) { // look for possible entry in TreeListBox - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); if(pEntry) { if(aCategoryBox.GetParent(pEntry)) @@ -378,7 +378,7 @@ SvLBoxEntry* SwGlossaryDlg::DoesBlockExist(const String& rBlock, sal_uInt32 nChildCount = aCategoryBox.GetChildCount( pEntry ); for(sal_uInt32 i = 0; i < nChildCount; i++) { - SvLBoxEntry* pChild = aCategoryBox.GetEntry( pEntry, i ); + SvTreeListEntry* pChild = aCategoryBox.GetEntry( pEntry, i ); if(rBlock == aCategoryBox.GetEntryText(pChild) && (!rShort.Len() || rShort == *(String*)pChild->GetUserData())) { @@ -434,7 +434,7 @@ IMPL_LINK( SwGlossaryDlg, NameModify, Edit *, pEdit ) IMPL_LINK_INLINE_START( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) { - SvLBoxEntry* pEntry = pBox->FirstSelected(); + SvTreeListEntry* pEntry = pBox->FirstSelected(); if(pBox->GetParent(pEntry) && !bIsDocReadOnly) EndDialog( RET_OK ); return 0; @@ -443,7 +443,7 @@ IMPL_LINK_INLINE_END( SwGlossaryDlg, NameDoubleClick, SvTreeListBox*, pBox ) IMPL_LINK( SwGlossaryDlg, EnableHdl, Menu *, pMn ) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); const String aEditText(aNameED.GetText()); const sal_Bool bHasEntry = aEditText.Len() && aShortNameEdit.GetText().Len(); @@ -492,11 +492,11 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) } if(pGlossaryHdl->NewGlossary(aStr, aShortName, sal_False, bNoAttr )) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); if(aCategoryBox.GetParent(pEntry)) pEntry = aCategoryBox.GetParent(pEntry); - SvLBoxEntry* pChild = aCategoryBox.InsertEntry(aStr, pEntry); + SvTreeListEntry* pChild = aCategoryBox.InsertEntry(aStr, pEntry); pChild->SetUserData(new String(aShortName)); aNameED.SetText(aStr); aShortNameEdit.SetText(aShortName); @@ -534,8 +534,8 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) pNewNameDlg->GetNewShort(), pNewNameDlg->GetNewName())) { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); - SvLBoxEntry* pNewEntry = aCategoryBox.InsertEntry( + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pNewEntry = aCategoryBox.InsertEntry( pNewNameDlg->GetNewName(), aCategoryBox.GetParent(pEntry)); pNewEntry->SetUserData(new String(pNewNameDlg->GetNewShort())); delete (String*)pEntry->GetUserData(); @@ -556,9 +556,9 @@ IMPL_LINK( SwGlossaryDlg, MenuHdl, Menu *, pMn ) const String aTitle(aNameED.GetText()); if(aTitle.Len() && pGlossaryHdl->DelGlossary(aShortName)) { - SvLBoxEntry* pChild = DoesBlockExist(aTitle, aShortName); + SvTreeListEntry* pChild = DoesBlockExist(aTitle, aShortName); OSL_ENSURE(pChild, "entry not found!"); - SvLBoxEntry* pParent = aCategoryBox.GetParent(pChild); + SvTreeListEntry* pParent = aCategoryBox.GetParent(pChild); aCategoryBox.Select(pParent); aCategoryBox.GetModel()->Remove(pChild); @@ -691,7 +691,7 @@ IMPL_LINK_NOARG(SwGlossaryDlg, BibHdl) Init(); //if new groups were created - select one of them String sNewGroup = pDlg->GetCreatedGroupName(); - SvLBoxEntry* pEntry = aCategoryBox.First(); + SvTreeListEntry* pEntry = aCategoryBox.First(); while(sNewGroup.Len() && pEntry) { if(!aCategoryBox.GetParent(pEntry)) @@ -733,7 +733,7 @@ void SwGlossaryDlg::Init() aCategoryBox.Clear(); // display text block regions const sal_uInt16 nCnt = pGlossaryHdl->GetGroupCnt(); - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; const String sSelStr(::GetCurrGlosGroup()->GetToken(0, GLOS_DELIM)); const sal_uInt16 nSelPath = static_cast< sal_uInt16 >(::GetCurrGlosGroup()->GetToken(1, GLOS_DELIM).ToInt32()); // #i66304# - "My AutoText" comes from mytexts.bau, but should be translated @@ -749,7 +749,7 @@ void SwGlossaryDlg::Init() sTitle = sGroupName.GetToken( 0, GLOS_DELIM ); if(sTitle == sMyAutoTextEnglish) sTitle = sMyAutoTextTranslated; - SvLBoxEntry* pEntry = aCategoryBox.InsertEntry( sTitle ); + SvTreeListEntry* pEntry = aCategoryBox.InsertEntry( sTitle ); sal_uInt16 nPath = static_cast< sal_uInt16 >(sGroupName.GetToken( 1, GLOS_DELIM ).ToInt32()); GroupUserData* pData = new GroupUserData; @@ -768,7 +768,7 @@ void SwGlossaryDlg::Init() for(sal_uInt16 i = 0; i < nCount; ++i) { String sGroupTitle(pGlossaryHdl->GetGlossaryName(i)); - SvLBoxEntry* pChild = aCategoryBox.InsertEntry( + SvTreeListEntry* pChild = aCategoryBox.InsertEntry( sGroupTitle, pEntry); pChild->SetUserData(new String(pGlossaryHdl->GetGlossaryShortName(i))); } @@ -778,7 +778,7 @@ void SwGlossaryDlg::Init() if(!pSelEntry) { //find a non-readonly group - SvLBoxEntry* pSearch = aCategoryBox.First(); + SvTreeListEntry* pSearch = aCategoryBox.First(); while(pSearch) { if(!aCategoryBox.GetParent(pSearch)) @@ -896,7 +896,7 @@ SwGlTreeListBox::SwGlTreeListBox(Window* pParent, const ResId& rResId) : void SwGlTreeListBox::Clear() { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while(pEntry) { if(GetParent(pEntry)) @@ -911,7 +911,7 @@ void SwGlTreeListBox::Clear() void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); // there's only help for groups' names if(pEntry) { @@ -962,7 +962,7 @@ void SwGlTreeListBox::RequestHelp( const HelpEvent& rHEvt ) DragDropMode SwGlTreeListBox::NotifyStartDrag( TransferDataContainer& /*rContainer*/, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { DragDropMode eRet; pDragEntry = pEntry; @@ -971,7 +971,7 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( else { SwGlossaryDlg* pDlg = (SwGlossaryDlg*)Window::GetParent(); - SvLBoxEntry* pParent = GetParent(pEntry); + SvTreeListEntry* pParent = GetParent(pEntry); GroupUserData* pGroupData = (GroupUserData*)pParent->GetUserData(); String sEntry(pGroupData->sGroupName); @@ -989,19 +989,19 @@ DragDropMode SwGlTreeListBox::NotifyStartDrag( return eRet; } -sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwGlTreeListBox::NotifyAcceptDrop( SvTreeListEntry* pEntry) { // TODO: Readonly - check still missing! - SvLBoxEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry; - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry) ? GetParent(pEntry) : pEntry; + SvTreeListEntry* pDestParent = GetParent(pDragEntry ) ? GetParent(pDragEntry ) : pDragEntry ; return pDestParent != pSrcParent; } -sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlTreeListBox::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { @@ -1012,8 +1012,8 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, } // 1. move to different groups? // 2. allowed to write in both groups? - SvLBoxEntry* pSrcParent = GetParent(pEntry); - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry); + SvTreeListEntry* pDestParent = GetParent(pTarget) ? GetParent(pTarget) : pTarget; sal_Bool bRet = sal_False; if(pDestParent != pSrcParent) @@ -1037,7 +1037,7 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, sDestName, sTitle, sal_True ); if(bRet) { - SvLBoxEntry* pChild = InsertEntry(sTitle, pDestParent); + SvTreeListEntry* pChild = InsertEntry(sTitle, pDestParent); pChild->SetUserData(new String(sShortName)); GetModel()->Remove(pEntry); } @@ -1045,9 +1045,9 @@ sal_Bool SwGlTreeListBox::NotifyMoving( SvLBoxEntry* pTarget, return sal_False; // otherwise the entry is being set automatically } -sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlTreeListBox::NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { @@ -1058,8 +1058,8 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, { pTarget = GetEntry(0); } - SvLBoxEntry* pSrcParent = GetParent(pEntry); - SvLBoxEntry* pDestParent = + SvTreeListEntry* pSrcParent = GetParent(pEntry); + SvTreeListEntry* pDestParent = GetParent(pTarget) ? GetParent(pTarget) : pTarget; sal_Bool bRet = sal_False; if(pDestParent != pSrcParent) @@ -1085,7 +1085,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, sDestName, sTitle, sal_False ); if(bRet) { - SvLBoxEntry* pChild = InsertEntry(sTitle, pDestParent); + SvTreeListEntry* pChild = InsertEntry(sTitle, pDestParent); pChild->SetUserData(new String(sShortName)); } } @@ -1094,7 +1094,7 @@ sal_Bool SwGlTreeListBox::NotifyCopying( SvLBoxEntry* pTarget, String SwGlossaryDlg::GetCurrGrpName() const { - SvLBoxEntry* pEntry = aCategoryBox.FirstSelected(); + SvTreeListEntry* pEntry = aCategoryBox.FirstSelected(); String sRet; if(pEntry) { diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx index ebf8dea60323..22fa068ea84e 100644 --- a/sw/source/ui/misc/redlndlg.cxx +++ b/sw/source/ui/misc/redlndlg.cxx @@ -271,7 +271,7 @@ void SwRedlineAcceptDlg::Init(sal_uInt16 nStart) pTable->SetUpdateMode(sal_True); // #i69618# this moves the list box to the right position, visually - SvLBoxEntry* pSelEntry = pTable->FirstSelected(); + SvTreeListEntry* pSelEntry = pTable->FirstSelected(); if( pSelEntry ) pTable->MakeVisible( pSelEntry, sal_True ); //#i70937#, force the scroll } @@ -323,7 +323,7 @@ void SwRedlineAcceptDlg::InitAuthors() sal_Bool bEnable = pTable->GetEntryCount() != 0 && !pSh->getIDocumentRedlineAccess()->GetRedlinePassword().getLength(); sal_Bool bSel = pTable->FirstSelected() != 0; - SvLBoxEntry* pSelEntry = pTable->FirstSelected(); + SvTreeListEntry* pSelEntry = pTable->FirstSelected(); while (pSelEntry) { sal_uInt16 nPos = GetRedlinePos(*pSelEntry); @@ -628,7 +628,7 @@ void SwRedlineAcceptDlg::InsertChildren(SwRedlineDataParent *pParent, const SwRe pData->bDisabled = sal_True; sChild = GetRedlineText(rRedln, pData->aDateTime, nStack); - SvLBoxEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); + SvTreeListEntry* pChild = pTable->InsertEntry(sChild, pData, pParent->pTLBParent); pRedlineChild->pTLBChild = pChild; if (!bValidParent) @@ -668,7 +668,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) // set the cursor after the last entry because otherwise performance problem in TLB. // TLB would otherwise reset the cursor at every Remove (expensive) sal_uInt16 nPos = Min((sal_uInt16)nCount, (sal_uInt16)aRedlineParents.size()); - SvLBoxEntry *pCurEntry = NULL; + SvTreeListEntry *pCurEntry = NULL; while( ( pCurEntry == NULL ) && ( nPos > 0 ) ) { --nPos; @@ -701,7 +701,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd) break; } } - SvLBoxEntry *pEntry = aRedlineParents[i].pTLBParent; + SvTreeListEntry *pEntry = aRedlineParents[i].pTLBParent; if (pEntry) { long nIdx = aLBoxArr.size() - 1L; @@ -740,7 +740,7 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) return; // no redlines in the document RedlinData *pData; - SvLBoxEntry *pParent; + SvTreeListEntry *pParent; SwRedlineDataParent* pRedlineParent; const SwRedline* pCurrRedline; if( !nStart && !pTable->FirstSelected() ) @@ -792,10 +792,10 @@ void SwRedlineAcceptDlg::InsertParents(sal_uInt16 nStart, sal_uInt16 nEnd) void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); - SvLBoxEntry* pEntry = bSelect ? pTable->FirstSelected() : pTable->First(); + SvTreeListEntry* pEntry = bSelect ? pTable->FirstSelected() : pTable->First(); sal_uLong nPos = LONG_MAX; - typedef std::vector<SvLBoxEntry*> ListBoxEntries_t; + typedef std::vector<SvTreeListEntry*> ListBoxEntries_t; ListBoxEntries_t aRedlines; // don't activate @@ -888,7 +888,7 @@ void SwRedlineAcceptDlg::CallAcceptReject( sal_Bool bSelect, sal_Bool bAccept ) pTPView->EnableUndo(); } -sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvLBoxEntry& rEntry ) const +sal_uInt16 SwRedlineAcceptDlg::GetRedlinePos( const SvTreeListEntry& rEntry ) const { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); return pSh->FindRedlineOfData( *((SwRedlineDataParent*)((RedlinData *) @@ -973,14 +973,14 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, GotoHdl) //#107938# But not only ask pTable if it has the focus. To move // the selection to the selected redline any child of pParentDlg // may the focus. - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if (pParentDlg->HasChildPathFocus()) pSelEntry = pTable->FirstSelected(); if( pSelEntry ) { - SvLBoxEntry* pActEntry = pSelEntry; + SvTreeListEntry* pActEntry = pSelEntry; pSh->StartAction(); pSh->EnterStdMode(); pSh->SetCareWin(pParentDlg); @@ -1039,12 +1039,12 @@ IMPL_LINK_NOARG(SwRedlineAcceptDlg, CommandHdl) case COMMAND_CONTEXTMENU: { SwWrtShell* pSh = ::GetActiveView()->GetWrtShellPtr(); - SvLBoxEntry* pEntry = pTable->FirstSelected(); + SvTreeListEntry* pEntry = pTable->FirstSelected(); const SwRedline *pRed = 0; if (pEntry) { - SvLBoxEntry* pTopEntry = pEntry; + SvTreeListEntry* pTopEntry = pEntry; if (pTable->GetParent(pEntry)) pTopEntry = pTable->GetParent(pEntry); diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx index 980b3f87c846..fdf845e8397a 100644 --- a/sw/source/ui/utlui/content.cxx +++ b/sw/source/ui/utlui/content.cxx @@ -116,12 +116,12 @@ sal_Bool SwContentTree::bIsInDrag = sal_False; namespace { - static sal_Bool lcl_IsContent(SvLBoxEntry* pEntry) + static sal_Bool lcl_IsContent(SvTreeListEntry* pEntry) { return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CNT; } - static sal_Bool lcl_IsContentType(SvLBoxEntry* pEntry) + static sal_Bool lcl_IsContentType(SvTreeListEntry* pEntry) { return ((SwTypeNumber*)pEntry->GetUserData())->GetTypeId() == CTYPE_CTT; } @@ -941,7 +941,7 @@ static void* lcl_GetOutlineKey( SwContentTree* pTree, SwOutlineContent* pContent sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { - SvLBoxEntry* pEntry = pTargetEntry; + SvTreeListEntry* pEntry = pTargetEntry; if( pEntry && ( nRootType == CONTENT_TYPE_OUTLINE ) && lcl_IsContent( pEntry ) ) { SwOutlineContent* pOutlineContent = ( SwOutlineContent* )( pEntry->GetUserData() ); @@ -952,7 +952,7 @@ sal_Int8 SwContentTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { while( pEntry->HasChildren() ) { - SvLBoxEntry* pChildEntry = FirstChild( pEntry ); + SvTreeListEntry* pChildEntry = FirstChild( pEntry ); while( pChildEntry ) { pEntry = pChildEntry; @@ -1030,7 +1030,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) pPop->InsertItem(2, aContextStrings[ST_DRAGMODE - ST_CONTEXT_FIRST]); pPop->InsertItem(3, aContextStrings[ST_DISPLAY - ST_CONTEXT_FIRST]); //jetzt noch bearbeiten - SvLBoxEntry* pEntry = 0; + SvTreeListEntry* pEntry = 0; //Bearbeiten nur, wenn die angezeigten Inhalte aus der aktiven View kommen if((bIsActive || pActiveShell == pActiveView->GetWrtShellPtr()) && 0 != (pEntry = FirstSelected()) && lcl_IsContent(pEntry)) @@ -1137,7 +1137,7 @@ PopupMenu* SwContentTree::CreateContextMenu( void ) /*************************************************************************** Beschreibung: Einrueckung fuer outlines (und sections) ***************************************************************************/ -long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) +long SwContentTree::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab) { sal_uInt16 nLevel = 0; if(lcl_IsContent(pEntry)) @@ -1160,7 +1160,7 @@ long SwContentTree::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab) /*************************************************************************** Beschreibung: Inhalte werden erst auf Anforderung in die Box eingefuegt ***************************************************************************/ -void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) +void SwContentTree::RequestingChildren( SvTreeListEntry* pParent ) { // ist es ein Inhaltstyp? if(lcl_IsContentType(pParent)) @@ -1176,7 +1176,7 @@ void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) ***************************************************************/ if(pCntType->GetType() == CONTENT_TYPE_OUTLINE) { - SvLBoxEntry* pChild = 0; + SvTreeListEntry* pChild = 0; for(sal_uInt16 i = 0; i < nCount; i++) { const SwContent* pCnt = pCntType->GetMember(i); @@ -1236,7 +1236,7 @@ void SwContentTree::RequestingChildren( SvLBoxEntry* pParent ) /*************************************************************************** Beschreibung: Expand - Zustand fuer Inhaltstypen merken ***************************************************************************/ -sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) +sal_Bool SwContentTree::Expand( SvTreeListEntry* pParent ) { if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || (nRootType == CONTENT_TYPE_OUTLINE)) @@ -1258,7 +1258,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) SwWrtShell* pShell = GetWrtShell(); sal_Bool bBool = SvTreeListBox::Expand(pParent); - SvLBoxEntry* pChild = Next(pParent); + SvTreeListEntry* pChild = Next(pParent); while(pChild && lcl_IsContent(pChild) && pParent->HasChildren()) { if(pChild->HasChildren()) @@ -1294,7 +1294,7 @@ sal_Bool SwContentTree::Expand( SvLBoxEntry* pParent ) /*************************************************************************** Beschreibung: Collapse - Zustand fuer Inhaltstypen merken ***************************************************************************/ -sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) +sal_Bool SwContentTree::Collapse( SvTreeListEntry* pParent ) { sal_Bool bRet; if(!bIsRoot || (((SwContentType*)pParent->GetUserData())->GetType() == CONTENT_TYPE_OUTLINE) || @@ -1334,7 +1334,7 @@ sal_Bool SwContentTree::Collapse( SvLBoxEntry* pParent ) ***************************************************************************/ IMPL_LINK_NOARG(SwContentTree, ContentDoubleClickHdl) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); // ist es ein Inhaltstyp? OSL_ENSURE(pEntry, "no current entry!"); if(pEntry) @@ -1370,7 +1370,7 @@ void SwContentTree::Display( sal_Bool bActive ) } // erst den selektierten Eintrag auslesen, um ihn spaeter evtl. wieder // zu selektieren -> die UserDaten sind hier nicht mehr gueltig! - SvLBoxEntry* pOldSelEntry = FirstSelected(); + SvTreeListEntry* pOldSelEntry = FirstSelected(); String sEntryName; // Name des Eintrags sal_uInt16 nEntryRelPos = 0; // rel. Pos zu seinem Parent sal_uInt32 nOldEntryCount = GetEntryCount(); @@ -1382,7 +1382,7 @@ void SwContentTree::Display( sal_Bool bActive ) nOldScrollPos = pVScroll->GetThumbPos(); sEntryName = GetEntryText(pOldSelEntry); - SvLBoxEntry* pParantEntry = pOldSelEntry; + SvTreeListEntry* pParantEntry = pOldSelEntry; while( GetParent(pParantEntry)) { pParantEntry = GetParent(pParantEntry); @@ -1412,7 +1412,7 @@ void SwContentTree::Display( sal_Bool bActive ) } if(pShell) { - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; if(nRootType == USHRT_MAX) { for(sal_uInt16 nCntType = CONTENT_TYPE_OUTLINE; @@ -1425,7 +1425,7 @@ void SwContentTree::Display( sal_Bool bActive ) (*ppContentT) = new SwContentType(pShell, nCntType, nOutlineLevel ); String sEntry = (*ppContentT)->GetName(); - SvLBoxEntry* pEntry; + SvTreeListEntry* pEntry; const Image& rImage = aEntryImages.GetImage(SID_SW_START + nCntType); sal_Bool bChOnDemand = 0 != (*ppContentT)->GetMemberCount(); pEntry = InsertEntry(sEntry, rImage, rImage, @@ -1441,8 +1441,8 @@ void SwContentTree::Display( sal_Bool bActive ) if(nEntryRelPos && nCntType == nLastSelType) { // jetzt vielleicht noch ein Child selektieren - SvLBoxEntry* pChild = pEntry; - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pChild = pEntry; + SvTreeListEntry* pTemp = 0; sal_uInt16 nPos = 1; while(0 != (pChild = Next(pChild))) { @@ -1478,7 +1478,7 @@ void SwContentTree::Display( sal_Bool bActive ) if(!(*ppRootContentT)) (*ppRootContentT) = new SwContentType(pShell, nRootType, nOutlineLevel ); const Image& rImage = aEntryImages.GetImage(20000 + nRootType); - SvLBoxEntry* pParent = InsertEntry( + SvTreeListEntry* pParent = InsertEntry( (*ppRootContentT)->GetName(), rImage, rImage, 0, sal_False, LIST_APPEND, *ppRootContentT); @@ -1504,7 +1504,7 @@ void SwContentTree::Display( sal_Bool bActive ) { //feststellen, wo der Cursor steht const sal_uInt16 nActPos = pShell->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while( 0 != (pEntry = Next(pEntry)) ) { @@ -1519,8 +1519,8 @@ void SwContentTree::Display( sal_Bool bActive ) else { // jetzt vielleicht noch ein Child selektieren - SvLBoxEntry* pChild = pParent; - SvLBoxEntry* pTemp = 0; + SvTreeListEntry* pChild = pParent; + SvTreeListEntry* pTemp = 0; sal_uInt16 nPos = 1; while(0 != (pChild = Next(pChild))) { @@ -1571,7 +1571,7 @@ sal_Bool SwContentTree::FillTransferData( TransferDataContainer& rTransfer, { SwWrtShell* pWrtShell = GetWrtShell(); OSL_ENSURE(pWrtShell, "no Shell!"); - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); if(!pEntry || lcl_IsContentType(pEntry) || !pWrtShell) return sal_False; String sEntry; @@ -1713,7 +1713,7 @@ sal_Bool SwContentTree::ToggleToRoot() { if(!bIsRoot) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); const SwContentType* pCntType; if(pEntry) { @@ -1770,7 +1770,7 @@ sal_Bool SwContentTree::HasContentChanged() else if(bIsRoot) { sal_Bool bOutline = sal_False; - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); if(!pEntry) bRepaint = sal_True; else @@ -1784,7 +1784,7 @@ sal_Bool SwContentTree::HasContentChanged() { sal_uInt16 nSelLevel = USHRT_MAX; - SvLBoxEntry* pFirstSel; + SvTreeListEntry* pFirstSel; if(bOutline && 0 != ( pFirstSel = FirstSelected()) && lcl_IsContent(pFirstSel)) @@ -1824,7 +1824,7 @@ sal_Bool SwContentTree::HasContentChanged() { //feststellen, wo der Cursor steht const sal_uInt16 nActPos = GetWrtShell()->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pFirstEntry = First(); + SvTreeListEntry* pFirstEntry = First(); while( 0 != (pFirstEntry = Next(pFirstEntry)) ) { @@ -1843,7 +1843,7 @@ sal_Bool SwContentTree::HasContentChanged() } else { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); while ( pEntry ) { sal_Bool bNext = sal_True; // mindestens ein Next muss sein @@ -1906,7 +1906,7 @@ sal_Bool SwContentTree::HasContentChanged() } else { - SvLBoxEntry* pChild = FirstChild(pEntry); + SvTreeListEntry* pChild = FirstChild(pEntry); for(sal_uInt16 j = 0; j < nChildCount; j++) { const SwContent* pCnt = pArrType->GetMember(j); @@ -1920,8 +1920,8 @@ sal_Bool SwContentTree::HasContentChanged() } if(bRemoveChildren) { - SvLBoxEntry* pChild = FirstChild(pEntry); - SvLBoxEntry* pRemove = pChild; + SvTreeListEntry* pChild = FirstChild(pEntry); + SvTreeListEntry* pRemove = pChild; for(sal_uInt16 j = 0; j < nChildCount; j++) { pChild = Next(pRemove); @@ -1962,12 +1962,12 @@ sal_Bool SwContentTree::HasContentChanged() ***************************************************************************/ void SwContentTree::FindActiveTypeAndRemoveUserData() { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if(pEntry) { // wird Clear ueber TimerUpdate gerufen, kann nur fuer die Root // die Gueltigkeit der UserData garantiert werden - SvLBoxEntry* pParent; + SvTreeListEntry* pParent; while(0 != (pParent = GetParent(pEntry))) pEntry = pParent; if(pEntry->GetUserData() && lcl_IsContentType(pEntry)) @@ -2071,7 +2071,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) SwWrtShell* pShell = GetWrtShell(); sal_Int8 nActOutlineLevel = nOutlineLevel; sal_uInt16 nActPos = pShell->GetOutlinePos(nActOutlineLevel); - SvLBoxEntry* pFirstEntry = FirstSelected(); + SvTreeListEntry* pFirstEntry = FirstSelected(); if (pFirstEntry && lcl_IsContent(pFirstEntry)) { if ( (bIsRoot && nRootType == CONTENT_TYPE_OUTLINE) || @@ -2102,7 +2102,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) else if(bModifier) { sal_uInt16 nActEndPos = nActPos; - SvLBoxEntry* pEntry = pFirstEntry; + SvTreeListEntry* pEntry = pFirstEntry; sal_uInt16 nActLevel = ((SwOutlineContent*) pFirstEntry->GetUserData())->GetOutlineLevel(); pEntry = Next(pEntry); @@ -2192,7 +2192,7 @@ void SwContentTree::ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier) if(!bIsRoot) { const sal_uInt16 nCurrPos = pShell->GetOutlinePos(MAXLEVEL); - SvLBoxEntry* pFirst = First(); + SvTreeListEntry* pFirst = First(); while( 0 != (pFirst = Next(pFirst)) && lcl_IsContent(pFirst)) { @@ -2265,7 +2265,7 @@ IMPL_LINK_NOARG(SwContentTree, TimerUpdate) DragDropMode SwContentTree::NotifyStartDrag( TransferDataContainer& rContainer, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { DragDropMode eMode = (DragDropMode)0; if( bIsActive && nRootType == CONTENT_TYPE_OUTLINE && @@ -2286,8 +2286,8 @@ DragDropMode SwContentTree::NotifyStartDrag( Beschreibung : Nach dem Drag wird der aktuelle Absatz m i t Children verschoben ***************************************************************************/ -sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& ) +sal_Bool SwContentTree::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& ) { if(!bDocChgdInDragging) { @@ -2300,7 +2300,7 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { - SvLBoxEntry* pNext = Next(pTarget); + SvTreeListEntry* pNext = Next(pTarget); if(pNext) nTargetPos = (( SwOutlineContent* )pNext->GetUserData())->GetPos() -1; else @@ -2325,8 +2325,8 @@ sal_Bool SwContentTree::NotifyMoving( SvLBoxEntry* pTarget, Beschreibung : Nach dem Drag wird der aktuelle Absatz o h n e Children verschoben ***************************************************************************/ -sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, SvLBoxEntry*& , sal_uLong& ) +sal_Bool SwContentTree::NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, SvTreeListEntry*& , sal_uLong& ) { if(!bDocChgdInDragging) { @@ -2340,7 +2340,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, if( MAXLEVEL > nOutlineLevel && // werden nicht alle Ebenen angezeigt nTargetPos != USHRT_MAX) { - SvLBoxEntry* pNext = Next(pTarget); + SvTreeListEntry* pNext = Next(pTarget); if(pNext) nTargetPos = (( SwOutlineContent* )pNext->GetUserData())->GetPos() - 1; else @@ -2362,7 +2362,7 @@ sal_Bool SwContentTree::NotifyCopying( SvLBoxEntry* pTarget, /*************************************************************************** Beschreibung: Kein Drop vor den ersten Eintrag - es ist ein SwContentType ***************************************************************************/ -sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwContentTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -2374,7 +2374,7 @@ sal_Bool SwContentTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) void SwContentTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvLBoxEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -2413,7 +2413,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) const KeyCode aCode = rEvent.GetKeyCode(); if(aCode.GetCode() == KEY_RETURN) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if ( pEntry ) { switch(aCode.GetModifier()) @@ -2441,7 +2441,7 @@ void SwContentTree::KeyInput(const KeyEvent& rEvent) } else if(aCode.GetCode() == KEY_DELETE && 0 == aCode.GetModifier()) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); if(pEntry && lcl_IsContent(pEntry) && ((SwContent*)pEntry->GetUserData())->GetParent()->IsDeletable() && @@ -2465,7 +2465,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); if( pEntry ) { sal_uInt16 nType; @@ -2576,7 +2576,7 @@ void SwContentTree::RequestHelp( const HelpEvent& rHEvt ) void SwContentTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { - SvLBoxEntry* pFirst = FirstSelected(); + SvTreeListEntry* pFirst = FirstSelected(); switch( nSelectedPopupEntry ) { //Outlinelevel @@ -2707,12 +2707,12 @@ void SwContentTree::ShowActualView() Beschreibung: Hier sollen die Buttons zum Verschieben von Outlines en-/disabled werden ***************************************************************************/ -sal_Bool SwContentTree::Select( SvLBoxEntry* pEntry, sal_Bool bSelect ) +sal_Bool SwContentTree::Select( SvTreeListEntry* pEntry, sal_Bool bSelect ) { if(!pEntry) return sal_False; sal_Bool bEnable = sal_False; - SvLBoxEntry* pParentEntry = GetParent(pEntry); + SvTreeListEntry* pParentEntry = GetParent(pEntry); while(pParentEntry && (!lcl_IsContentType(pParentEntry))) { pParentEntry = GetParent(pParentEntry); @@ -2747,7 +2747,7 @@ void SwContentType::RemoveNewline(String& rEntry) } } -void SwContentTree::EditEntry(SvLBoxEntry* pEntry, sal_uInt8 nMode) +void SwContentTree::EditEntry(SvTreeListEntry* pEntry, sal_uInt8 nMode) { SwContent* pCnt = (SwContent*)pEntry->GetUserData(); GotoContent(pCnt); @@ -3127,14 +3127,14 @@ sal_Bool NaviContentBookmark::Paste( TransferableDataHelper& rData ) class SwContentLBoxString : public SvLBoxString { public: - SwContentLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + SwContentLBoxString( 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 SwContentTree::InitEntry(SvLBoxEntry* pEntry, +void SwContentTree::InitEntry(SvTreeListEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { @@ -3146,7 +3146,7 @@ void SwContentTree::InitEntry(SvLBoxEntry* pEntry, } void SwContentLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { if(lcl_IsContent(pEntry) && ((SwContent *)pEntry->GetUserData())->IsInvisible()) diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx index f3ce370b6301..56eff33cd687 100644 --- a/sw/source/ui/utlui/glbltree.cxx +++ b/sw/source/ui/utlui/glbltree.cxx @@ -194,7 +194,7 @@ SwGlobalTree::~SwGlobalTree() sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) { sal_Int8 nRet = DND_ACTION_NONE; - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); if(pEmphasisEntry) { ImplShowTargetEmphasis( Prev(pEmphasisEntry), sal_False ); @@ -205,10 +205,10 @@ sal_Int8 SwGlobalTree::ExecuteDrop( const ExecuteDropEvent& rEvt ) ImplShowTargetEmphasis( pLast, sal_False); } - SvLBoxEntry* pDropEntry = bLastEntryEmphasis ? 0 : GetEntry(rEvt.maPosPixel); + SvTreeListEntry* pDropEntry = bLastEntryEmphasis ? 0 : GetEntry(rEvt.maPosPixel); if( bIsInternalDrag ) { - SvLBoxEntry* pDummy = 0; + SvTreeListEntry* pDummy = 0; sal_uLong nInsertionPos = LIST_APPEND; NotifyMoving( pDropEntry, pDDSource, pDummy, nInsertionPos ); } @@ -277,7 +277,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) //initiate scrolling GetDropTarget( rEvt.maPosPixel ); - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); if( rEvt.mbLeaving ) { if( pEmphasisEntry ) @@ -293,7 +293,7 @@ sal_Int8 SwGlobalTree::AcceptDrop( const AcceptDropEvent& rEvt ) } else { - SvLBoxEntry* pDropEntry = GetEntry( rEvt.maPosPixel ); + SvTreeListEntry* pDropEntry = GetEntry( rEvt.maPosPixel ); if(bIsInternalDrag) { if( pDDSource != pDropEntry ) @@ -431,10 +431,10 @@ void SwGlobalTree::TbxMenuHdl(sal_uInt16 nTbxId, ToolBox* pBox) sal_uInt16 SwGlobalTree::GetEnableFlags() const { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); sal_uInt16 nSelCount = (sal_uInt16)GetSelectionCount(); sal_uInt16 nEntryCount = (sal_uInt16)GetEntryCount(); - SvLBoxEntry* pPrevEntry = pEntry ? Prev(pEntry) : 0; + SvTreeListEntry* pPrevEntry = pEntry ? Prev(pEntry) : 0; sal_uInt16 nRet = 0; if(nSelCount == 1 || !nEntryCount) @@ -467,7 +467,7 @@ void SwGlobalTree::RequestHelp( const HelpEvent& rHEvt ) if( rHEvt.GetMode() & HELPMODE_QUICK ) { Point aPos( ScreenToOutputPixel( rHEvt.GetMousePosPixel() )); - SvLBoxEntry* pEntry = GetEntry( aPos ); + SvTreeListEntry* pEntry = GetEntry( aPos ); const SwGlblDocContent* pCont = pEntry ? (const SwGlblDocContent*)pEntry->GetUserData() : 0; if( pCont && GLBLDOC_SECTION == pCont->GetType()) @@ -511,7 +511,7 @@ void SwGlobalTree::SelectHdl() { sal_uInt16 nSelCount = (sal_uInt16)GetSelectionCount(); - SvLBoxEntry* pSel = FirstSelected(); + SvTreeListEntry* pSel = FirstSelected(); sal_uInt16 nAbsPos = pSel ? (sal_uInt16)GetModel()->GetAbsPos(pSel) : 0; SwNavigationPI* pNavi = GetParentWindow(); sal_Bool bReadonly = !pActiveShell || @@ -532,21 +532,21 @@ void SwGlobalTree::DeselectHdl() } DragDropMode SwGlobalTree::NotifyStartDrag( TransferDataContainer& , - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { bIsInternalDrag = sal_True; pDDSource = pEntry; return SV_DRAGDROP_CTRL_MOVE; } -long SwGlobalTree::GetTabPos( SvLBoxEntry*, SvLBoxTab* pTab) +long SwGlobalTree::GetTabPos( SvTreeListEntry*, SvLBoxTab* pTab) { return pTab->GetPos() - GLBL_TABPOS_SUB; } -sal_Bool SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pSource, - SvLBoxEntry*&, +sal_Bool SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pSource, + SvTreeListEntry*&, sal_uLong& ) { @@ -561,16 +561,16 @@ sal_Bool SwGlobalTree::NotifyMoving( SvLBoxEntry* pTarget, return sal_False; } -sal_Bool SwGlobalTree::NotifyCopying( SvLBoxEntry* /*pTarget*/, - SvLBoxEntry* /*pEntry*/, - SvLBoxEntry*& /*rpNewParent*/, +sal_Bool SwGlobalTree::NotifyCopying( SvTreeListEntry* /*pTarget*/, + SvTreeListEntry* /*pEntry*/, + SvTreeListEntry*& /*rpNewParent*/, sal_uLong& /*rNewChildPos*/ ) { return sal_False; } -sal_Bool SwGlobalTree::NotifyAcceptDrop( SvLBoxEntry* pEntry) +sal_Bool SwGlobalTree::NotifyAcceptDrop( SvTreeListEntry* pEntry) { return pEntry != 0; } @@ -594,7 +594,7 @@ void SwGlobalTree::DragFinished( sal_Int8 nAction ) void SwGlobalTree::MouseButtonDown( const MouseEvent& rMEvt ) { Point aPos( rMEvt.GetPosPixel()); - SvLBoxEntry* pEntry = GetEntry( aPos, sal_True ); + SvTreeListEntry* pEntry = GetEntry( aPos, sal_True ); if( !pEntry && rMEvt.IsLeft() && rMEvt.IsMod1() && (rMEvt.GetClicks() % 2) == 0) Control::MouseButtonDown( rMEvt ); else @@ -641,7 +641,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) sal_uInt16 nCount = pSwGlblDocContents->size(); if(bOnlyUpdateUserData && GetEntryCount() == pSwGlblDocContents->size()) { - SvLBoxEntry* pEntry = First(); + SvTreeListEntry* pEntry = First(); for( sal_uInt16 i = 0; i < nCount; i++) { SwGlblDocContent* pCont = (*pSwGlblDocContents)[i]; @@ -652,7 +652,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) else { SetUpdateMode( sal_False ); - SvLBoxEntry* pOldSelEntry = FirstSelected(); + SvTreeListEntry* pOldSelEntry = FirstSelected(); String sEntryName; // Name des Eintrags sal_uInt16 nSelPos = USHRT_MAX; if(pOldSelEntry) @@ -664,7 +664,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) if(!pSwGlblDocContents) Update( sal_False ); - SvLBoxEntry* pSelEntry = 0; + SvTreeListEntry* pSelEntry = 0; for( sal_uInt16 i = 0; i < nCount; i++) { SwGlblDocContent* pCont = (*pSwGlblDocContents)[i]; @@ -693,7 +693,7 @@ void SwGlobalTree::Display(sal_Bool bOnlyUpdateUserData) } break; } - SvLBoxEntry* pEntry = InsertEntry(sEntry, aImage, aImage, + SvTreeListEntry* pEntry = InsertEntry(sEntry, aImage, aImage, 0, sal_False, LIST_APPEND, pCont); if(sEntry == sEntryName) { @@ -780,7 +780,7 @@ IMPL_LINK( SwGlobalTree, PopupHdl, Menu* , pMenu) void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry ) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); SwGlblDocContent* pCont = pEntry ? (SwGlblDocContent*)pEntry->GetUserData() : 0; // wird waehrend des Dialogs ein RequestHelp gerufen, // dann geht der Content verloren. Deshalb wird hier eine @@ -797,7 +797,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry { // zwei Durchlaeufe: zuerst die Bereiche, dann die Verzeichnisse // aktualisieren - SvLBoxEntry* pSelEntry = FirstSelected(); + SvTreeListEntry* pSelEntry = FirstSelected(); while( pSelEntry ) { SwGlblDocContent* pContent = (SwGlblDocContent*)pSelEntry->GetUserData(); @@ -853,7 +853,7 @@ void SwGlobalTree::ExcecuteContextMenuAction( sal_uInt16 nSelectedPopupEntry // sind mehrere Eintraege selektiert, dann muss nach jedem delete // das Array neu gefuellt werden. Damit man sich nichts merken muss, // beginnt das Loeschen am Ende - SvLBoxEntry* pSelEntry = LastSelected(); + SvTreeListEntry* pSelEntry = LastSelected(); SwGlblDocContents* pTempContents = 0; pActiveShell->StartAction(); while(pSelEntry) @@ -1052,7 +1052,7 @@ void SwGlobalTree::HideTree() void SwGlobalTree::ExecCommand(sal_uInt16 nCmd) { - SvLBoxEntry* pEntry = FirstSelected(); + SvTreeListEntry* pEntry = FirstSelected(); OSL_ENSURE(pEntry, "gleich knallt's"); if(FN_GLOBAL_EDIT == nCmd) { @@ -1129,7 +1129,7 @@ sal_Bool SwGlobalTree::Update(sal_Bool bHard) SwGlblDocContent* pLeft = (*pTempContents)[i]; SwGlblDocContent* pRight = (*pSwGlblDocContents)[i]; GlobalDocContentType eType = pLeft->GetType(); - SvLBoxEntry* pEntry = GetEntry(i); + SvTreeListEntry* pEntry = GetEntry(i); String sTemp = GetEntryText(pEntry); if ( eType != pRight->GetType() || @@ -1203,7 +1203,7 @@ void SwGlobalTree::OpenDoc(const SwGlblDocContent* pCont) IMPL_LINK_NOARG( SwGlobalTree, DoubleClickHdl) { - SvLBoxEntry* pEntry = GetCurEntry(); + SvTreeListEntry* pEntry = GetCurEntry(); SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); if(pCont->GetType() == GLBLDOC_SECTION) OpenDoc(pCont); @@ -1223,7 +1223,7 @@ IMPL_STATIC_LINK_NOINSTANCE(SwGlobalTree, ShowFrameHdl, SwGlobalTree*, EMPTYARG) return 0; } -void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, +void SwGlobalTree::InitEntry(SvTreeListEntry* pEntry, const XubString& rStr ,const Image& rImg1,const Image& rImg2, SvLBoxButtonKind eButtonKind) { @@ -1235,7 +1235,7 @@ void SwGlobalTree::InitEntry(SvLBoxEntry* pEntry, } void SwLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry ) + SvTreeListEntry* pEntry ) { SwGlblDocContent* pCont = (SwGlblDocContent*)pEntry->GetUserData(); if(pCont->GetType() == GLBLDOC_SECTION && @@ -1272,7 +1272,7 @@ void SwGlobalTree::InsertRegion( const SwGlblDocContent* _pContent, const Sequen sal_Bool bMove = sal_False; if ( !_pContent ) { - SvLBoxEntry* pLast = (SvLBoxEntry*)LastVisible(); + SvTreeListEntry* pLast = (SvTreeListEntry*)LastVisible(); _pContent = (SwGlblDocContent*)pLast->GetUserData(); bMove = sal_True; } diff --git a/sw/source/ui/utlui/navipi.cxx b/sw/source/ui/utlui/navipi.cxx index 8695dfc66af1..70acc3da63ce 100644 --- a/sw/source/ui/utlui/navipi.cxx +++ b/sw/source/ui/utlui/navipi.cxx @@ -601,7 +601,7 @@ void SwNavigationPI::_ZoomOut() aContentTree.ShowTree(); aDocListBox.Show(); } - SvLBoxEntry* pFirst = aContentTree.FirstSelected(); + SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) aContentTree.Select(pFirst, sal_True); // toolbox enablen pConfig->SetSmall( sal_False ); @@ -628,7 +628,7 @@ void SwNavigationPI::_ZoomIn() ((SfxDockingWindow*)GetParent())->SetMinOutputSizePixel(Size( aMinOutSizePixel.Width(), aSz.Height())); pFloat->SetOutputSizePixel(aSz); - SvLBoxEntry* pFirst = aContentTree.FirstSelected(); + SvTreeListEntry* pFirst = aContentTree.FirstSelected(); if(pFirst) aContentTree.Select(pFirst, sal_True); // toolbox enablen pConfig->SetSmall( sal_True ); |