mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge SvLBoxTreeList and SvTreeList.

Browse Source 
Change-Id: I318ff6f1009b1aaa7d0bd3abb250f92fb51a21cd
This commit is contained in:
Kohei Yoshida 2012-10-19 15:20:10 +02:00
parent 4bc089dff2
commit 49e5e750b5
23 changed files with 42 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
basctl/source/basicide/baside2b.cxx
View File

@ -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 )
{

2
cui/source/options/dbregister.cxx
View File

@ -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;

6
cui/source/options/optlingu.cxx
View File

@ -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));

2
cui/source/options/treeopt.cxx
View File

@ -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();

2
cui/source/options/webconninfo.cxx
View File

@ -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();
}

4
dbaccess/source/ui/app/AppDetailPageHelper.cxx
View File

@ -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;

2
dbaccess/source/ui/browser/dbtreeview.cxx
View File

@ -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);

4
dbaccess/source/ui/browser/dbtreeview.hxx
View File

@ -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; }

4
dbaccess/source/ui/browser/unodatbr.cxx
View File

@ -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);

2
dbaccess/source/ui/control/dbtreelistbox.cxx
View File

@ -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 )

2
dbaccess/source/ui/dlg/indexdialog.cxx
View File

@ -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);

4
dbaccess/source/ui/inc/unodatbr.hxx
View File

@ -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;

2
dbaccess/source/ui/querydesign/TableWindowListBox.cxx
View File

@ -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();

2
reportdesign/source/ui/dlg/AddField.cxx
View File

@ -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)
{

4
sc/source/ui/miscdlgs/solveroptions.cxx
View File

@ -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++)

6
sc/source/ui/optdlg/calcoptionsdlg.cxx
View File

@ -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;

4
sd/source/ui/dlg/dlgassim.cxx
View File

@ -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 )

24
svtools/inc/svtools/treelistbox.hxx
View File

@ -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();}

2
svtools/source/contnr/svimpbox.cxx
View File

@ -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 ),

75
svtools/source/contnr/treelistbox.cxx
View File

@ -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 );

8
svtools/source/inc/svimpbox.hxx
View File

@ -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 );

2
sw/source/ui/misc/redlndlg.cxx
View File

@ -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++)
{

2
sw/source/ui/utlui/glbltree.cxx
View File

@ -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();