[Libreoffice-commits] .: basctl/source cui/source dbaccess/source reportdesign/source sc/source sd/source svtools/inc svtools/source sw/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Thu Oct 18 06:25:06 PDT 2012
basctl/source/basicide/baside2b.cxx | 2
cui/source/options/dbregister.cxx | 2
cui/source/options/optlingu.cxx | 6 -
cui/source/options/treeopt.cxx | 2
cui/source/options/webconninfo.cxx | 2
dbaccess/source/ui/app/AppDetailPageHelper.cxx | 4
dbaccess/source/ui/browser/dbtreeview.cxx | 2
dbaccess/source/ui/browser/dbtreeview.hxx | 4
dbaccess/source/ui/browser/unodatbr.cxx | 4
dbaccess/source/ui/control/dbtreelistbox.cxx | 2
dbaccess/source/ui/dlg/indexdialog.cxx | 2
dbaccess/source/ui/inc/unodatbr.hxx | 4
dbaccess/source/ui/querydesign/TableWindowListBox.cxx | 2
reportdesign/source/ui/dlg/AddField.cxx | 2
sc/source/ui/miscdlgs/solveroptions.cxx | 4
sc/source/ui/optdlg/calcoptionsdlg.cxx | 6 -
sd/source/ui/dlg/dlgassim.cxx | 4
svtools/inc/svtools/treelistbox.hxx | 24 -----
svtools/source/contnr/svimpbox.cxx | 2
svtools/source/contnr/treelistbox.cxx | 75 +-----------------
svtools/source/inc/svimpbox.hxx | 8 -
sw/source/ui/misc/redlndlg.cxx | 2
sw/source/ui/utlui/glbltree.cxx | 2
23 files changed, 42 insertions(+), 125 deletions(-)
New commits:
commit 49e5e750b51ae8b6ff5f8f98beedea1b4737c2fc
Author: Kohei Yoshida <kohei.yoshida at gmail.com>
Date: Fri Oct 19 15:20:10 2012 +0200
Merge SvLBoxTreeList and SvTreeList.
Change-Id: I318ff6f1009b1aaa7d0bd3abb250f92fb51a21cd
diff --git a/basctl/source/basicide/baside2b.cxx b/basctl/source/basicide/baside2b.cxx
index 134533c..b7b644f 100644
--- a/basctl/source/basicide/baside2b.cxx
+++ b/basctl/source/basicide/baside2b.cxx
@@ -1957,7 +1957,7 @@ void implCollapseModifiedObjectEntry( SvTreeListEntry* pParent, WatchTreeListBox
{
pThis->Collapse( pParent );
- SvLBoxTreeList* pModel = pThis->GetModel();
+ SvTreeList* pModel = pThis->GetModel();
SvTreeListEntry* pDeleteEntry;
while( (pDeleteEntry = pThis->SvTreeListBox::GetEntry( pParent, 0 )) != NULL )
{
diff --git a/cui/source/options/dbregister.cxx b/cui/source/options/dbregister.cxx
index 590d0fb..d04d3c8 100644
--- a/cui/source/options/dbregister.cxx
+++ b/cui/source/options/dbregister.cxx
@@ -336,7 +336,7 @@ IMPL_LINK( DbRegistrationOptionsPage, HeaderSelect_Impl, HeaderBar*, pBar )
nBits |= HIB_UPARROW;
}
pHeaderBar->SetItemBits( ITEMID_TYPE, nBits );
- SvLBoxTreeList* pModel = pPathBox->GetModel();
+ SvTreeList* pModel = pPathBox->GetModel();
pModel->SetSortMode( eMode );
pModel->Resort();
return 1;
diff --git a/cui/source/options/optlingu.cxx b/cui/source/options/optlingu.cxx
index f732a6a..f6b65f3 100644
--- a/cui/source/options/optlingu.cxx
+++ b/cui/source/options/optlingu.cxx
@@ -1465,7 +1465,7 @@ void SvxLinguTabPage::Reset( const SfxItemSet& rSet )
aLinguOptionsCLB.SetUpdateMode(sal_False);
aLinguOptionsCLB.Clear();
- SvLBoxTreeList *pModel = aLinguOptionsCLB.GetModel();
+ SvTreeList *pModel = aLinguOptionsCLB.GetModel();
SvTreeListEntry* pEntry = NULL;
sal_Int16 nVal = 0;
@@ -2113,7 +2113,7 @@ IMPL_LINK( SvxEditModulesDlg, LangSelectHdl_Impl, ListBox *, pBox )
static Locale aLastLocale;
Locale aCurLocale;
SvxLanguageToLocale(aCurLocale, eCurLanguage);
- SvLBoxTreeList *pModel = aModulesCLB.GetModel();
+ SvTreeList *pModel = aModulesCLB.GetModel();
if (pBox)
{
@@ -2373,7 +2373,7 @@ IMPL_LINK( SvxEditModulesDlg, UpDownHdl_Impl, PushButton *, pBtn )
0 != (pEntry = aModulesCLB.GetEntry(nCurPos)))
{
aModulesCLB.SetUpdateMode(sal_False);
- SvLBoxTreeList *pModel = aModulesCLB.GetModel();
+ SvTreeList *pModel = aModulesCLB.GetModel();
ModuleUserData_Impl* pData = (ModuleUserData_Impl*)pEntry->GetUserData();
String aStr(aModulesCLB.GetEntryText(pEntry));
diff --git a/cui/source/options/treeopt.cxx b/cui/source/options/treeopt.cxx
index 050d750..b0ed3a3 100644
--- a/cui/source/options/treeopt.cxx
+++ b/cui/source/options/treeopt.cxx
@@ -1838,7 +1838,7 @@ void OfaTreeOptionsDialog::ResizeTreeLB( void )
const long nIndent0 = PixelToLogic( Size( 28, 0 ) ).Width();
const long nIndent1 = PixelToLogic( Size( 52, 0 ) ).Width();
- SvLBoxTreeList* pTreeList = aTreeLB.GetModel();
+ SvTreeList* pTreeList = aTreeLB.GetModel();
DBG_ASSERT( pTreeList, "-OfaTreeOptionsDialog::ResizeTreeLB(): no model, no cookies!" );
SvTreeListEntry* pEntry = pTreeList->First();
diff --git a/cui/source/options/webconninfo.cxx b/cui/source/options/webconninfo.cxx
index b6f1bdc..a0a9e03 100644
--- a/cui/source/options/webconninfo.cxx
+++ b/cui/source/options/webconninfo.cxx
@@ -74,7 +74,7 @@ void PasswordTable::Resort( bool bForced )
nBits |= HIB_UPARROW;
}
GetTheHeaderBar().SetItemBits( 1, nBits );
- SvLBoxTreeList* pListModel = GetModel();
+ SvTreeList* pListModel = GetModel();
pListModel->SetSortMode( eMode );
pListModel->Resort();
}
diff --git a/dbaccess/source/ui/app/AppDetailPageHelper.cxx b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
index 7bbc447..dfcea23 100644
--- a/dbaccess/source/ui/app/AppDetailPageHelper.cxx
+++ b/dbaccess/source/ui/app/AppDetailPageHelper.cxx
@@ -286,7 +286,7 @@ void OAppDetailPageHelper::selectAll()
void OAppDetailPageHelper::sort(int _nPos,SvSortMode _eSortMode )
{
OSL_ENSURE(m_pLists[_nPos],"List can not be NULL! ->GPF");
- SvLBoxTreeList* pModel = m_pLists[_nPos]->GetModel();
+ SvTreeList* pModel = m_pLists[_nPos]->GetModel();
SvSortMode eOldSortMode = pModel->GetSortMode();
pModel->SetSortMode(_eSortMode);
if ( eOldSortMode != _eSortMode )
@@ -299,7 +299,7 @@ sal_Bool OAppDetailPageHelper::isSortUp() const
int nPos = getVisibleControlIndex();
if ( nPos < E_ELEMENT_TYPE_COUNT )
{
- SvLBoxTreeList* pModel = m_pLists[nPos]->GetModel();
+ SvTreeList* pModel = m_pLists[nPos]->GetModel();
eSortMode = pModel->GetSortMode();
}
return eSortMode == SortAscending;
diff --git a/dbaccess/source/ui/browser/dbtreeview.cxx b/dbaccess/source/ui/browser/dbtreeview.cxx
index 6f26f6c..91ee108 100644
--- a/dbaccess/source/ui/browser/dbtreeview.cxx
+++ b/dbaccess/source/ui/browser/dbtreeview.cxx
@@ -85,7 +85,7 @@ void DBTreeView::Resize()
m_pTreeListBox->SetPosSizePixel(Point(0,0),GetOutputSizePixel());
}
// -------------------------------------------------------------------------
-void DBTreeView::setModel(SvLBoxTreeList* _pTreeModel)
+void DBTreeView::setModel(SvTreeList* _pTreeModel)
{
if (_pTreeModel)
_pTreeModel->InsertView(m_pTreeListBox);
diff --git a/dbaccess/source/ui/browser/dbtreeview.hxx b/dbaccess/source/ui/browser/dbtreeview.hxx
index 9eea983..c54cf39 100644
--- a/dbaccess/source/ui/browser/dbtreeview.hxx
+++ b/dbaccess/source/ui/browser/dbtreeview.hxx
@@ -24,7 +24,7 @@
#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-class SvLBoxTreeList;
+class SvTreeList;
namespace dbaui
{
class DBTreeListBox;
@@ -56,7 +56,7 @@ namespace dbaui
void setCopyHandler(const Link& _rHdl);
- void setModel(SvLBoxTreeList* _pTreeModel);
+ void setModel(SvTreeList* _pTreeModel);
void setSelChangeHdl(const Link& _rHdl);
DBTreeListBox& getListBox() const { return *m_pTreeListBox; }
diff --git a/dbaccess/source/ui/browser/unodatbr.cxx b/dbaccess/source/ui/browser/unodatbr.cxx
index 8c8e2a5..c5d9242 100644
--- a/dbaccess/source/ui/browser/unodatbr.cxx
+++ b/dbaccess/source/ui/browser/unodatbr.cxx
@@ -321,7 +321,7 @@ void SAL_CALL SbaTableQueryBrowser::disposing()
// clear the tree model
{
SAL_WNODEPRECATED_DECLARATIONS_PUSH
- ::std::auto_ptr<SvLBoxTreeList> aTemp(m_pTreeModel);
+ ::std::auto_ptr<SvTreeList> aTemp(m_pTreeModel);
SAL_WNODEPRECATED_DECLARATIONS_POP
m_pTreeModel = NULL;
}
@@ -393,7 +393,7 @@ sal_Bool SbaTableQueryBrowser::Construct(Window* pParent)
getBrowserView()->setTreeView(m_pTreeView);
// fill view with data
- m_pTreeModel = new SvLBoxTreeList;
+ m_pTreeModel = new SvTreeList;
m_pTreeModel->SetSortMode(SortAscending);
m_pTreeModel->SetCompareHdl(LINK(this, SbaTableQueryBrowser, OnTreeEntryCompare));
m_pTreeView->setModel(m_pTreeModel);
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx
index 685bcf8..ec14ea6 100644
--- a/dbaccess/source/ui/control/dbtreelistbox.cxx
+++ b/dbaccess/source/ui/control/dbtreelistbox.cxx
@@ -110,7 +110,7 @@ DBTreeListBox::~DBTreeListBox()
//------------------------------------------------------------------------
SvTreeListEntry* DBTreeListBox::GetEntryPosByName( const String& aName, SvTreeListEntry* pStart, const IEntryFilter* _pFilter ) const
{
- SvLBoxTreeList* myModel = GetModel();
+ SvTreeList* myModel = GetModel();
SvTreeEntryList* pChildren = myModel->GetChildList(pStart);
SvTreeListEntry* pEntry = NULL;
if ( pChildren )
diff --git a/dbaccess/source/ui/dlg/indexdialog.cxx b/dbaccess/source/ui/dlg/indexdialog.cxx
index c5fb836..73e8624 100644
--- a/dbaccess/source/ui/dlg/indexdialog.cxx
+++ b/dbaccess/source/ui/dlg/indexdialog.cxx
@@ -458,7 +458,7 @@ DBG_NAME(DbaIndexDialog)
showError(aExceptionInfo, this, m_xORB);
else if (bSuccess && _bRemoveFromCollection)
{
- SvLBoxTreeList* pModel = m_aIndexes.GetModel();
+ SvTreeList* pModel = m_aIndexes.GetModel();
m_aIndexes.disableSelectHandler();
pModel->Remove(_pEntry);
diff --git a/dbaccess/source/ui/inc/unodatbr.hxx b/dbaccess/source/ui/inc/unodatbr.hxx
index 6ad76e7..c40f077 100644
--- a/dbaccess/source/ui/inc/unodatbr.hxx
+++ b/dbaccess/source/ui/inc/unodatbr.hxx
@@ -50,7 +50,7 @@ struct SvSortData;
namespace com { namespace sun{ namespace star { namespace container { class XNameContainer; } } } }
-class SvLBoxTreeList;
+class SvTreeList;
// .........................................................................
namespace dbaui
{
@@ -109,7 +109,7 @@ namespace dbaui
DBTreeView* m_pTreeView;
Splitter* m_pSplitter;
- SvLBoxTreeList* m_pTreeModel; // contains the datasources of the registry
+ SvTreeList* m_pTreeModel; // contains the datasources of the registry
SvTreeListEntry* m_pCurrentlyDisplayed;
sal_uLong m_nAsyncDrop;
diff --git a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
index f6047d9..ab97283 100644
--- a/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
+++ b/dbaccess/source/ui/querydesign/TableWindowListBox.cxx
@@ -90,7 +90,7 @@ SvTreeListEntry* OTableWindowListBox::GetEntryFromText( const String& rEntryText
{
//////////////////////////////////////////////////////////////////////
// Liste durchiterieren
- SvLBoxTreeList* pTreeList = GetModel();
+ SvTreeList* pTreeList = GetModel();
SvTreeListEntry* pEntry = pTreeList->First();
OJoinDesignView* pView = m_pTabWin->getDesignView();
OJoinController& rController = pView->getController();
diff --git a/reportdesign/source/ui/dlg/AddField.cxx b/reportdesign/source/ui/dlg/AddField.cxx
index 4cadd0b..3acb09d 100644
--- a/reportdesign/source/ui/dlg/AddField.cxx
+++ b/reportdesign/source/ui/dlg/AddField.cxx
@@ -219,7 +219,7 @@ OAddFieldWindow::~OAddFieldWindow()
{
if ( m_pListBox.get() )
{
- SvLBoxTreeList* pModel = m_pListBox->GetModel();
+ SvTreeList* pModel = m_pListBox->GetModel();
sal_uLong nCount = pModel->GetEntryCount();
for(sal_uLong i = 0; i< nCount;++i)
{
diff --git a/sc/source/ui/miscdlgs/solveroptions.cxx b/sc/source/ui/miscdlgs/solveroptions.cxx
index 5dba814..f86808b 100644
--- a/sc/source/ui/miscdlgs/solveroptions.cxx
+++ b/sc/source/ui/miscdlgs/solveroptions.cxx
@@ -194,7 +194,7 @@ const uno::Sequence<beans::PropertyValue>& ScSolverOptionsDialog::GetProperties(
// update maProperties from list box content
// order of entries in list box and maProperties is the same
sal_Int32 nEntryCount = maProperties.getLength();
- SvLBoxTreeList* pModel = maLbSettings.GetModel();
+ SvTreeList* pModel = maLbSettings.GetModel();
if ( nEntryCount == (sal_Int32)pModel->GetEntryCount() )
{
for (sal_Int32 nEntryPos=0; nEntryPos<nEntryCount; ++nEntryPos)
@@ -267,7 +267,7 @@ void ScSolverOptionsDialog::FillListBox()
if (!mpCheckButtonData)
mpCheckButtonData = new SvLBoxButtonData( &maLbSettings );
- SvLBoxTreeList* pModel = maLbSettings.GetModel();
+ SvTreeList* pModel = maLbSettings.GetModel();
SvTreeListEntry* pEntry = NULL;
for (sal_Int32 nPos=0; nPos<nCount; nPos++)
diff --git a/sc/source/ui/optdlg/calcoptionsdlg.cxx b/sc/source/ui/optdlg/calcoptionsdlg.cxx
index 0167bfb..2a7d0ef 100644
--- a/sc/source/ui/optdlg/calcoptionsdlg.cxx
+++ b/sc/source/ui/optdlg/calcoptionsdlg.cxx
@@ -135,7 +135,7 @@ void ScCalcOptionsDialog::FillOptionsList()
maLbSettings.SetUpdateMode(false);
maLbSettings.Clear();
- SvLBoxTreeList* pModel = maLbSettings.GetModel();
+ SvTreeList* pModel = maLbSettings.GetModel();
{
// Syntax for INDIRECT function.
@@ -235,7 +235,7 @@ void ScCalcOptionsDialog::ListOptionValueChanged()
maLbSettings.SetUpdateMode(false);
- SvLBoxTreeList* pModel = maLbSettings.GetModel();
+ SvTreeList* pModel = maLbSettings.GetModel();
SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 0);
if (!pEntry)
return;
@@ -263,7 +263,7 @@ void ScCalcOptionsDialog::RadioValueChanged()
maConfig.mbEmptyStringAsZero = maBtnTrue.IsChecked();
maLbSettings.SetUpdateMode(false);
- SvLBoxTreeList* pModel = maLbSettings.GetModel();
+ SvTreeList* pModel = maLbSettings.GetModel();
SvTreeListEntry* pEntry = pModel->GetEntry(NULL, 1);
if (!pEntry)
return;
diff --git a/sd/source/ui/dlg/dlgassim.cxx b/sd/source/ui/dlg/dlgassim.cxx
index 3f042c3..43171da 100644
--- a/sd/source/ui/dlg/dlgassim.cxx
+++ b/sd/source/ui/dlg/dlgassim.cxx
@@ -62,7 +62,7 @@ SdPageListControl::SdPageListControl(
IMPL_LINK_NOARG(SdPageListControl, CheckButtonClickHdl)
{
- SvLBoxTreeList* pTreeModel = GetModel();
+ SvTreeList* pTreeModel = GetModel();
SvTreeListEntry* pEntry = pTreeModel->First();
while( pEntry )
@@ -179,7 +179,7 @@ sal_uInt16 SdPageListControl::GetSelectedPage()
if ( pSelEntry )
{
- SvLBoxTreeList* pTreeModel = GetModel();
+ SvTreeList* pTreeModel = GetModel();
SvTreeListEntry* pEntry = pTreeModel->First();
while( pEntry && pEntry != pSelEntry )
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index ceb7497..75c933b 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -198,24 +198,6 @@ public:
virtual void Clone( SvLBoxItem* pSource ) = 0;
};
-class SVT_DLLPUBLIC SvLBoxTreeList : public SvTreeList
-{
-public:
- SvTreeListEntry* First() const;
- SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvTreeListEntry* Last() const;
- SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
- SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const;
- SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const;
- SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const;
- SvTreeListEntry* FirstChild( SvTreeListEntry* pParent ) const;
- SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const;
- SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const;
- SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const;
- SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
-};
-
// *********************************************************************
// ****************************** SvTreeListBox *******************************
// *********************************************************************
@@ -303,7 +285,7 @@ protected:
sal_uInt16 nCurEntrySelPos;
private:
- void SetBaseModel(SvLBoxTreeList* pNewModel);
+ void SetBaseModel(SvTreeList* pNewModel);
DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * );
@@ -392,9 +374,9 @@ public:
SvTreeListBox( Window* pParent, const ResId& rResId );
~SvTreeListBox();
- SvLBoxTreeList* GetModel() const { return (SvLBoxTreeList*)pModel; }
+ SvTreeList* GetModel() const { return (SvTreeList*)pModel; }
using SvListView::SetModel;
- void SetModel(SvLBoxTreeList* pNewModel);
+ void SetModel(SvTreeList* pNewModel);
sal_uInt16 IsA();
sal_uLong GetEntryCount() const {return pModel->GetEntryCount();}
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index 3c3abbc..83b344e 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -51,7 +51,7 @@ Image* SvImpLBox::s_pDefCollapsed = NULL;
Image* SvImpLBox::s_pDefExpanded = NULL;
sal_Int32 SvImpLBox::s_nImageRefCount = 0;
-SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvLBoxTreeList* pLBTree, WinBits nWinStyle) :
+SvImpLBox::SvImpLBox( SvTreeListBox* pLBView, SvTreeList* pLBTree, WinBits nWinStyle) :
aVerSBar( pLBView, WB_DRAG | WB_VSCROLL ),
aHorSBar( pLBView, WB_DRAG | WB_HSCROLL ),
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index 8bce6bb..6442181 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -385,71 +385,6 @@ SvViewDataItem::~SvViewDataItem()
DBG_DTOR(SvViewDataItem,0);
}
-SvTreeListEntry* SvLBoxTreeList::First() const
-{
- return (SvTreeListEntry*)SvTreeList::First();
-}
-
-SvTreeListEntry* SvLBoxTreeList::Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const
-{
- return (SvTreeListEntry*)SvTreeList::Next(pEntry,pDepth);
-}
-
-SvTreeListEntry* SvLBoxTreeList::Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const
-{
- return (SvTreeListEntry*)SvTreeList::Prev(pEntry,pDepth);
-}
-
-SvTreeListEntry* SvLBoxTreeList::Last() const
-{
- return (SvTreeListEntry*)SvTreeList::Last();
-}
-
-SvTreeListEntry* SvLBoxTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const
-{
- return (SvTreeListEntry*)SvTreeList::Clone(pEntry,nCloneCount);
-}
-
-SvTreeListEntry* SvLBoxTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const
-{
- return (SvTreeListEntry*)SvTreeList::GetEntry(pParent,nPos);
-}
-
-SvTreeListEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const
-{
- return (SvTreeListEntry*)SvTreeList::GetEntry(nRootPos);
-}
-
-SvTreeListEntry* SvLBoxTreeList::GetParent( SvTreeListEntry* pEntry ) const
-{
- return (SvTreeListEntry*)SvTreeList::GetParent(pEntry);
-}
-
-SvTreeListEntry* SvLBoxTreeList::FirstChild( SvTreeListEntry* pParent ) const
-{
- return (SvTreeListEntry*)SvTreeList::FirstChild(pParent);
-}
-
-SvTreeListEntry* SvLBoxTreeList::NextSibling( SvTreeListEntry* pEntry ) const
-{
- return (SvTreeListEntry*)SvTreeList::NextSibling(pEntry);
-}
-
-SvTreeListEntry* SvLBoxTreeList::PrevSibling( SvTreeListEntry* pEntry ) const
-{
- return (SvTreeListEntry*)SvTreeList::PrevSibling(pEntry);
-}
-
-SvTreeListEntry* SvLBoxTreeList::LastSibling( SvTreeListEntry* pEntry ) const
-{
- return (SvTreeListEntry*)SvTreeList::LastSibling(pEntry);
-}
-
-SvTreeListEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
-{
- return (SvTreeListEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos);
-}
-
// ***************************************************************
// class SvLBoxViewData
// ***************************************************************
@@ -503,7 +438,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, WinBits nWinStyle) :
nImpFlags = 0;
pTargetEntry = 0;
nDragDropMode = 0;
- SvLBoxTreeList* pTempModel = new SvLBoxTreeList;
+ SvTreeList* pTempModel = new SvTreeList;
pTempModel->SetRefCount( 0 );
SetBaseModel(pTempModel);
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
@@ -531,7 +466,7 @@ SvTreeListBox::SvTreeListBox(Window* pParent, const ResId& rResId) :
nImpFlags = 0;
nDragOptions = DND_ACTION_COPYMOVE | DND_ACTION_LINK;
nDragDropMode = 0;
- SvLBoxTreeList* pTempModel = new SvLBoxTreeList;
+ SvTreeList* pTempModel = new SvTreeList;
pTempModel->SetRefCount( 0 );
SetBaseModel(pTempModel);
pModel->InsertView( this );
@@ -1589,14 +1524,14 @@ void SvTreeListBox::SetExtendedWinBits( ExtendedWinBits _nBits )
pImp->SetExtendedWindowBits( _nBits );
}
-void SvTreeListBox::SetModel( SvLBoxTreeList* pNewModel )
+void SvTreeListBox::SetModel( SvTreeList* pNewModel )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetModel( pNewModel );
SetBaseModel(pNewModel);
}
-void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel )
+void SvTreeListBox::SetBaseModel( SvTreeList* pNewModel )
{
// does the CleanUp
SvListView::SetModel( pNewModel );
@@ -1612,7 +1547,7 @@ void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel )
void SvTreeListBox::DisconnectFromModel()
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxTreeList* pNewModel = new SvLBoxTreeList;
+ SvTreeList* pNewModel = new SvTreeList;
pNewModel->SetRefCount( 0 ); // else this will never be deleted
SvListView::SetModel( pNewModel );
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index 998b8da..673a5cc 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -40,7 +40,7 @@
class SvTreeListBox;
class Point;
-class SvLBoxTreeList;
+class SvTreeList;
class SvImpLBox;
class SvTreeListEntry;
class SvLBoxTab;
@@ -96,7 +96,7 @@ friend class ImpLBSelEng;
friend class SvTreeListBox;
private:
SvTreeListBox* pView;
- SvLBoxTreeList* pTree;
+ SvTreeList* pTree;
SvTreeListEntry* pCursor;
SvTreeListEntry* pStartEntry;
SvTreeListEntry* pAnchor;
@@ -255,14 +255,14 @@ private:
inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; }
public:
- SvImpLBox( SvTreeListBox* pView, SvLBoxTreeList*, WinBits nWinStyle );
+ SvImpLBox( SvTreeListBox* pView, SvTreeList*, WinBits nWinStyle );
~SvImpLBox();
void Clear();
void SetStyle( WinBits i_nWinStyle );
void SetExtendedWindowBits( ExtendedWinBits _nBits );
ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; }
- void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
+ void SetModel( SvTreeList* pModel ) { pTree = pModel;}
void EntryInserted( SvTreeListEntry*);
void RemovingEntry( SvTreeListEntry* pEntry );
diff --git a/sw/source/ui/misc/redlndlg.cxx b/sw/source/ui/misc/redlndlg.cxx
index 22fa068..466dc82 100644
--- a/sw/source/ui/misc/redlndlg.cxx
+++ b/sw/source/ui/misc/redlndlg.cxx
@@ -678,7 +678,7 @@ void SwRedlineAcceptDlg::RemoveParents(sal_uInt16 nStart, sal_uInt16 nEnd)
if (pCurEntry)
pTable->SetCurEntry(pCurEntry);
- SvLBoxTreeList* pModel = pTable->GetModel();
+ SvTreeList* pModel = pTable->GetModel();
for (sal_uInt16 i = nStart; i <= nEnd; i++)
{
diff --git a/sw/source/ui/utlui/glbltree.cxx b/sw/source/ui/utlui/glbltree.cxx
index 56eff33..4d2d08c 100644
--- a/sw/source/ui/utlui/glbltree.cxx
+++ b/sw/source/ui/utlui/glbltree.cxx
@@ -550,7 +550,7 @@ sal_Bool SwGlobalTree::NotifyMoving( SvTreeListEntry* pTarget,
sal_uLong&
)
{
- SvLBoxTreeList* _pModel = GetModel();
+ SvTreeList* _pModel = GetModel();
sal_uInt16 nSource = (sal_uInt16) _pModel->GetAbsPos(pSource);
sal_uInt16 nDest = pTarget ? (sal_uInt16) _pModel->GetAbsPos(pTarget) : pSwGlblDocContents->size();
More information about the Libreoffice-commits
mailing list