summaryrefslogtreecommitdiff
path: root/svtools
diff options
context:
space:
mode:
authorKohei Yoshida <kohei.yoshida@gmail.com>2012-10-18 16:28:20 +0200
committerKohei Yoshida <kohei.yoshida@gmail.com>2012-10-19 11:45:36 +0200
commit4b313fd5661ca5ac096e60d46691b1a9857877d9 (patch)
tree59ba989a24fe1d21562f9a3c8a465b124028c62a /svtools
parentd47508e036fd30f410798f37d25039bb25528f60 (diff)
Merge SvListEntry and SvLBoxEntry into SvTreeListEntry.
Change-Id: I89cfc8c1288c00674fe64e791c149743d377d5ee
Diffstat (limited to 'svtools')
-rw-r--r--svtools/inc/svtools/fileview.hxx8
-rw-r--r--svtools/inc/svtools/svlbitm.hxx30
-rw-r--r--svtools/inc/svtools/svtabbx.hxx50
-rw-r--r--svtools/inc/svtools/treelist.hxx280
-rw-r--r--svtools/inc/svtools/treelistbox.hxx271
-rw-r--r--svtools/inc/svtools/treelistentry.hxx93
-rw-r--r--svtools/source/contnr/fileview.cxx32
-rw-r--r--svtools/source/contnr/svimpbox.cxx244
-rw-r--r--svtools/source/contnr/svlbitm.cxx30
-rw-r--r--svtools/source/contnr/svtabbx.cxx80
-rw-r--r--svtools/source/contnr/treelist.cxx256
-rw-r--r--svtools/source/contnr/treelistbox.cxx406
-rw-r--r--svtools/source/contnr/treelistentry.cxx189
-rw-r--r--svtools/source/inc/svimpbox.hxx100
-rw-r--r--svtools/source/uno/treecontrolpeer.cxx40
15 files changed, 1056 insertions, 1053 deletions
diff --git a/svtools/inc/svtools/fileview.hxx b/svtools/inc/svtools/fileview.hxx
index 00e8cd99273e..c9560722bd74 100644
--- a/svtools/inc/svtools/fileview.hxx
+++ b/svtools/inc/svtools/fileview.hxx
@@ -48,7 +48,7 @@
class ViewTabListBox_Impl;
class SvtFileView_Impl;
-class SvLBoxEntry;
+class SvTreeListEntry;
class HeaderBar;
class IUrlFilter;
@@ -94,7 +94,7 @@ public:
~SvtFileView();
const String& GetViewURL() const;
- String GetURL( SvLBoxEntry* pEntry ) const;
+ String GetURL( SvTreeListEntry* pEntry ) const;
String GetCurrentURL() const;
sal_Bool GetParentURL( String& _rParentURL ) const;
@@ -186,8 +186,8 @@ public:
void SetOpenDoneHdl( const Link& rHdl );
sal_uLong GetSelectionCount() const;
- SvLBoxEntry* FirstSelected() const;
- SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const;
+ SvTreeListEntry* FirstSelected() const;
+ SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const;
void EnableAutoResize();
void SetFocus();
diff --git a/svtools/inc/svtools/svlbitm.hxx b/svtools/inc/svtools/svlbitm.hxx
index 6bca37e7f492..a4e1d400c1e3 100644
--- a/svtools/inc/svtools/svlbitm.hxx
+++ b/svtools/inc/svtools/svlbitm.hxx
@@ -37,7 +37,7 @@
#include <vcl/image.hxx>
#include <svtools/treelistbox.hxx>
-class SvLBoxEntry;
+class SvTreeListEntry;
#define SV_BMP_UNCHECKED 0
@@ -79,11 +79,11 @@ public:
// weil Buttons nicht von LinkHdl abgeleitet sind
void CallLink();
- void StoreButtonState( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags );
+ void StoreButtonState( SvTreeListEntry* pEntry, sal_uInt16 nItemFlags );
SvButtonState ConvertToButtonState( sal_uInt16 nItemFlags ) const;
inline SvButtonState GetActButtonState() const;
- SvLBoxEntry* GetActEntry() const;
+ SvTreeListEntry* GetActEntry() const;
Image aBmps[24]; // Indizes siehe Konstanten BMP_ ....
@@ -119,14 +119,14 @@ class SVT_DLLPUBLIC SvLBoxString : public SvLBoxItem
protected:
rtl::OUString maText;
public:
- SvLBoxString(SvLBoxEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr);
+ SvLBoxString(SvTreeListEntry*, sal_uInt16 nFlags, const rtl::OUString& rStr);
SvLBoxString();
virtual ~SvLBoxString();
virtual sal_uInt16 IsA();
- virtual void InitViewData(SvTreeListBox*, SvLBoxEntry*, SvViewDataItem*);
+ virtual void InitViewData(SvTreeListBox*, SvTreeListEntry*, SvViewDataItem*);
rtl::OUString GetText() const { return maText; }
void SetText( const rtl::OUString& rText ) { maText = rText; }
- virtual void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
};
@@ -138,8 +138,8 @@ public:
SvLBoxBmp();
virtual ~SvLBoxBmp();
virtual sal_uInt16 IsA();
- virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
- virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
};
@@ -165,15 +165,15 @@ public:
// (which cannot be modified via UI), or a static image
// (see SV_BMP_STATICIMAGE; nFlags are effectively ignored
// for that kind).
- SvLBoxButton( SvLBoxEntry* pEntry,
+ SvLBoxButton( SvTreeListEntry* pEntry,
SvLBoxButtonKind eTheKind, sal_uInt16 nFlags,
SvLBoxButtonData* pBData );
SvLBoxButton();
virtual ~SvLBoxButton();
- virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
virtual sal_uInt16 IsA();
- virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvLBoxEntry* );
- virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual sal_Bool ClickHdl(SvTreeListBox* pView, SvTreeListEntry* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
sal_uInt16 GetButtonFlags() const { return nItemFlags; }
@@ -225,13 +225,13 @@ class SVT_DLLPUBLIC SvLBoxContextBmp : public SvLBoxItem
{
SvLBoxContextBmp_Impl* m_pImpl;
public:
- SvLBoxContextBmp( SvLBoxEntry*,sal_uInt16 nFlags,Image,Image,
+ SvLBoxContextBmp( SvTreeListEntry*,sal_uInt16 nFlags,Image,Image,
sal_uInt16 nEntryFlagsBmp1);
SvLBoxContextBmp();
virtual ~SvLBoxContextBmp();
virtual sal_uInt16 IsA();
- virtual void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
- virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvLBoxEntry* );
+ virtual void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
+ virtual void Paint( const Point&, SvTreeListBox& rView, sal_uInt16 nFlags,SvTreeListEntry* );
virtual SvLBoxItem* Create() const;
virtual void Clone( SvLBoxItem* pSource );
diff --git a/svtools/inc/svtools/svtabbx.hxx b/svtools/inc/svtools/svtabbx.hxx
index ef9a2d1b1c3f..d219b93dc3ef 100644
--- a/svtools/inc/svtools/svtabbx.hxx
+++ b/svtools/inc/svtools/svtabbx.hxx
@@ -44,11 +44,11 @@ enum SvTabJustify
struct TabListBoxEventData
{
- SvLBoxEntry* m_pEntry;
+ SvTreeListEntry* m_pEntry;
sal_uInt16 m_nColumn;
String m_sOldText;
- TabListBoxEventData( SvLBoxEntry* pEntry, sal_uInt16 nColumn, const String& rOldText ) :
+ TabListBoxEventData( SvTreeListEntry* pEntry, sal_uInt16 nColumn, const String& rOldText ) :
m_pEntry( pEntry ), m_nColumn( nColumn ), m_sOldText( rOldText ) {}
};
@@ -60,16 +60,16 @@ private:
XubString aCurEntry;
protected:
- SvLBoxEntry* pViewParent;
+ SvTreeListEntry* pViewParent;
static const xub_Unicode* GetToken( const xub_Unicode* pPtr, sal_uInt16& rLen );
virtual void SetTabs();
- virtual void InitEntry( SvLBoxEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
+ virtual void InitEntry( SvTreeListEntry*, const XubString&, const Image&, const Image&, SvLBoxButtonKind );
String GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const;
- SvLBoxEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const;
- SvLBoxEntry* GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const;
+ SvTreeListEntry* GetEntryOnPos( sal_uLong _nEntryPos ) const;
+ SvTreeListEntry* GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const;
public:
SvTabListBox( Window* pParent, WinBits = WB_BORDER );
@@ -82,36 +82,36 @@ public:
void SetTab( sal_uInt16 nTab, long nValue, MapUnit = MAP_APPFONT );
long GetLogicTab( sal_uInt16 nTab );
- virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
+ virtual SvTreeListEntry* InsertEntry( const XubString& rText, SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
- virtual SvLBoxEntry* InsertEntry( const XubString& rText,
+ virtual SvTreeListEntry* InsertEntry( const XubString& rText,
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent = 0,
+ SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp,
- const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp,
+ const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
- virtual String GetEntryText( SvLBoxEntry* pEntry ) const;
- String GetEntryText( SvLBoxEntry*, sal_uInt16 nCol ) const;
+ virtual String GetEntryText( SvTreeListEntry* pEntry ) const;
+ String GetEntryText( SvTreeListEntry*, sal_uInt16 nCol ) const;
String GetEntryText( sal_uLong nPos, sal_uInt16 nCol = 0xffff ) const;
using SvTreeListBox::SetEntryText;
void SetEntryText( const XubString&, sal_uLong, sal_uInt16 nCol=0xffff );
- void SetEntryText(const XubString&,SvLBoxEntry*,sal_uInt16 nCol=0xffff);
+ void SetEntryText(const XubString&,SvTreeListEntry*,sal_uInt16 nCol=0xffff);
String GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const;
sal_uLong GetEntryPos( const XubString&, sal_uInt16 nCol = 0xffff );
- sal_uLong GetEntryPos( const SvLBoxEntry* pEntry ) const;
+ sal_uLong GetEntryPos( const SvTreeListEntry* pEntry ) const;
virtual void Resize();
void SetTabJustify( sal_uInt16 nTab, SvTabJustify );
@@ -155,18 +155,18 @@ public:
virtual void Paint( const Rectangle& );
void InitHeaderBar( HeaderBar* pHeaderBar );
- sal_Bool IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const;
+ sal_Bool IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const;
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, sal_uLong nPos = LIST_APPEND,
sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, SvLBoxEntry* pParent,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, SvTreeListEntry* pParent,
sal_uLong nPos, sal_uInt16 nCol, void* pUserData = NULL );
- virtual SvLBoxEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp,
- const Image& rCollapsedEntryBmp, SvLBoxEntry* pParent = NULL,
+ virtual SvTreeListEntry* InsertEntryToColumn( const XubString&, const Image& rExpandedEntryBmp,
+ const Image& rCollapsedEntryBmp, SvTreeListEntry* pParent = NULL,
sal_uLong nPos = LIST_APPEND, sal_uInt16 nCol = 0xffff, void* pUserData = NULL );
- virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND);
- virtual sal_uLong Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos = LIST_APPEND );
- void RemoveEntry( SvLBoxEntry* _pEntry );
+ virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND);
+ virtual sal_uLong Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos = LIST_APPEND );
+ void RemoveEntry( SvTreeListEntry* _pEntry );
void Clear();
// Accessible -------------------------------------------------------------
diff --git a/svtools/inc/svtools/treelist.hxx b/svtools/inc/svtools/treelist.hxx
index f7d04a95282a..2f4e06a323a7 100644
--- a/svtools/inc/svtools/treelist.hxx
+++ b/svtools/inc/svtools/treelist.hxx
@@ -52,7 +52,7 @@
#define LISTACTION_RESORTED 10
#define LISTACTION_CLEARED 11
-#define SV_TREELIST_ROOT_ENTRY (SvListEntry*)0
+#define SV_TREELIST_ROOT_ENTRY (SvTreeListEntry*)0
#define SV_TREELIST_ERROR 0xFFFFFFFF
// Entryflags, die an der View haengen
@@ -62,12 +62,12 @@
#define SVLISTENTRYFLAG_CURSORED 0x0008
#define SVLISTENTRYFLAG_NOT_SELECTABLE 0x0010
-class SvListEntry;
+class SvTreeListEntry;
class SVT_DLLPUBLIC SvTreeEntryList
{
private:
- typedef std::vector<SvListEntry*> ListType;
+ typedef std::vector<SvTreeListEntry*> ListType;
ListType maEntryList;
public:
@@ -78,28 +78,28 @@ public:
SvTreeEntryList(const SvTreeEntryList& rList);
void DestroyAll();
- void push_back(SvListEntry* pItem);
- void insert(SvListEntry* pItem, size_t i);
- void remove(SvListEntry* pItem);
+ void push_back(SvTreeListEntry* pItem);
+ void insert(SvTreeListEntry* pItem, size_t i);
+ void remove(SvTreeListEntry* pItem);
void remove(size_t i);
- void replace(SvListEntry* pNew, SvListEntry* pOld);
+ void replace(SvTreeListEntry* pNew, SvTreeListEntry* pOld);
void clear();
bool empty() const;
size_t size() const;
- size_t GetPos(const SvListEntry* pItem) const;
+ size_t GetPos(const SvTreeListEntry* pItem) const;
- SvListEntry* operator[](size_t i);
- const SvListEntry* operator[](size_t i) const;
+ SvTreeListEntry* operator[](size_t i);
+ const SvTreeListEntry* operator[](size_t i) const;
const_iterator begin() const;
const_iterator end() const;
iterator begin();
iterator end();
- SvListEntry* front();
- SvListEntry* back();
+ SvTreeListEntry* front();
+ SvTreeListEntry* back();
};
class SvListView;
@@ -167,8 +167,8 @@ enum SvSortMode { SortAscending, SortDescending, SortNone };
// ( Compare(a,b) ==> b.Compare(a) ==> strcmp(a,b) )
struct SvSortData
{
- SvListEntry* pLeft;
- SvListEntry* pRight;
+ SvTreeListEntry* pLeft;
+ SvTreeListEntry* pRight;
};
class SVT_DLLPUBLIC SvTreeList
@@ -188,35 +188,35 @@ class SVT_DLLPUBLIC SvTreeList
sal_Bool bAbsPositionsValid;
- SvListEntry* FirstVisible() const { return First(); }
- SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const;
- SvListEntry* NextVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
- SvListEntry* PrevVisible( const SvListView*,SvListEntry* pEntry, sal_uInt16& rDelta ) const;
+ SvTreeListEntry* FirstVisible() const { return First(); }
+ SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
+ SvTreeListEntry* LastVisible( const SvListView*,sal_uInt16* pDepth=0 ) const;
+ SvTreeListEntry* NextVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const;
+ SvTreeListEntry* PrevVisible( const SvListView*,SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const;
- sal_Bool IsEntryVisible( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const;
- sal_uLong GetVisiblePos( const SvListView*,SvListEntry* pEntry ) const;
+ sal_Bool IsEntryVisible( const SvListView*,SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* GetEntryAtVisPos( const SvListView*,sal_uLong nVisPos ) const;
+ sal_uLong GetVisiblePos( const SvListView*,SvTreeListEntry* pEntry ) const;
sal_uLong GetVisibleCount( SvListView* ) const;
- sal_uLong GetVisibleChildCount( const SvListView*,SvListEntry* pParent ) const;
+ sal_uLong GetVisibleChildCount( const SvListView*,SvTreeListEntry* pParent ) const;
- SvListEntry* FirstSelected( const SvListView*) const;
- SvListEntry* NextSelected( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* PrevSelected( const SvListView*,SvListEntry* pEntry ) const;
- SvListEntry* LastSelected( const SvListView*) const;
+ SvTreeListEntry* FirstSelected( const SvListView*) const;
+ SvTreeListEntry* NextSelected( const SvListView*,SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* PrevSelected( const SvListView*,SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* LastSelected( const SvListView*) const;
- sal_Bool Select( SvListView*,SvListEntry* pEntry, sal_Bool bSelect=sal_True );
+ sal_Bool Select( SvListView*,SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
void SelectAll( SvListView*,sal_Bool bSelect ); // ruft nicht Select-Hdl
- sal_uLong GetChildSelectionCount( const SvListView*,SvListEntry* pParent ) const;
+ sal_uLong GetChildSelectionCount( const SvListView*,SvTreeListEntry* pParent ) const;
- void Expand( SvListView*,SvListEntry* pParent );
- void Collapse( SvListView*,SvListEntry* pParent );
+ void Expand( SvListView*,SvTreeListEntry* pParent );
+ void Collapse( SvListView*,SvTreeListEntry* pParent );
SVT_DLLPRIVATE void SetAbsolutePositions();
SVT_DLLPRIVATE SvTreeEntryList*CloneChildren(
SvTreeEntryList* pChildren,
- SvListEntry* pNewParent,
+ SvTreeListEntry* pNewParent,
sal_uLong& nCloneCount
) const;
@@ -224,15 +224,15 @@ class SVT_DLLPUBLIC SvTreeList
// rPos wird bei SortModeNone nicht geaendert
SVT_DLLPRIVATE void GetInsertionPos(
- SvListEntry* pEntry,
- SvListEntry* pParent,
+ SvTreeListEntry* pEntry,
+ SvTreeListEntry* pParent,
sal_uLong& rPos
);
- SVT_DLLPRIVATE void ResortChildren( SvListEntry* pParent );
+ SVT_DLLPRIVATE void ResortChildren( SvTreeListEntry* pParent );
protected:
- SvListEntry* pRootItem;
+ SvTreeListEntry* pRootItem;
public:
@@ -249,85 +249,85 @@ public:
void Broadcast(
sal_uInt16 nActionId,
- SvListEntry* pEntry1=0,
- SvListEntry* pEntry2=0,
+ SvTreeListEntry* pEntry1=0,
+ SvTreeListEntry* pEntry2=0,
sal_uLong nPos=0
);
// informiert alle Listener
- void InvalidateEntry( SvListEntry* );
+ void InvalidateEntry( SvTreeListEntry* );
sal_uLong GetEntryCount() const { return nEntryCount; }
- SvListEntry* First() const;
- SvListEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvListEntry* Last() const;
-
- SvListEntry* FirstChild( SvListEntry* pParent ) const;
- SvListEntry* NextSibling( SvListEntry* pEntry ) const;
- SvListEntry* PrevSibling( SvListEntry* pEntry ) const;
- SvListEntry* LastSibling( SvListEntry* pEntry ) const;
-
- sal_uLong Insert( SvListEntry* pEntry,SvListEntry* pPar,sal_uLong nPos=ULONG_MAX);
- sal_uLong Insert( SvListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
+ 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* FirstChild( SvTreeListEntry* pParent ) const;
+ SvTreeListEntry* NextSibling( SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* PrevSibling( SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* LastSibling( SvTreeListEntry* pEntry ) const;
+
+ sal_uLong Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pPar,sal_uLong nPos=ULONG_MAX);
+ sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = ULONG_MAX )
{ return Insert(pEntry, pRootItem, nRootPos ); }
- void InsertTree( SvListEntry* pTree, SvListEntry* pTargetParent, sal_uLong nListPos );
+ void InsertTree( SvTreeListEntry* pTree, SvTreeListEntry* pTargetParent, sal_uLong nListPos );
// Entries muessen im gleichen Model stehen!
- void Move( SvListEntry* pSource, SvListEntry* pTarget );
+ void Move( SvTreeListEntry* pSource, SvTreeListEntry* pTarget );
// erzeugt ggf. Child-List
- sal_uLong Move( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
- void Copy( SvListEntry* pSource, SvListEntry* pTarget );
- sal_uLong Copy( SvListEntry* pSource, SvListEntry* pTargetParent, sal_uLong nListPos);
+ sal_uLong Move( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos);
+ void Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTarget );
+ sal_uLong Copy( SvTreeListEntry* pSource, SvTreeListEntry* pTargetParent, sal_uLong nListPos);
- sal_Bool Remove( SvListEntry* pEntry );
+ sal_Bool Remove( SvTreeListEntry* pEntry );
void Clear();
- sal_Bool HasChildren( SvListEntry* pEntry ) const;
- sal_Bool HasParent( SvListEntry* pEntry ) const
+ sal_Bool HasChildren( SvTreeListEntry* pEntry ) const;
+ sal_Bool HasParent( SvTreeListEntry* pEntry ) const
{ return (sal_Bool)(pEntry->pParent!=pRootItem); }
- bool IsChild(const SvListEntry* pParent, const SvListEntry* pChild) const;
- SvListEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const;
- SvListEntry* GetEntry( sal_uLong nRootPos ) const;
- SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
- SvListEntry* GetParent( SvListEntry* pEntry ) const;
- SvListEntry* GetRootLevelParent( SvListEntry* pEntry ) const;
- SvTreeEntryList* GetChildList( SvListEntry* pParent ) const;
+ bool IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const;
+ SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const;
+ SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const;
+ SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
+ SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const;
+ SvTreeListEntry* GetRootLevelParent( SvTreeListEntry* pEntry ) const;
+ SvTreeEntryList* GetChildList( SvTreeListEntry* pParent ) const;
- sal_uLong GetAbsPos( SvListEntry* pEntry ) const;
- sal_uLong GetRelPos( SvListEntry* pChild ) const
+ sal_uLong GetAbsPos( SvTreeListEntry* pEntry ) const;
+ sal_uLong GetRelPos( SvTreeListEntry* pChild ) const
{ return pChild->GetChildListPos(); }
- sal_uLong GetChildCount( SvListEntry* pParent ) const;
- sal_uInt16 GetDepth( SvListEntry* pEntry ) const;
- sal_Bool IsAtRootDepth( SvListEntry* pEntry ) const
+ sal_uLong GetChildCount( SvTreeListEntry* pParent ) const;
+ sal_uInt16 GetDepth( SvTreeListEntry* pEntry ) const;
+ sal_Bool IsAtRootDepth( SvTreeListEntry* pEntry ) const
{ return (sal_Bool)(pEntry->pParent==pRootItem); }
// das Model ruft zum Clonen von Entries den Clone-Link auf,
// damit man sich nicht vom Model ableiten muss, wenn man
- // sich von SvListEntry ableitet.
+ // sich von SvTreeListEntry ableitet.
// Deklaration des Clone-Handlers:
- // DECL_LINK(CloneHdl,SvListEntry*);
- // der Handler muss einen SvListEntry* zurueckgeben
- SvListEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const;
+ // DECL_LINK(CloneHdl,SvTreeListEntry*);
+ // der Handler muss einen SvTreeListEntry* zurueckgeben
+ SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
void SetCloneLink( const Link& rLink )
{ aCloneLink=rLink; }
const Link& GetCloneLink() const
{ return aCloneLink; }
- virtual SvListEntry* CloneEntry( SvListEntry* ) const; // ruft den Clone-Link
- virtual SvListEntry* CreateEntry() const; // zum 'new'en von Entries
+ virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* ) const; // ruft den Clone-Link
+ virtual SvTreeListEntry* CreateEntry() const; // zum 'new'en von Entries
sal_uInt16 GetRefCount() const { return nRefCount; }
void SetRefCount( sal_uInt16 nRef ) { nRefCount = nRef; }
void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
SvSortMode GetSortMode() const { return eSortMode; }
- virtual StringCompare Compare( SvListEntry*, SvListEntry* ) const;
+ virtual StringCompare Compare( SvTreeListEntry*, SvTreeListEntry* ) const;
void SetCompareHdl( const Link& rLink ) { aCompareLink = rLink; }
const Link& GetCompareHdl() const { return aCompareLink; }
void Resort();
@@ -339,23 +339,23 @@ class SVT_DLLPUBLIC SvListView
{
friend class SvTreeList;
- typedef boost::ptr_map<SvListEntry*, SvViewData> SvDataTable;
+ typedef boost::ptr_map<SvTreeListEntry*, SvViewData> SvDataTable;
sal_uLong nVisibleCount;
sal_uLong nSelectionCount;
sal_Bool bVisPositionsValid;
SVT_DLLPRIVATE void InitTable();
- SVT_DLLPRIVATE void RemoveViewData( SvListEntry* pParent );
+ SVT_DLLPRIVATE void RemoveViewData( SvTreeListEntry* pParent );
- SvDataTable maDataTable; // Mapping SvListEntry -> ViewData
+ SvDataTable maDataTable; // Mapping SvTreeListEntry -> ViewData
- void ActionMoving( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
- void ActionMoved( SvListEntry* pEntry,SvListEntry* pTargetPrnt,sal_uLong nChildPos);
- void ActionInserted( SvListEntry* pEntry );
- void ActionInsertedTree( SvListEntry* pEntry );
- void ActionRemoving( SvListEntry* pEntry );
- void ActionRemoved( SvListEntry* pEntry );
+ void ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry* pTargetPrnt,sal_uLong nChildPos);
+ void ActionMoved( SvTreeListEntry* pEntry,SvTreeListEntry* pTargetPrnt,sal_uLong nChildPos);
+ void ActionInserted( SvTreeListEntry* pEntry );
+ void ActionInsertedTree( SvTreeListEntry* pEntry );
+ void ActionRemoving( SvTreeListEntry* pEntry );
+ void ActionRemoved( SvTreeListEntry* pEntry );
void ActionClear();
protected:
@@ -369,107 +369,107 @@ public:
virtual void SetModel( SvTreeList* );
virtual void ModelNotification(
sal_uInt16 nActionId,
- SvListEntry* pEntry1,
- SvListEntry* pEntry2,
+ SvTreeListEntry* pEntry1,
+ SvTreeListEntry* pEntry2,
sal_uLong nPos
);
sal_uLong GetVisibleCount() const
{ return pModel->GetVisibleCount( (SvListView*)this ); }
- SvListEntry* FirstVisible() const
+ SvTreeListEntry* FirstVisible() const
{ return pModel->FirstVisible(); }
- SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const
+ SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const
{ return pModel->NextVisible(this,pEntry,pDepth); }
- SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const
+ SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const
{ return pModel->PrevVisible(this,pEntry,pDepth); }
- SvListEntry* LastVisible( sal_uInt16* pDepth=0 ) const
+ SvTreeListEntry* LastVisible( sal_uInt16* pDepth=0 ) const
{ return pModel->LastVisible(this,pDepth); }
- SvListEntry* NextVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const
+ SvTreeListEntry* NextVisible( SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const
{ return pModel->NextVisible(this,pEntry,rDelta); }
- SvListEntry* PrevVisible( SvListEntry* pEntry, sal_uInt16& rDelta ) const
+ SvTreeListEntry* PrevVisible( SvTreeListEntry* pEntry, sal_uInt16& rDelta ) const
{ return pModel->PrevVisible(this,pEntry,rDelta); }
sal_uLong GetSelectionCount() const
{ return nSelectionCount; }
- SvListEntry* FirstSelected() const
+ SvTreeListEntry* FirstSelected() const
{ return pModel->FirstSelected(this); }
- SvListEntry* NextSelected( SvListEntry* pEntry ) const
+ SvTreeListEntry* NextSelected( SvTreeListEntry* pEntry ) const
{ return pModel->NextSelected(this,pEntry); }
- SvListEntry* PrevSelected( SvListEntry* pEntry ) const
+ SvTreeListEntry* PrevSelected( SvTreeListEntry* pEntry ) const
{ return pModel->PrevSelected(this,pEntry); }
- SvListEntry* LastSelected() const
+ SvTreeListEntry* LastSelected() const
{ return pModel->LastSelected(this); }
- SvListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const
+ SvTreeListEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const
{ return pModel->GetEntryAtAbsPos(nAbsPos); }
- SvListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const
+ SvTreeListEntry* GetEntryAtVisPos( sal_uLong nVisPos ) const
{ return pModel->GetEntryAtVisPos((SvListView*)this,nVisPos); }
- sal_uLong GetAbsPos( SvListEntry* pEntry ) const
+ sal_uLong GetAbsPos( SvTreeListEntry* pEntry ) const
{ return pModel->GetAbsPos(pEntry); }
- sal_uLong GetVisiblePos( SvListEntry* pEntry ) const
+ sal_uLong GetVisiblePos( SvTreeListEntry* pEntry ) const
{ return pModel->GetVisiblePos((SvListView*)this,pEntry); }
- sal_uLong GetVisibleChildCount(SvListEntry* pParent ) const
+ sal_uLong GetVisibleChildCount(SvTreeListEntry* pParent ) const
{ return pModel->GetVisibleChildCount((SvListView*)this,pParent); }
- sal_uLong GetChildSelectionCount( SvListEntry* pParent ) const
+ sal_uLong GetChildSelectionCount( SvTreeListEntry* pParent ) const
{ return pModel->GetChildSelectionCount((SvListView*)this,pParent); }
- void Expand( SvListEntry* pParent )
+ void Expand( SvTreeListEntry* pParent )
{ pModel->Expand((SvListView*)this,pParent); }
- void Collapse( SvListEntry* pParent )
+ void Collapse( SvTreeListEntry* pParent )
{ pModel->Collapse((SvListView*)this,pParent); }
- sal_Bool Select( SvListEntry* pEntry, sal_Bool bSelect=sal_True )
+ sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True )
{ return pModel->Select((SvListView*)this,pEntry,bSelect); }
// ruft nicht Select-Hdl
virtual void SelectAll( sal_Bool bSelect, sal_Bool )
{ pModel->SelectAll((SvListView*)this, bSelect); }
- sal_Bool IsEntryVisible( SvListEntry* pEntry ) const
+ sal_Bool IsEntryVisible( SvTreeListEntry* pEntry ) const
{ return pModel->IsEntryVisible((SvListView*)this,pEntry); }
- sal_Bool IsExpanded( SvListEntry* pEntry ) const;
- sal_Bool IsSelected( SvListEntry* pEntry ) const;
- sal_Bool HasEntryFocus( SvListEntry* pEntry ) const;
- void SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus );
- const SvViewData* GetViewData( SvListEntry* pEntry ) const;
- SvViewData* GetViewData( SvListEntry* pEntry );
+ sal_Bool IsExpanded( SvTreeListEntry* pEntry ) const;
+ sal_Bool IsSelected( SvTreeListEntry* pEntry ) const;
+ sal_Bool HasEntryFocus( SvTreeListEntry* pEntry ) const;
+ void SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus );
+ const SvViewData* GetViewData( SvTreeListEntry* pEntry ) const;
+ SvViewData* GetViewData( SvTreeListEntry* pEntry );
sal_Bool HasViewData() const
{ return maDataTable.size() > 1; } // eine ROOT gibts immer
- virtual SvViewData* CreateViewData( SvListEntry* pEntry );
- virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
+ virtual SvViewData* CreateViewData( SvTreeListEntry* pEntry );
+ virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry );
virtual void ModelHasCleared();
- virtual void ModelHasInserted( SvListEntry* pEntry );
- virtual void ModelHasInsertedTree( SvListEntry* pEntry );
+ virtual void ModelHasInserted( SvTreeListEntry* pEntry );
+ virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry );
virtual void ModelIsMoving(
- SvListEntry* pSource,
- SvListEntry* pTargetParent,
+ SvTreeListEntry* pSource,
+ SvTreeListEntry* pTargetParent,
sal_uLong nPos
);
- virtual void ModelHasMoved( SvListEntry* pSource );
- virtual void ModelIsRemoving( SvListEntry* pEntry );
- virtual void ModelHasRemoved( SvListEntry* pEntry );
- virtual void ModelHasEntryInvalidated( SvListEntry* pEntry );
+ virtual void ModelHasMoved( SvTreeListEntry* pSource );
+ virtual void ModelIsRemoving( SvTreeListEntry* pEntry );
+ virtual void ModelHasRemoved( SvTreeListEntry* pEntry );
+ virtual void ModelHasEntryInvalidated( SvTreeListEntry* pEntry );
};
-inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const
+inline sal_Bool SvListView::IsExpanded( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvDataTable::const_iterator itr = maDataTable.find(pEntry);
@@ -477,7 +477,7 @@ inline sal_Bool SvListView::IsExpanded( SvListEntry* pEntry ) const
return itr->second->IsExpanded();
}
-inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
+inline sal_Bool SvListView::IsSelected( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvDataTable::const_iterator itr = maDataTable.find(pEntry );
@@ -485,7 +485,7 @@ inline sal_Bool SvListView::IsSelected( SvListEntry* pEntry ) const
return itr->second->IsSelected();
}
-inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
+inline sal_Bool SvListView::HasEntryFocus( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"IsExpanded:No Entry");
SvDataTable::const_iterator itr = maDataTable.find(pEntry );
@@ -493,7 +493,7 @@ inline sal_Bool SvListView::HasEntryFocus( SvListEntry* pEntry ) const
return itr->second->HasFocus();
}
-inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus )
+inline void SvListView::SetEntryFocus( SvTreeListEntry* pEntry, sal_Bool bFocus )
{
DBG_ASSERT(pEntry,"SetEntryFocus:No Entry");
SvDataTable::iterator itr = maDataTable.find(pEntry);
@@ -501,7 +501,7 @@ inline void SvListView::SetEntryFocus( SvListEntry* pEntry, sal_Bool bFocus )
itr->second->SetFocus(bFocus);
}
-inline const SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const
+inline const SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry ) const
{
#ifndef DBG_UTIL
return maDataTable.find( pEntry )->second;
@@ -512,7 +512,7 @@ inline const SvViewData* SvListView::GetViewData( SvListEntry* pEntry ) const
#endif
}
-inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry )
+inline SvViewData* SvListView::GetViewData( SvTreeListEntry* pEntry )
{
#ifndef DBG_UTIL
return maDataTable.find( pEntry )->second;
@@ -523,40 +523,40 @@ inline SvViewData* SvListView::GetViewData( SvListEntry* pEntry )
#endif
}
-inline sal_Bool SvTreeList::HasChildren( SvListEntry* pEntry ) const
+inline sal_Bool SvTreeList::HasChildren( SvTreeListEntry* pEntry ) const
{
if ( !pEntry )
pEntry = pRootItem;
return (sal_Bool)(pEntry->pChildren != 0);
}
-inline SvListEntry* SvTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const
+inline SvTreeListEntry* SvTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const
{ if ( !pParent )
pParent = pRootItem;
- SvListEntry* pRet = 0;
+ SvTreeListEntry* pRet = 0;
if ( pParent->pChildren )
pRet = (*pParent->pChildren)[ nPos ];
return pRet;
}
-inline SvListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const
+inline SvTreeListEntry* SvTreeList::GetEntry( sal_uLong nRootPos ) const
{
- SvListEntry* pRet = 0;
+ SvTreeListEntry* pRet = 0;
if ( nEntryCount )
pRet = (*pRootItem->pChildren)[ nRootPos ];
return pRet;
}
-inline SvTreeEntryList* SvTreeList::GetChildList( SvListEntry* pParent ) const
+inline SvTreeEntryList* SvTreeList::GetChildList( SvTreeListEntry* pParent ) const
{
if ( !pParent )
pParent = pRootItem;
return pParent->pChildren;
}
-inline SvListEntry* SvTreeList::GetParent( SvListEntry* pEntry ) const
+inline SvTreeListEntry* SvTreeList::GetParent( SvTreeListEntry* pEntry ) const
{
- SvListEntry* pParent = pEntry->pParent;
+ SvTreeListEntry* pParent = pEntry->pParent;
if ( pParent==pRootItem )
pParent = 0;
return pParent;
diff --git a/svtools/inc/svtools/treelistbox.hxx b/svtools/inc/svtools/treelistbox.hxx
index bb97ed743965..ceb7497cac2c 100644
--- a/svtools/inc/svtools/treelistbox.hxx
+++ b/svtools/inc/svtools/treelistbox.hxx
@@ -48,7 +48,7 @@
class Application;
class SvTreeListBox;
-class SvLBoxEntry;
+class SvTreeListEntry;
class SvViewDataItem;
class SvViewDataEntry;
class SvInplaceEdit2;
@@ -174,11 +174,11 @@ public:
class SVT_DLLPUBLIC SvLBoxItem
{
public:
- SvLBoxItem( SvLBoxEntry*, sal_uInt16 nFlags );
+ SvLBoxItem( SvTreeListEntry*, sal_uInt16 nFlags );
SvLBoxItem();
virtual ~SvLBoxItem();
virtual sal_uInt16 IsA() = 0;
- const Size& GetSize( SvTreeListBox* pView, SvLBoxEntry* pEntry );
+ const Size& GetSize( SvTreeListBox* pView, SvTreeListEntry* pEntry );
const Size& GetSize( SvViewDataEntry* pData, sal_uInt16 nItemPos )
{
SvViewDataItem* pIData=pData->pItemData+nItemPos;
@@ -187,9 +187,9 @@ public:
virtual void Paint( const Point& rPos, SvTreeListBox& rOutDev,
sal_uInt16 nViewDataEntryFlags,
- SvLBoxEntry* pEntry ) = 0;
+ SvTreeListEntry* pEntry ) = 0;
- virtual void InitViewData( SvTreeListBox* pView, SvLBoxEntry* pEntry,
+ virtual void InitViewData( SvTreeListBox* pView, SvTreeListEntry* pEntry,
// wenn != 0 muss dieser Pointer benutzt werden!
// wenn == 0 muss er ueber die View geholt werden
SvViewDataItem* pViewData = 0) = 0;
@@ -201,19 +201,19 @@ public:
class SVT_DLLPUBLIC SvLBoxTreeList : public SvTreeList
{
public:
- SvLBoxEntry* First() const;
- SvLBoxEntry* Next( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvLBoxEntry* Prev( SvListEntry* pEntry, sal_uInt16* pDepth=0 ) const;
- SvLBoxEntry* Last() const;
- SvLBoxEntry* Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const;
- SvLBoxEntry* GetEntry( SvListEntry* pParent, sal_uLong nPos ) const;
- SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const;
- SvLBoxEntry* GetParent( SvListEntry* pEntry ) const;
- SvLBoxEntry* FirstChild( SvLBoxEntry* pParent ) const;
- SvLBoxEntry* NextSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* PrevSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* LastSibling( SvLBoxEntry* pEntry ) const;
- SvLBoxEntry* GetEntryAtAbsPos( sal_uLong nAbsPos ) const;
+ 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;
};
// *********************************************************************
@@ -281,7 +281,7 @@ class SVT_DLLPUBLIC SvTreeListBox
long mnCheckboxItemWidth;
- SvLBoxEntry* pHdlEntry;
+ SvTreeListEntry* pHdlEntry;
SvLBoxItem* pHdlItem;
DragDropMode nDragDropMode;
@@ -289,12 +289,12 @@ class SVT_DLLPUBLIC SvTreeListBox
SelectionMode eSelMode;
sal_Int8 nDragOptions;
- SvLBoxEntry* pEdEntry;
+ SvTreeListEntry* pEdEntry;
SvLBoxItem* pEdItem;
protected:
Link aDoubleClickHdl;
- SvLBoxEntry* pTargetEntry;
+ SvTreeListEntry* pTargetEntry;
SvLBoxButtonData* pCheckButtonData;
std::vector<SvLBoxTab*> aTabs;
sal_uInt16 nTreeFlags;
@@ -308,7 +308,7 @@ private:
DECL_DLLPRIVATE_LINK( CheckButtonClick, SvLBoxButtonData * );
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * );
// Handler, der von TreeList zum Clonen eines Entries aufgerufen wird
- DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvListEntry* );
+ DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvTreeListEntry* );
// handler and methods for Drag - finished handler.
// The with get GetDragFinishedHdl() get link can set on the
@@ -323,13 +323,13 @@ private:
protected:
sal_Bool CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 );
- void ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow);
+ void ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow);
void EnableSelectionAsDropTarget( sal_Bool bEnable = sal_True,
sal_Bool bWithChildren = sal_True );
// standard impl gibt 0 zurueck; muss von abgeleiteten Klassen, die
// D&D unterstuetzen, ueberladen werden
using Window::GetDropTarget;
- virtual SvLBoxEntry* GetDropTarget( const Point& );
+ virtual SvTreeListEntry* GetDropTarget( const Point& );
// view-spezifische Daten in den Dragserver stellen
// wird an der Source-View aufgerufen (im BeginDrag-Handler)
@@ -340,8 +340,8 @@ protected:
// invalidate children on enable/disable
virtual void StateChanged( StateChangedType eType );
- virtual sal_uLong Insert( SvLBoxEntry* pEnt,SvLBoxEntry* pPar,sal_uLong nPos=LIST_APPEND);
- virtual sal_uLong Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos = LIST_APPEND );
+ virtual sal_uLong Insert( SvTreeListEntry* pEnt,SvTreeListEntry* pPar,sal_uLong nPos=LIST_APPEND);
+ virtual sal_uLong Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos = LIST_APPEND );
// Inplace-Editing
SvInplaceEdit2* pEdCtrl;
@@ -353,14 +353,14 @@ protected:
bool IsEmptyTextAllowed() const;
// Rueckgabewert muss von SvViewDataEntry abgeleitet sein!
- virtual SvViewData* CreateViewData( SvListEntry* );
+ virtual SvViewData* CreateViewData( SvTreeListEntry* );
// InitViewData wird direkt nach CreateViewData aufgerufen
// In InitViewData ist der Entry noch nicht in die View eingefuegt!
- virtual void InitViewData( SvViewData*, SvListEntry* pEntry );
+ virtual void InitViewData( SvViewData*, SvTreeListEntry* pEntry );
// ruft fuer Items aller Entries InitViewData auf
void RecalcViewData();
// Callback von RecalcViewData
- virtual void ViewDataInitialized( SvLBoxEntry* );
+ virtual void ViewDataInitialized( SvTreeListEntry* );
// handler and methods for Drag - finished handler. This link can be set
// to the TransferDataContainer. The AddBox/RemoveBox methods must be
@@ -398,47 +398,40 @@ public:
sal_uInt16 IsA();
sal_uLong GetEntryCount() const {return pModel->GetEntryCount();}
- SvLBoxEntry* First() const { return (SvLBoxEntry*)(pModel->First()); }
- SvLBoxEntry* Next( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Next(pEntry,pDepth));}
- SvLBoxEntry* Prev( SvLBoxEntry* pEntry, sal_uInt16* pDepth=0 ) const { return (SvLBoxEntry*)(pModel->Prev(pEntry,pDepth));}
- SvLBoxEntry* Last() const { return (SvLBoxEntry*)(pModel->Last()); }
-
- SvLBoxEntry* FirstChild(SvLBoxEntry* pParent ) const { return (SvLBoxEntry*)(pModel->FirstChild(pParent)); }
- SvLBoxEntry* NextSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->NextSibling( pEntry )); }
- SvLBoxEntry* PrevSibling(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->PrevSibling( pEntry )); }
-
- SvLBoxEntry* FirstSelected() const { return (SvLBoxEntry*)SvListView::FirstSelected(); }
- using SvListView::NextSelected;
- SvLBoxEntry* NextSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::NextSelected(pEntry)); }
- using SvListView::PrevSelected;
- SvLBoxEntry* PrevSelected( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(SvListView::PrevSelected(pEntry)); }
- SvLBoxEntry* LastSelected() const { return (SvLBoxEntry*)(SvListView::LastSelected()); }
-
- sal_Bool CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget );
- sal_Bool MoveSelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget );
- sal_Bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback );
+ SvTreeListEntry* First() const { return (SvTreeListEntry*)(pModel->First()); }
+ SvTreeListEntry* Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->Next(pEntry,pDepth); }
+ SvTreeListEntry* Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth=0 ) const { return pModel->Prev(pEntry,pDepth); }
+ SvTreeListEntry* Last() const { return pModel->Last(); }
+
+ SvTreeListEntry* FirstChild(SvTreeListEntry* pParent ) const { return pModel->FirstChild(pParent); }
+ SvTreeListEntry* NextSibling(SvTreeListEntry* pEntry ) const { return pModel->NextSibling(pEntry); }
+ SvTreeListEntry* PrevSibling(SvTreeListEntry* pEntry ) const { return pModel->PrevSibling(pEntry); }
+
+ sal_Bool CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget );
+ sal_Bool MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget );
+ sal_Bool MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback );
void RemoveSelection();
DragDropMode GetDragDropMode() const { return nDragDropMode; }
SelectionMode GetSelectionMode() const { return eSelMode; }
// pParent==0 -> Root-Ebene
- SvLBoxEntry* GetEntry( SvLBoxEntry* pParent, sal_uLong nPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(pParent,nPos)); }
- SvLBoxEntry* GetEntry( sal_uLong nRootPos ) const { return (SvLBoxEntry*)(pModel->GetEntry(nRootPos)); }
+ SvTreeListEntry* GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const { return pModel->GetEntry(pParent, nPos); }
+ SvTreeListEntry* GetEntry( sal_uLong nRootPos ) const { return pModel->GetEntry(nRootPos); }
- SvLBoxEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const;
- void FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const;
+ SvTreeListEntry* GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const;
+ void FillEntryPath( SvTreeListEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const;
using Window::GetParent;
- SvLBoxEntry* GetParent( SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetParent(pEntry)); }
- SvLBoxEntry* GetRootLevelParent(SvLBoxEntry* pEntry ) const { return (SvLBoxEntry*)(pModel->GetRootLevelParent( pEntry ));}
+ SvTreeListEntry* GetParent( SvTreeListEntry* pEntry ) const { return pModel->GetParent(pEntry); }
+ SvTreeListEntry* GetRootLevelParent(SvTreeListEntry* pEntry ) const { return pModel->GetRootLevelParent(pEntry);}
using Window::GetChildCount;
- sal_uLong GetChildCount( SvLBoxEntry* pParent ) const { return pModel->GetChildCount(pParent); }
- sal_uLong GetLevelChildCount( SvLBoxEntry* pParent ) const;
+ sal_uLong GetChildCount( SvTreeListEntry* pParent ) const { return pModel->GetChildCount(pParent); }
+ sal_uLong GetLevelChildCount( SvTreeListEntry* pParent ) const;
- SvViewDataEntry* GetViewDataEntry( SvListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); }
- SvViewDataItem* GetViewDataItem( SvListEntry*, SvLBoxItem* ) const;
+ SvViewDataEntry* GetViewDataEntry( SvTreeListEntry* pEntry ) const { return (SvViewDataEntry*)SvListView::GetViewData(pEntry); }
+ SvViewDataItem* GetViewDataItem( SvTreeListEntry*, SvLBoxItem* ) const;
bool IsInplaceEditingEnabled() const { return ((nImpFlags & SVLBOX_EDT_ENABLED) != 0); }
bool IsEditingActive() const { return ((nImpFlags & SVLBOX_IN_EDT) != 0); }
@@ -498,12 +491,12 @@ public:
virtual void DeselectHdl();
virtual sal_Bool DoubleClickHdl();
sal_Bool IsTravelSelect() const { return (sal_Bool)((nImpFlags&SVLBOX_IS_TRAVELSELECT)!=0);}
- SvLBoxEntry* GetHdlEntry() const { return pHdlEntry; }
+ SvTreeListEntry* GetHdlEntry() const { return pHdlEntry; }
SvLBoxItem* GetHdlItem() const;
// wird aufgerufen, wenn ein Eintrag mit gesetztem
// ENTRYFLAG_CHILDREN_ON_DEMAND expandiert wird.
- virtual void RequestingChildren( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvTreeListEntry* pParent );
// Drag & Drop
@@ -512,33 +505,33 @@ public:
virtual sal_Int8 ExecuteDrop( const ExecuteDropEvent& rEvt );
virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel );
virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData,
- SvLBoxEntry* );
+ SvTreeListEntry* );
virtual void DragFinished( sal_Int8 nDropAction );
- virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* );
+ virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* );
void SetDragOptions( sal_Int8 nOptions ) { nDragOptions = nOptions; }
sal_Int8 GetDragOptions() const { return nDragOptions; }
SvTreeListBox* GetSourceView() const;
- virtual void NotifyRemoving( SvLBoxEntry* );
- virtual SvLBoxEntry* CloneEntry( SvLBoxEntry* pSource );
- virtual SvLBoxEntry* CreateEntry() const; // zum 'new'en von Entries
+ virtual void NotifyRemoving( SvTreeListEntry* );
+ virtual SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource );
+ virtual SvTreeListEntry* CreateEntry() const; // zum 'new'en von Entries
// Rueckgabe: sal_True==Ok, sal_False==Abbrechen
virtual sal_Bool NotifyMoving(
- SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel()
- SvLBoxEntry* pEntry, // Zu verschiebender Entry aus
+ SvTreeListEntry* pTarget, // D&D-Drop-Position in this->GetModel()
+ SvTreeListEntry* pEntry, // Zu verschiebender Entry aus
// GetSourceListBox()->GetModel()
- SvLBoxEntry*& rpNewParent, // Neuer Target-Parent
+ SvTreeListEntry*& rpNewParent, // Neuer Target-Parent
sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents
// Rueckgabe: sal_True==Ok, sal_False==Abbrechen
virtual sal_Bool NotifyCopying(
- SvLBoxEntry* pTarget, // D&D-Drop-Position in this->GetModel()
- SvLBoxEntry* pEntry, // Zu kopierender Entry aus
+ SvTreeListEntry* pTarget, // D&D-Drop-Position in this->GetModel()
+ SvTreeListEntry* pEntry, // Zu kopierender Entry aus
// GetSourceListBox()->GetModel()
- SvLBoxEntry*& rpNewParent, // Neuer Target-Parent
+ SvTreeListEntry*& rpNewParent, // Neuer Target-Parent
sal_uLong& rNewChildPos); // Position in Childlist des Target-Parents
// ACCESSIBILITY ==========================================================
@@ -551,13 +544,13 @@ public:
virtual void FillAccessibleStateSet( ::utl::AccessibleStateSetHelper& rStateSet ) const;
/** Fills the StateSet of one entry. */
- virtual void FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const;
+ virtual void FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const;
/** Calculate and returns the bounding rectangle of an entry.
@param pEntry
The entry.
@return The bounding rectangle of an entry. */
- virtual Rectangle GetBoundingRect( SvLBoxEntry* pEntry );
+ virtual Rectangle GetBoundingRect( SvTreeListEntry* pEntry );
/** Enables, that one cell of a tablistbox entry can be focused */
void EnableCellFocus();
@@ -571,23 +564,23 @@ protected:
SVT_DLLPRIVATE short GetHeightOffset( const Image& rBmp, Size& rLogicSize);
SVT_DLLPRIVATE short GetHeightOffset( const Font& rFont, Size& rLogicSize);
- SVT_DLLPRIVATE void SetEntryHeight( SvLBoxEntry* pEntry );
+ SVT_DLLPRIVATE void SetEntryHeight( SvTreeListEntry* pEntry );
SVT_DLLPRIVATE void AdjustEntryHeight( const Image& rBmp );
SVT_DLLPRIVATE void AdjustEntryHeight( const Font& rFont );
- SVT_DLLPRIVATE void ImpEntryInserted( SvLBoxEntry* pEntry );
- SVT_DLLPRIVATE long PaintEntry1( SvLBoxEntry*, long nLine,
+ SVT_DLLPRIVATE void ImpEntryInserted( SvTreeListEntry* pEntry );
+ SVT_DLLPRIVATE long PaintEntry1( SvTreeListEntry*, long nLine,
sal_uInt16 nTabFlagMask=0xffff,
sal_Bool bHasClipRegion=sal_False );
SVT_DLLPRIVATE void InitTreeView();
- SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvLBoxEntry*, long nX, SvLBoxTab** ppTab,
+ SVT_DLLPRIVATE SvLBoxItem* GetItem_Impl( SvTreeListEntry*, long nX, SvLBoxTab** ppTab,
sal_uInt16 nEmptyWidth );
SVT_DLLPRIVATE void ImplInitStyle();
protected:
- void EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
+ void EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
const Selection& );
void EditedText( const XubString& );
@@ -603,10 +596,10 @@ protected:
SvLBoxTab* GetFirstDynamicTab( sal_uInt16& rTabPos ) const;
SvLBoxTab* GetFirstTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos );
SvLBoxTab* GetLastTab( sal_uInt16 nFlagMask, sal_uInt16& rTabPos );
- SvLBoxTab* GetTab( SvLBoxEntry*, SvLBoxItem* ) const;
+ SvLBoxTab* GetTab( SvTreeListEntry*, SvLBoxItem* ) const;
void ClearTabList();
- virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
+ virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind);
virtual void NotifyBeginScroll();
virtual void NotifyEndScroll();
@@ -622,13 +615,13 @@ protected:
// in das Control hineingezeichnet werden
virtual void NotifyInvalidating();
- virtual sal_uLong GetAscInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
- virtual sal_uLong GetDescInsertionPos( SvLBoxEntry*, SvLBoxEntry* pParent );
+ virtual sal_uLong GetAscInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent );
+ virtual sal_uLong GetDescInsertionPos( SvTreeListEntry*, SvTreeListEntry* pParent );
virtual void Command( const CommandEvent& rCEvt );
virtual void RequestHelp( const HelpEvent& rHEvt );
- virtual void CursorMoved( SvLBoxEntry* pNewCursor );
- virtual void PreparePaint( SvLBoxEntry* );
+ virtual void CursorMoved( SvTreeListEntry* pNewCursor );
+ virtual void PreparePaint( SvTreeListEntry* );
virtual void DataChanged( const DataChangedEvent& rDCEvt );
void InitSettings(sal_Bool bFont,sal_Bool bForeground,sal_Bool bBackground);
@@ -637,7 +630,7 @@ protected:
sal_uInt16 GetCurrentTabPos() const;
void CallImplEventListeners(sal_uLong nEvent, void* pData);
- void ImplEditEntry( SvLBoxEntry* pEntry );
+ void ImplEditEntry( SvTreeListEntry* pEntry );
sal_Bool AreChildrenTransient() const;
void SetChildrenNotTransient();
@@ -672,15 +665,15 @@ public:
);
}
- virtual SvLBoxEntry* InsertEntry( const XubString& rText, SvLBoxEntry* pParent = 0,
+ virtual SvTreeListEntry* InsertEntry( const XubString& rText, SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos=LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
- virtual SvLBoxEntry* InsertEntry( const XubString& rText,
+ virtual SvTreeListEntry* InsertEntry( const XubString& rText,
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent = 0,
+ SvTreeListEntry* pParent = 0,
sal_Bool bChildrenOnDemand = sal_False,
sal_uLong nPos = LIST_APPEND, void* pUserData = 0,
SvLBoxButtonKind eButtonKind = SvLBoxButtonKind_enabledCheckbox );
@@ -691,19 +684,19 @@ public:
void SetDefaultExpandedEntryBmp( const Image& rBmp );
void SetDefaultCollapsedEntryBmp( const Image& rBmp );
- void SetCheckButtonState( SvLBoxEntry*, SvButtonState );
- SvButtonState GetCheckButtonState( SvLBoxEntry* ) const;
+ void SetCheckButtonState( SvTreeListEntry*, SvButtonState );
+ SvButtonState GetCheckButtonState( SvTreeListEntry* ) const;
sal_Bool IsExpandBitmapOnCursor() const { return (sal_Bool)(aContextBmpMode & SVLISTENTRYFLAG_FOCUSED)!=0; }
- void SetEntryText(SvLBoxEntry*, const XubString& );
- void SetExpandedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
- void SetCollapsedEntryBmp( SvLBoxEntry* _pEntry, const Image& _rImage );
+ void SetEntryText(SvTreeListEntry*, const XubString& );
+ void SetExpandedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage );
+ void SetCollapsedEntryBmp( SvTreeListEntry* _pEntry, const Image& _rImage );
- virtual String GetEntryText( SvLBoxEntry* pEntry ) const;
- String SearchEntryText( SvLBoxEntry* pEntry ) const;
- const Image& GetExpandedEntryBmp(SvLBoxEntry* _pEntry ) const;
- const Image& GetCollapsedEntryBmp(SvLBoxEntry* _pEntry ) const;
+ virtual String GetEntryText( SvTreeListEntry* pEntry ) const;
+ String SearchEntryText( SvTreeListEntry* pEntry ) const;
+ const Image& GetExpandedEntryBmp(SvTreeListEntry* _pEntry ) const;
+ const Image& GetCollapsedEntryBmp(SvTreeListEntry* _pEntry ) const;
void SetCheckButtonHdl( const Link& rLink ) { aCheckButtonHdl=rLink; }
Link GetCheckButtonHdl() const { return aCheckButtonHdl; }
@@ -714,9 +707,9 @@ public:
void EnableInplaceEditing( bool bEnable );
// Editiert das erste StringItem des Entries, 0==Cursor
- void EditEntry( SvLBoxEntry* pEntry = NULL );
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
+ void EditEntry( SvTreeListEntry* pEntry = NULL );
+ virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
virtual void Paint( const Rectangle& rRect );
virtual void MouseButtonDown( const MouseEvent& rMEvt );
@@ -729,16 +722,16 @@ public:
void SetUpdateMode( sal_Bool );
virtual void ModelHasCleared();
- virtual void ModelHasInserted( SvListEntry* pEntry );
- virtual void ModelHasInsertedTree( SvListEntry* pEntry );
- virtual void ModelIsMoving(SvListEntry* pSource,
- SvListEntry* pTargetParent, sal_uLong nChildPos );
- virtual void ModelHasMoved(SvListEntry* pSource );
- virtual void ModelIsRemoving( SvListEntry* pEntry );
- virtual void ModelHasRemoved( SvListEntry* pEntry );
- void ModelHasEntryInvalidated( SvListEntry* pEntry );
-
- void ShowTargetEmphasis( SvLBoxEntry*, sal_Bool bShow );
+ virtual void ModelHasInserted( SvTreeListEntry* pEntry );
+ virtual void ModelHasInsertedTree( SvTreeListEntry* pEntry );
+ virtual void ModelIsMoving(SvTreeListEntry* pSource,
+ SvTreeListEntry* pTargetParent, sal_uLong nChildPos );
+ virtual void ModelHasMoved(SvTreeListEntry* pSource );
+ virtual void ModelIsRemoving( SvTreeListEntry* pEntry );
+ virtual void ModelHasRemoved( SvTreeListEntry* pEntry );
+ void ModelHasEntryInvalidated( SvTreeListEntry* pEntry );
+
+ void ShowTargetEmphasis( SvTreeListEntry*, sal_Bool bShow );
void ScrollOutputArea( short nDeltaEntries );
short GetEntryHeight() const { return nEntryHeight; }
@@ -748,10 +741,10 @@ public:
void SetIndent( short nIndent );
void SetSpaceBetweenEntries( short nSpace );
short GetSpaceBetweenEntries() const {return nEntryHeightOffs;}
- Point GetEntryPosition( SvLBoxEntry* ) const;
- void ShowEntry( SvLBoxEntry* ); // !!!OBSOLETE, use MakeVisible
- void MakeVisible( SvLBoxEntry* pEntry );
- void MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop );
+ Point GetEntryPosition( SvTreeListEntry* ) const;
+ void ShowEntry( SvTreeListEntry* ); // !!!OBSOLETE, use MakeVisible
+ void MakeVisible( SvTreeListEntry* pEntry );
+ void MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop );
void SetCollapsedNodeBmp( const Image& );
void SetExpandedNodeBmp( const Image& );
@@ -760,31 +753,31 @@ public:
void SetFont( const Font& rFont );
using Window::SetCursor;
- void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False );
+ void SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect = sal_False );
- SvLBoxEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const;
+ SvTreeListEntry* GetEntry( const Point& rPos, sal_Bool bHit = sal_False ) const;
- void PaintEntry( SvLBoxEntry* );
- long PaintEntry( SvLBoxEntry*, long nLine,
+ void PaintEntry( SvTreeListEntry* );
+ long PaintEntry( SvTreeListEntry*, long nLine,
sal_uInt16 nTabFlagMask=0xffff );
- virtual Rectangle GetFocusRect( SvLBoxEntry*, long nLine );
+ virtual Rectangle GetFocusRect( SvTreeListEntry*, long nLine );
// Beruecksichtigt Einrueckung
- virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* );
- void InvalidateEntry( SvLBoxEntry* );
- SvLBoxItem* GetItem( SvLBoxEntry*, long nX, SvLBoxTab** ppTab);
- SvLBoxItem* GetItem( SvLBoxEntry*, long nX );
+ virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* );
+ void InvalidateEntry( SvTreeListEntry* );
+ SvLBoxItem* GetItem( SvTreeListEntry*, long nX, SvLBoxTab** ppTab);
+ SvLBoxItem* GetItem( SvTreeListEntry*, long nX );
void SetDragDropMode( DragDropMode );
void SetSelectionMode( SelectionMode );
- sal_Bool Expand( SvLBoxEntry* pParent );
- sal_Bool Collapse( SvLBoxEntry* pParent );
- sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True );
- sal_uLong SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect );
+ sal_Bool Expand( SvTreeListEntry* pParent );
+ sal_Bool Collapse( SvTreeListEntry* pParent );
+ sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True );
+ sal_uLong SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect );
virtual void SelectAll( sal_Bool bSelect, sal_Bool bPaint = sal_True );
- void SetCurEntry( SvLBoxEntry* _pEntry );
- SvLBoxEntry* GetCurEntry() const;
+ void SetCurEntry( SvTreeListEntry* _pEntry );
+ SvTreeListEntry* GetCurEntry() const;
using Window::Invalidate;
virtual void Invalidate( sal_uInt16 nFlags = 0);
@@ -795,11 +788,11 @@ public:
virtual Region GetDragRegion() const;
// Children des Parents werden Children des naechstoberen Parents
- void RemoveParentKeepChildren( SvLBoxEntry* pParent );
+ void RemoveParentKeepChildren( SvTreeListEntry* pParent );
DECL_LINK( DefaultCompare, SvSortData* );
- virtual void ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos );
+ virtual void ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1,
+ SvTreeListEntry* pEntry2, sal_uLong nPos );
void EndSelection();
void RepaintScrollBars() const;
@@ -807,12 +800,12 @@ public:
ScrollBar* GetHScroll();
void EnableAsyncDrag( sal_Bool b );
- SvLBoxEntry* GetFirstEntryInView() const;
- SvLBoxEntry* GetNextEntryInView(SvLBoxEntry*) const;
- SvLBoxEntry* GetLastEntryInView() const;
+ SvTreeListEntry* GetFirstEntryInView() const;
+ SvTreeListEntry* GetNextEntryInView(SvTreeListEntry*) const;
+ SvTreeListEntry* GetLastEntryInView() const;
void ScrollToAbsPos( long nPos );
- void ShowFocusRect( const SvLBoxEntry* pEntry );
+ void ShowFocusRect( const SvTreeListEntry* pEntry );
void InitStartEntry();
virtual PopupMenu* CreateContextMenu( void );
@@ -830,7 +823,7 @@ struct SvLBoxDDInfo
{
Application* pApp;
SvTreeListBox* pSource;
- SvLBoxEntry* pDDStartEntry;
+ SvTreeListEntry* pDDStartEntry;
// relative Position im Eintrag bei Drag-Beginn (IconView)
long nMouseRelX,nMouseRelY;
sal_uLong nRes1,nRes2,nRes3,nRes4;
@@ -865,14 +858,14 @@ public:
void Hide();
};
-inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvListEntry* pEntry,
+inline SvViewDataItem* SvTreeListBox::GetViewDataItem( SvTreeListEntry* pEntry,
SvLBoxItem* pItem) const
{
SvViewDataEntry* pEntryData =
(SvViewDataEntry*)SvListView::GetViewData(pEntry);
DBG_ASSERT(pEntryData,"Entry not in View");
DBG_ASSERT(pEntryData->pItemData,"No ItemData");
- sal_uInt16 nItemPos = ((SvLBoxEntry*)pEntry)->GetPos( pItem );
+ sal_uInt16 nItemPos = ((SvTreeListEntry*)pEntry)->GetPos( pItem );
return (pEntryData->pItemData+nItemPos);
}
diff --git a/svtools/inc/svtools/treelistentry.hxx b/svtools/inc/svtools/treelistentry.hxx
index 16876aa811a5..d34f27454d9a 100644
--- a/svtools/inc/svtools/treelistentry.hxx
+++ b/svtools/inc/svtools/treelistentry.hxx
@@ -34,49 +34,6 @@
#include <vector>
-class SvTreeEntryList;
-class SvLBoxItem;
-
-class SVT_DLLPUBLIC SvListEntry
-{
-friend class SvTreeList;
-friend class SvListView;
-
-private:
- SvListEntry* pParent;
- SvTreeEntryList* pChildren;
- sal_uLong nAbsPos;
- sal_uLong nListPos;
-
- void SetListPositions();
- void InvalidateChildrensListPositions()
- {
- nListPos |= 0x80000000;
- }
-
-public:
- SvListEntry();
- SvListEntry( const SvListEntry& );
- virtual ~SvListEntry();
- sal_Bool HasChildren() { return (sal_Bool)(pChildren!=0); }
- sal_Bool HasChildListPos() const
- {
- if( pParent && !(pParent->nListPos & 0x80000000) )
- return sal_True;
- else return sal_False;
- }
-
- sal_uLong GetChildListPos() const
- {
- if( pParent && (pParent->nListPos & 0x80000000) )
- pParent->SetListPositions();
- return ( nListPos & 0x7fffffff );
- }
-
- virtual void Clone( SvListEntry* pSource );
-};
-
-
// Flags, die am Model haengen
#define SV_ENTRYFLAG_CHILDREN_ON_DEMAND 0x0001
#define SV_ENTRYFLAG_DISABLE_DROP 0x0002
@@ -89,37 +46,57 @@ public:
#define SV_ENTRYFLAG_USER_FLAGS 0xF000
#define SV_ENTRYFLAG_SEMITRANSPARENT 0x8000 // draw semi-transparent entry bitmaps
-class SVT_DLLPUBLIC SvLBoxEntry : public SvListEntry
+class SvTreeEntryList;
+class SvLBoxItem;
+
+class SVT_DLLPUBLIC SvTreeListEntry
{
+ friend class SvTreeList;
+ friend class SvListView;
friend class SvTreeListBox;
+ SvTreeListEntry* pParent;
+ SvTreeEntryList* pChildren;
+ sal_uLong nAbsPos;
+ sal_uLong nListPos;
std::vector<SvLBoxItem*> aItems;
void* pUserData;
sal_uInt16 nEntryFlags;
- SVT_DLLPRIVATE void DeleteItems_Impl();
+
+private:
+ SVT_DLLPRIVATE void SetListPositions();
+ SVT_DLLPRIVATE void InvalidateChildrensListPositions();
+ SVT_DLLPRIVATE void DeleteItems_Impl();
+
public:
+ SvTreeListEntry();
+ SvTreeListEntry(const SvTreeListEntry& r);
+ virtual ~SvTreeListEntry();
+
+ bool HasChildren() const;
+ bool HasChildListPos() const;
+ sal_uLong GetChildListPos() const;
+
+ void Clone(SvTreeListEntry* pSource);
- SvLBoxEntry();
- virtual ~SvLBoxEntry();
+ sal_uInt16 ItemCount() const;
- sal_uInt16 ItemCount() const { return (sal_uInt16)aItems.size(); }
// DARF NUR GERUFEN WERDEN, WENN DER EINTRAG NOCH NICHT IM MODEL
// EINGEFUEGT IST, DA SONST FUER DAS ITEM KEINE VIEW-ABHAENGIGEN
// DATEN ALLOZIERT WERDEN!
void AddItem( SvLBoxItem* pItem );
void ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos );
- SvLBoxItem* GetItem( sal_uInt16 nPos ) const { return aItems[nPos]; }
+ SvLBoxItem* GetItem( sal_uInt16 nPos ) const;
SvLBoxItem* GetFirstItem( sal_uInt16 nId );
sal_uInt16 GetPos( SvLBoxItem* pItem ) const;
- void* GetUserData() const { return pUserData; }
- void SetUserData( void* pPtr ) { pUserData = pPtr; }
- virtual void Clone( SvListEntry* pSource );
- void EnableChildrenOnDemand( sal_Bool bEnable=sal_True );
- sal_Bool HasChildrenOnDemand() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0); }
- sal_Bool HasInUseEmphasis() const { return (sal_Bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0); }
-
- sal_uInt16 GetFlags() const { return nEntryFlags; }
- void SetFlags( sal_uInt16 nFlags ) { nEntryFlags = nFlags; }
+ void* GetUserData() const;
+ void SetUserData( void* pPtr );
+ void EnableChildrenOnDemand( bool bEnable=true );
+ bool HasChildrenOnDemand() const;
+ bool HasInUseEmphasis() const;
+
+ sal_uInt16 GetFlags() const;
+ void SetFlags( sal_uInt16 nFlags );
};
#endif
diff --git a/svtools/source/contnr/fileview.cxx b/svtools/source/contnr/fileview.cxx
index 2087bb843649..7e9c8952feb6 100644
--- a/svtools/source/contnr/fileview.cxx
+++ b/svtools/source/contnr/fileview.cxx
@@ -206,7 +206,7 @@ public:
virtual void Resize();
virtual void KeyInput( const KeyEvent& rKEvt );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
void ClearAll();
HeaderBar* GetHeaderBar() const { return mpHeaderBar; }
@@ -808,7 +808,7 @@ PopupMenu* ViewTabListBox_Impl::CreateContextMenu( void )
if ( bEnableDelete || bEnableRename )
{
- SvLBoxEntry* pEntry = FirstSelected();
+ SvTreeListEntry* pEntry = FirstSelected();
while ( pEntry )
{
::ucbhelper::Content aCnt;
@@ -911,13 +911,13 @@ void ViewTabListBox_Impl::ClearAll()
void ViewTabListBox_Impl::DeleteEntries()
{
svtools::QueryDeleteResult_Impl eResult = svtools::QUERYDELETE_YES;
- SvLBoxEntry* pEntry = FirstSelected();
+ SvTreeListEntry* pEntry = FirstSelected();
String aURL;
rtl::OString sDialogPosition;
while ( pEntry && ( eResult != svtools::QUERYDELETE_CANCEL ) )
{
- SvLBoxEntry *pCurEntry = pEntry;
+ SvTreeListEntry *pCurEntry = pEntry;
pEntry = NextSelected( pEntry );
if ( pCurEntry->GetUserData() )
@@ -978,7 +978,7 @@ void ViewTabListBox_Impl::DeleteEntries()
}
// -----------------------------------------------------------------------
-sal_Bool ViewTabListBox_Impl::EditedEntry( SvLBoxEntry* pEntry,
+sal_Bool ViewTabListBox_Impl::EditedEntry( SvTreeListEntry* pEntry,
const rtl::OUString& rNewText )
{
sal_Bool bRet = sal_False;
@@ -1061,7 +1061,7 @@ void ViewTabListBox_Impl::DoQuickSearch( const xub_Unicode& rChar )
if ( bFound )
{
- SvLBoxEntry* pEntry = GetEntry( mnSearchIndex );
+ SvTreeListEntry* pEntry = GetEntry( mnSearchIndex );
if ( pEntry )
{
SelectAll( sal_False );
@@ -1099,7 +1099,7 @@ sal_Bool ViewTabListBox_Impl::DoubleClickHdl()
const sal_uInt16 nColumnCount = GetColumnCount();
if (nColumnCount > 0)
nRow = _nPos / nColumnCount;
- SvLBoxEntry* pEntry = GetEntry( nRow );
+ SvTreeListEntry* pEntry = GetEntry( nRow );
if ( pEntry )
{
SvtContentEntry* pData = (SvtContentEntry*)pEntry->GetUserData();
@@ -1204,7 +1204,7 @@ SvtFileView::~SvtFileView()
// -----------------------------------------------------------------------
-String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const
+String SvtFileView::GetURL( SvTreeListEntry* pEntry ) const
{
String aURL;
if ( pEntry && pEntry->GetUserData() )
@@ -1217,7 +1217,7 @@ String SvtFileView::GetURL( SvLBoxEntry* pEntry ) const
String SvtFileView::GetCurrentURL() const
{
String aURL;
- SvLBoxEntry* pEntry = mpImp->mpView->FirstSelected();
+ SvTreeListEntry* pEntry = mpImp->mpView->FirstSelected();
if ( pEntry && pEntry->GetUserData() )
aURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL;
return aURL;
@@ -1227,7 +1227,7 @@ String SvtFileView::GetCurrentURL() const
void SvtFileView::CreatedFolder( const String& rUrl, const String& rNewFolder )
{
String sEntry = mpImp->FolderInserted( rUrl, rNewFolder );
- SvLBoxEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage );
+ SvTreeListEntry* pEntry = mpImp->mpView->InsertEntry( sEntry, mpImp->maFolderImage, mpImp->maFolderImage );
SvtContentEntry* pUserData = new SvtContentEntry( rUrl, sal_True );
pEntry->SetUserData( pUserData );
mpImp->mpView->MakeVisible( pEntry );
@@ -1447,14 +1447,14 @@ sal_uLong SvtFileView::GetSelectionCount() const
// -----------------------------------------------------------------------
-SvLBoxEntry* SvtFileView::FirstSelected() const
+SvTreeListEntry* SvtFileView::FirstSelected() const
{
return mpImp->mpView->FirstSelected();
}
// -----------------------------------------------------------------------
-SvLBoxEntry* SvtFileView::NextSelected( SvLBoxEntry* pEntry ) const
+SvTreeListEntry* SvtFileView::NextSelected( SvTreeListEntry* pEntry ) const
{
return mpImp->mpView->NextSelected( pEntry );
}
@@ -1993,7 +1993,7 @@ void SvtFileView_Impl::SetSelectHandler( const Link& _rHdl )
void SvtFileView_Impl::InitSelection()
{
mpView->SelectAll( sal_False );
- SvLBoxEntry* pFirst = mpView->First();
+ SvTreeListEntry* pFirst = mpView->First();
if ( pFirst )
mpView->SetCursor( pFirst, sal_True );
}
@@ -2014,7 +2014,7 @@ void SvtFileView_Impl::OpenFolder_Impl()
continue;
// insert entry and set user data
- SvLBoxEntry* pEntry = mpView->InsertEntry( (*aIt)->maDisplayText,
+ SvTreeListEntry* pEntry = mpView->InsertEntry( (*aIt)->maDisplayText,
(*aIt)->maImage,
(*aIt)->maImage );
@@ -2036,7 +2036,7 @@ void SvtFileView_Impl::OpenFolder_Impl()
void SvtFileView_Impl::ResetCursor()
{
// deselect
- SvLBoxEntry* pEntry = mpView->FirstSelected();
+ SvTreeListEntry* pEntry = mpView->FirstSelected();
if ( pEntry )
mpView->Select( pEntry, sal_False );
// set cursor to the first entry
@@ -2280,7 +2280,7 @@ void SvtFileView_Impl::Resort_Impl( sal_Int16 nColumn, sal_Bool bAscending )
mpView->ResetQuickSearch_Impl( NULL );
String aEntryURL;
- SvLBoxEntry* pEntry = mpView->GetCurEntry();
+ SvTreeListEntry* pEntry = mpView->GetCurEntry();
if ( pEntry && pEntry->GetUserData() )
aEntryURL = ( (SvtContentEntry*)pEntry->GetUserData() )->maURL;
diff --git a/svtools/source/contnr/svimpbox.cxx b/svtools/source/contnr/svimpbox.cxx
index d4f0535e52a8..3c3abbc6c11a 100644
--- a/svtools/source/contnr/svimpbox.cxx
+++ b/svtools/source/contnr/svimpbox.cxx
@@ -157,7 +157,7 @@ void SvImpLBox::UpdateStringSorter()
}
// #97680# ----------------------
-short SvImpLBox::UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth )
+short SvImpLBox::UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth )
{
DBG_ASSERT( pView->pModel, "View and Model aren't valid!" );
@@ -185,7 +185,7 @@ short SvImpLBox::UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth
return nContextBmpWidth;
}
-void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry )
{
DBG_ASSERT( pEntry, "Moved Entry is invalid!" );
@@ -197,7 +197,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry )
if( pEntry->HasChildren() ) // recursive call, whether expanded or not
{
- SvLBoxEntry* pChild = pView->FirstChild( pEntry );
+ SvTreeListEntry* pChild = pView->FirstChild( pEntry );
DBG_ASSERT( pChild, "The first child is invalid!" );
do
{
@@ -207,7 +207,7 @@ void SvImpLBox::UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry )
}
}
-void SvImpLBox::UpdateContextBmpWidthMax( SvLBoxEntry* pEntry )
+void SvImpLBox::UpdateContextBmpWidthMax( SvTreeListEntry* pEntry )
{
sal_uInt16 nDepth = pView->pModel->GetDepth( pEntry );
if( aContextBmpWidthVector.size() < 1 )
@@ -221,7 +221,7 @@ void SvImpLBox::UpdateContextBmpWidthMax( SvLBoxEntry* pEntry )
}
}
-void SvImpLBox::CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect )
+void SvImpLBox::CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect )
{
if ( pEntry && bIsCellFocusEnabled )
{
@@ -355,7 +355,7 @@ IMPL_LINK( SvImpLBox, ScrollUpDownHdl, ScrollBar *, pScrollBar )
void SvImpLBox::CursorDown()
{
- SvLBoxEntry* pNextFirstToDraw = (SvLBoxEntry*)(pView->NextVisible( pStartEntry));
+ SvTreeListEntry* pNextFirstToDraw = (SvTreeListEntry*)(pView->NextVisible( pStartEntry));
if( pNextFirstToDraw )
{
nFlags &= (~F_FILLING);
@@ -373,7 +373,7 @@ void SvImpLBox::CursorDown()
void SvImpLBox::CursorUp()
{
- SvLBoxEntry* pPrevFirstToDraw = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry));
+ SvTreeListEntry* pPrevFirstToDraw = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry));
if( pPrevFirstToDraw )
{
nFlags &= (~F_FILLING);
@@ -398,8 +398,8 @@ void SvImpLBox::PageDown( sal_uInt16 nDelta )
if( !nDelta )
return;
- SvLBoxEntry* pNext;
- pNext = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nRealDelta ));
+ SvTreeListEntry* pNext;
+ pNext = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nRealDelta ));
if( (sal_uLong)pNext == (sal_uLong)pStartEntry )
return;
@@ -436,7 +436,7 @@ void SvImpLBox::PageUp( sal_uInt16 nDelta )
if( !nDelta )
return;
- SvLBoxEntry* pPrev = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry, nRealDelta ));
+ SvTreeListEntry* pPrev = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry, nRealDelta ));
if( (sal_uLong)pPrev == (sal_uLong)pStartEntry )
return;
@@ -562,7 +562,7 @@ void SvImpLBox::InvalidateEntry( long nY ) const
}
}
-void SvImpLBox::InvalidateEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::InvalidateEntry( SvTreeListEntry* pEntry )
{
if( GetUpdateMode() )
{
@@ -606,7 +606,7 @@ void SvImpLBox::RecalcFocusRect()
// Sets cursor. When using SingleSelection, the selection is adjusted.
//
-void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect )
+void SvImpLBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect )
{
SvViewDataEntry* pViewDataNewCur = 0;
if( pEntry )
@@ -622,11 +622,11 @@ void SvImpLBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect )
// if this cursor is not selectable, find first visible that is and use it
while( pEntry && pViewDataNewCur && !pViewDataNewCur->IsSelectable() )
{
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
pViewDataNewCur = pEntry ? pView->GetViewDataEntry(pEntry) : 0;
}
- SvLBoxEntry* pOldCursor = pCursor;
+ SvTreeListEntry* pOldCursor = pCursor;
if( pCursor && pEntry != pCursor )
{
pView->SetEntryFocus( pCursor, sal_False );
@@ -758,7 +758,7 @@ void SvImpLBox::KeyLeftRight( long nDelta )
// returns the last entry if position is just past the last entry
-SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const
+SvTreeListEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const
{
DBG_ASSERT( pView->GetModel(), "SvImpLBox::GetClickedEntry: how can this ever happen? Please tell me (frank.schoenheit@sun.com) how to reproduce!" );
if ( !pView->GetModel() )
@@ -772,7 +772,7 @@ SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const
sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() / pView->GetEntryHeight() );
sal_uInt16 nTemp = nClickedEntry;
- SvLBoxEntry* pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nTemp ));
+ SvTreeListEntry* pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nTemp ));
return pEntry;
}
@@ -780,7 +780,7 @@ SvLBoxEntry* SvImpLBox::GetClickedEntry( const Point& rPoint ) const
// checks if the entry was hit "the right way"
// (Focusrect+ ContextBitmap bei TreeListBox)
//
-sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPosPixel,long nLine)
+sal_Bool SvImpLBox::EntryReallyHit(SvTreeListEntry* pEntry,const Point& rPosPixel,long nLine)
{
sal_Bool bRet;
// we are not too exact when it comes to "special" entries
@@ -807,7 +807,7 @@ sal_Bool SvImpLBox::EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPosPixel,lo
// returns 0 if position is just past the last entry
-SvLBoxEntry* SvImpLBox::GetEntry( const Point& rPoint ) const
+SvTreeListEntry* SvImpLBox::GetEntry( const Point& rPoint ) const
{
if( (pView->GetEntryCount() == 0) || !pStartEntry ||
(rPoint.Y() > aOutputSize.Height())
@@ -816,26 +816,26 @@ SvLBoxEntry* SvImpLBox::GetEntry( const Point& rPoint ) const
sal_uInt16 nClickedEntry = (sal_uInt16)(rPoint.Y() / pView->GetEntryHeight() );
sal_uInt16 nTemp = nClickedEntry;
- SvLBoxEntry* pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nTemp ));
+ SvTreeListEntry* pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nTemp ));
if( nTemp != nClickedEntry )
pEntry = 0;
return pEntry;
}
-SvLBoxEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScroll)
+SvTreeListEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScroll)
{
if( !pCursor )
return 0;
long nY = rPoint.Y();
- SvLBoxEntry* pEntry = 0;
+ SvTreeListEntry* pEntry = 0;
long nMax = aOutputSize.Height();
if( nY < 0 || nY >= nMax ) // aOutputSize.Height() )
{
if( nY < 0 )
- pEntry = (SvLBoxEntry*)(pView->PrevVisible( pCursor ));
+ pEntry = (SvTreeListEntry*)(pView->PrevVisible( pCursor ));
else
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pCursor ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pCursor ));
if( pEntry && pEntry != pCursor )
pView->SetEntryFocus( pCursor, sal_False );
@@ -852,7 +852,7 @@ SvLBoxEntry* SvImpLBox::MakePointVisible(const Point& rPoint,sal_Bool bNotifyScr
{
sal_uInt16 nSteps = 0xFFFF;
// TODO: LastVisible is not yet implemented!
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry, nSteps ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry, nSteps ));
}
if( pEntry )
{
@@ -884,7 +884,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
if( nFlags & F_FILLING )
{
- SvLBoxEntry* pFirst = pView->First();
+ SvTreeListEntry* pFirst = pView->First();
if( pFirst != pStartEntry )
{
ShowCursor( sal_False );
@@ -914,10 +914,10 @@ void SvImpLBox::Paint( const Rectangle& rRect )
nCount += 2; // don't miss a row
long nY = nStartLine * nEntryHeight;
- SvLBoxEntry* pEntry = pStartEntry;
+ SvTreeListEntry* pEntry = pStartEntry;
while( nStartLine && pEntry )
{
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
nStartLine--;
}
@@ -935,7 +935,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
/*long nMaxRight=*/
pView->PaintEntry1( pEntry, nY, 0xffff, sal_True );
nY += nEntryHeight;
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if ( !pCursor && ( ( nExtendedWinBits & EWB_NO_AUTO_CURENTRY ) == 0 ) )
@@ -957,7 +957,7 @@ void SvImpLBox::Paint( const Rectangle& rRect )
nFlags &= (~F_IN_PAINT);
}
-void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop )
+void SvImpLBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop )
{
if( !pEntry )
return;
@@ -973,7 +973,7 @@ void SvImpLBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop )
{
if( !pView->IsEntryVisible(pEntry) ) // Parent(s) collapsed?
{
- SvLBoxEntry* pParent = pView->GetParent( pEntry );
+ SvTreeListEntry* pParent = pView->GetParent( pEntry );
while( pParent )
{
if( !pView->IsExpanded( pParent ) )
@@ -1011,7 +1011,7 @@ void SvImpLBox::ScrollToAbsPos( long nPos )
else if( nPos > nLastEntryPos )
nPos = nLastEntryPos;
- SvLBoxEntry* pEntry = (SvLBoxEntry*)pView->GetEntryAtAbsPos( nPos );
+ SvTreeListEntry* pEntry = (SvTreeListEntry*)pView->GetEntryAtAbsPos( nPos );
if( !pEntry || pEntry == pStartEntry )
return;
@@ -1055,8 +1055,8 @@ void SvImpLBox::DrawNet()
if( nEntryHeightDIV2 && !(nEntryHeight & 0x0001))
nEntryHeightDIV2--;
- SvLBoxEntry* pChild;
- SvLBoxEntry* pEntry = pStartEntry;
+ SvTreeListEntry* pChild;
+ SvTreeListEntry* pEntry = pStartEntry;
SvLBoxTab* pFirstDynamicTab = pView->GetFirstDynamicTab();
while( pTree->GetDepth( pEntry ) > 0 )
@@ -1124,7 +1124,7 @@ void SvImpLBox::DrawNet()
pView->DrawLine( aPos1, aPos2 );
}
nY += nEntryHeight;
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( m_nStyle & WB_HASLINESATROOT )
{
@@ -1340,11 +1340,11 @@ void SvImpLBox::FillView()
sal_uInt16 nTempThumb = (sal_uInt16)aVerSBar.GetThumbPos();
if( nTempThumb >= nVisibleViewCount )
nTempThumb = nVisibleViewCount - 1;
- pStartEntry = (SvLBoxEntry*)(pView->GetEntryAtVisPos(nTempThumb));
+ pStartEntry = (SvTreeListEntry*)(pView->GetEntryAtVisPos(nTempThumb));
}
if( pStartEntry )
{
- sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvLBoxEntry*)(pView->LastVisible())));
+ sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvTreeListEntry*)(pView->LastVisible())));
sal_uInt16 nThumb = (sal_uInt16)(pView->GetVisiblePos( pStartEntry ));
sal_uInt16 nCurDispEntries = nLast-nThumb+1;
if( nCurDispEntries < nVisibleCount )
@@ -1352,10 +1352,10 @@ void SvImpLBox::FillView()
ShowCursor( sal_False );
// fill window by moving the thumb up incrementally
sal_Bool bFound = sal_False;
- SvLBoxEntry* pTemp = pStartEntry;
+ SvTreeListEntry* pTemp = pStartEntry;
while( nCurDispEntries < nVisibleCount && pTemp )
{
- pTemp = (SvLBoxEntry*)(pView->PrevVisible(pStartEntry));
+ pTemp = (SvTreeListEntry*)(pView->PrevVisible(pStartEntry));
if( pTemp )
{
nThumb--;
@@ -1452,7 +1452,7 @@ void SvImpLBox::SyncVerThumb()
aVerSBar.SetThumbPos( 0 );
}
-sal_Bool SvImpLBox::IsEntryInView( SvLBoxEntry* pEntry ) const
+sal_Bool SvImpLBox::IsEntryInView( SvTreeListEntry* pEntry ) const
{
// parent collapsed
if( !pView->IsEntryVisible(pEntry) )
@@ -1467,7 +1467,7 @@ sal_Bool SvImpLBox::IsEntryInView( SvLBoxEntry* pEntry ) const
}
-long SvImpLBox::GetEntryLine( SvLBoxEntry* pEntry ) const
+long SvImpLBox::GetEntryLine( SvTreeListEntry* pEntry ) const
{
if(!pStartEntry )
return -1; // invisible position
@@ -1502,7 +1502,7 @@ void SvImpLBox::SetEntryHeight( short /* nHeight */ )
// Callback Functions
// ***********************************************************************
-void SvImpLBox::EntryExpanded( SvLBoxEntry* pEntry )
+void SvImpLBox::EntryExpanded( SvTreeListEntry* pEntry )
{
// SelAllDestrAnch( sal_False, sal_True ); //DeselectAll();
if( GetUpdateMode() )
@@ -1523,7 +1523,7 @@ void SvImpLBox::EntryExpanded( SvLBoxEntry* pEntry )
}
}
-void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry )
+void SvImpLBox::EntryCollapsed( SvTreeListEntry* pEntry )
{
if( !pView->IsEntryVisible( pEntry ) )
return;
@@ -1546,7 +1546,7 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry )
pStartEntry = pView->First();
sal_uInt16 nDistance = (sal_uInt16)nNewThumbPos;
if( nDistance )
- pStartEntry = (SvLBoxEntry*)(pView->NextVisible( pStartEntry,
+ pStartEntry = (SvTreeListEntry*)(pView->NextVisible( pStartEntry,
nDistance));
if( GetUpdateMode() )
pView->Invalidate();
@@ -1565,7 +1565,7 @@ void SvImpLBox::EntryCollapsed( SvLBoxEntry* pEntry )
pView->Select( pCursor, sal_True );
}
-void SvImpLBox::CollapsingEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::CollapsingEntry( SvTreeListEntry* pEntry )
{
if( !pView->IsEntryVisible( pEntry ) || !pStartEntry )
return;
@@ -1612,7 +1612,7 @@ void SvImpLBox::SetNodeBmpTabDistance()
//
// corrects the cursor when using SingleSelection
//
-void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, sal_Bool bSelect )
+void SvImpLBox::EntrySelected( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
if( nFlags & F_IGNORE_SELECT )
return;
@@ -1639,7 +1639,7 @@ void SvImpLBox::EntrySelected( SvLBoxEntry* pEntry, sal_Bool bSelect )
}
-void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::RemovingEntry( SvTreeListEntry* pEntry )
{
DestroyAnchor();
@@ -1657,9 +1657,9 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
nFlags |= F_REMOVED_RECALC_MOST_RIGHT;
}
- SvLBoxEntry* pOldStartEntry = pStartEntry;
+ SvTreeListEntry* pOldStartEntry = pStartEntry;
- SvLBoxEntry* pParent = (SvLBoxEntry*)(pView->GetModel()->GetParent(pEntry));
+ SvTreeListEntry* pParent = (SvTreeListEntry*)(pView->GetModel()->GetParent(pEntry));
if( pParent && pView->GetModel()->GetChildList(pParent)->size() == 1 )
{
@@ -1673,7 +1673,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
if( pStartEntry && pTree->IsChild(pEntry,pStartEntry) )
pStartEntry = pEntry;
- SvLBoxEntry* pTemp;
+ SvTreeListEntry* pTemp;
if( pCursor && pCursor == pEntry )
{
if( bSimpleTravel )
@@ -1682,7 +1682,7 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
// NextSibling, because we also delete the children of the cursor
pTemp = pView->NextSibling( pCursor );
if( !pTemp )
- pTemp = (SvLBoxEntry*)(pView->PrevVisible( pCursor ));
+ pTemp = (SvTreeListEntry*)(pView->PrevVisible( pCursor ));
SetCursor( pTemp, sal_True );
}
@@ -1690,14 +1690,14 @@ void SvImpLBox::RemovingEntry( SvLBoxEntry* pEntry )
{
pTemp = pView->NextSibling( pStartEntry );
if( !pTemp )
- pTemp = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry ));
+ pTemp = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry ));
pStartEntry = pTemp;
}
if( GetUpdateMode())
{
// if it is the last one, we have to invalidate it, so the lines are
// drawn correctly (in this case they're deleted)
- if( pStartEntry && (pStartEntry != pOldStartEntry || pEntry == (SvLBoxEntry*)pView->GetModel()->Last()) )
+ if( pStartEntry && (pStartEntry != pOldStartEntry || pEntry == (SvTreeListEntry*)pView->GetModel()->Last()) )
{
aVerSBar.SetThumbPos( pView->GetVisiblePos( pStartEntry ));
pView->Invalidate( GetVisibleArea() );
@@ -1738,9 +1738,9 @@ void SvImpLBox::EntryRemoved()
if( pView->GetSelectionCount() )
{
// is a neighboring entry selected?
- SvLBoxEntry* pNextCursor = (SvLBoxEntry*)pView->PrevVisible( pCursor );
+ SvTreeListEntry* pNextCursor = (SvTreeListEntry*)pView->PrevVisible( pCursor );
if( !pNextCursor || !pView->IsSelected( pNextCursor ))
- pNextCursor = (SvLBoxEntry*)pView->NextVisible( pCursor );
+ pNextCursor = (SvTreeListEntry*)pView->NextVisible( pCursor );
if( !pNextCursor || !pView->IsSelected( pNextCursor ))
// no neighbor selected: use first selected
pNextCursor = pView->FirstSelected();
@@ -1756,7 +1756,7 @@ void SvImpLBox::EntryRemoved()
}
-void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::MovingEntry( SvTreeListEntry* pEntry )
{
int bDeselAll = nFlags & F_DESEL_ALL;
SelAllDestrAnch( sal_False, sal_True ); // DeselectAll();
@@ -1769,12 +1769,12 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
pView->Invalidate();
if( pEntry == pStartEntry )
{
- SvLBoxEntry* pNew = 0;
+ SvTreeListEntry* pNew = 0;
if( !pEntry->HasChildren() )
{
- pNew = (SvLBoxEntry*)(pView->NextVisible( pStartEntry ));
+ pNew = (SvTreeListEntry*)(pView->NextVisible( pStartEntry ));
if( !pNew )
- pNew = (SvLBoxEntry*)(pView->PrevVisible( pStartEntry ));
+ pNew = (SvTreeListEntry*)(pView->PrevVisible( pStartEntry ));
}
else
{
@@ -1786,7 +1786,7 @@ void SvImpLBox::MovingEntry( SvLBoxEntry* pEntry )
}
}
-void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry )
+void SvImpLBox::EntryMoved( SvTreeListEntry* pEntry )
{
UpdateContextBmpWidthVectorFromMovedEntry( pEntry );
@@ -1808,7 +1808,7 @@ void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry )
ShowCursor( sal_True );
else
{
- SvLBoxEntry* pParent = pEntry;
+ SvTreeListEntry* pParent = pEntry;
do {
pParent = pTree->GetParent( pParent );
}
@@ -1822,11 +1822,11 @@ void SvImpLBox::EntryMoved( SvLBoxEntry* pEntry )
-void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
+void SvImpLBox::EntryInserted( SvTreeListEntry* pEntry )
{
if( GetUpdateMode() )
{
- SvLBoxEntry* pParent = (SvLBoxEntry*)pTree->GetParent(pEntry);
+ SvTreeListEntry* pParent = (SvTreeListEntry*)pTree->GetParent(pEntry);
if( pParent && pTree->GetChildList(pParent)->size() == 1 )
// draw plus sign
pTree->InvalidateEntry( pParent );
@@ -1852,7 +1852,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
{
// Check if the view is filled completely. If not, then adjust
// pStartEntry and the Cursor (automatic scrolling).
- sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvLBoxEntry*)(pView->LastVisible())));
+ sal_uInt16 nLast = (sal_uInt16)(pView->GetVisiblePos( (SvTreeListEntry*)(pView->LastVisible())));
sal_uInt16 nThumb = (sal_uInt16)(pView->GetVisiblePos( pStartEntry ));
sal_uInt16 nCurDispEntries = nLast-nThumb+1;
if( nCurDispEntries < nVisibleCount )
@@ -1885,7 +1885,7 @@ void SvImpLBox::EntryInserted( SvLBoxEntry* pEntry )
// ****** Control the control animation
-sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pEntry,
+sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvTreeListEntry* pEntry,
long nY )
{
SvLBoxItem* pItem = pView->GetItem(pEntry,rMEvt.GetPosPixel().X(),&pActiveTab);
@@ -1907,7 +1907,7 @@ sal_Bool SvImpLBox::ButtonDownCheckCtrl(const MouseEvent& rMEvt, SvLBoxEntry* pE
return sal_False;
}
-sal_Bool SvImpLBox::MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvLBoxEntry* pEntry)
+sal_Bool SvImpLBox::MouseMoveCheckCtrl( const MouseEvent& rMEvt, SvTreeListEntry* pEntry)
{
if( pActiveButton )
{
@@ -1944,7 +1944,7 @@ sal_Bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt )
if( pActiveButton )
{
pView->ReleaseMouse();
- SvLBoxEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() );
+ SvTreeListEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() );
long nY = GetEntryLine( pActiveEntry );
pActiveButton->SetStateHilighted( sal_False );
long nMouseX = rMEvt.GetPosPixel().X();
@@ -1967,7 +1967,7 @@ sal_Bool SvImpLBox::ButtonUpCheckCtrl( const MouseEvent& rMEvt )
// ******* Control plus/minus button for expanding/collapsing
// sal_False == no expand/collapse button hit
-sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const
+sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const
{
if( !pEntry->HasChildren() && !pEntry->HasChildrenOnDemand() )
return sal_False;
@@ -1992,7 +1992,7 @@ sal_Bool SvImpLBox::IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry )
}
// sal_False == hit no node button
-sal_Bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvLBoxEntry* pEntry, long /* nY */ )
+sal_Bool SvImpLBox::ButtonDownCheckExpand( const MouseEvent& rMEvt, SvTreeListEntry* pEntry, long /* nY */ )
{
sal_Bool bRet = sal_False;
@@ -2028,7 +2028,7 @@ void SvImpLBox::MouseButtonDown( const MouseEvent& rMEvt )
if( aPos.X() > aOutputSize.Width() || aPos.Y() > aOutputSize.Height() )
return;
- SvLBoxEntry* pEntry = GetEntry( aPos );
+ SvTreeListEntry* pEntry = GetEntry( aPos );
if ( pEntry != pCursor )
// new entry selected -> reset current tab position to first tab
nCurTabPos = FIRST_ENTRY_TAB;
@@ -2119,7 +2119,7 @@ void SvImpLBox::MouseButtonUp( const MouseEvent& rMEvt)
void SvImpLBox::MouseMove( const MouseEvent& rMEvt)
{
- SvLBoxEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() );
+ SvTreeListEntry* pEntry = GetClickedEntry( rMEvt.GetPosPixel() );
if ( !MouseMoveCheckCtrl( rMEvt, pEntry ) && ( aSelEng.GetSelectionMode() != NO_SELECTION ) )
aSelEng.SelMouseMove( rMEvt );
return;
@@ -2148,7 +2148,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
sal_Bool bShift = rKeyCode.IsShift();
sal_Bool bMod1 = rKeyCode.IsMod1();
- SvLBoxEntry* pNewCursor;
+ SvTreeListEntry* pNewCursor;
const WinBits nWindowStyle = pView->GetStyle();
switch( aCode )
@@ -2160,7 +2160,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
pNewCursor = pCursor;
do
{
- pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor ));
} while( pNewCursor && !IsSelectable(pNewCursor) );
if ( pNewCursor )
@@ -2188,7 +2188,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
pNewCursor = pCursor;
do
{
- pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor ));
} while( pNewCursor && !IsSelectable(pNewCursor) );
if ( pNewCursor )
@@ -2299,11 +2299,11 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
case KEY_PAGEUP:
if( !bMod1 )
{
- pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pCursor, nDelta ));
+ pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pCursor, nDelta ));
while( nDelta && pNewCursor && !IsSelectable(pNewCursor) )
{
- pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor ));
nDelta--;
}
@@ -2327,11 +2327,11 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
case KEY_PAGEDOWN:
if( !bMod1 )
{
- pNewCursor= (SvLBoxEntry*)(pView->NextVisible( pCursor, nDelta ));
+ pNewCursor= (SvTreeListEntry*)(pView->NextVisible( pCursor, nDelta ));
while( nDelta && pNewCursor && !IsSelectable(pNewCursor) )
{
- pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor ));
nDelta--;
}
@@ -2428,7 +2428,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if( bMod1 )
{
sal_uInt16 nRefDepth = pTree->GetDepth( pCursor );
- SvLBoxEntry* pCur = pTree->Next( pCursor );
+ SvTreeListEntry* pCur = pTree->Next( pCursor );
while( pCur && pTree->GetDepth(pCur) > nRefDepth )
{
if( pCur->HasChildren() && !pView->IsExpanded(pCur))
@@ -2456,7 +2456,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if( bMod1 )
{
// collapse all parents until we get to the root
- SvLBoxEntry* pParentToCollapse = (SvLBoxEntry*)pTree->GetRootLevelParent(pCursor);
+ SvTreeListEntry* pParentToCollapse = (SvTreeListEntry*)pTree->GetRootLevelParent(pCursor);
if( pParentToCollapse )
{
sal_uInt16 nRefDepth;
@@ -2477,7 +2477,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
if( pView->IsExpanded(pParentToCollapse) )
pView->Collapse( pParentToCollapse );
- SvLBoxEntry* pCur = pTree->Next( pParentToCollapse );
+ SvTreeListEntry* pCur = pTree->Next( pParentToCollapse );
while( pCur && pTree->GetDepth(pCur) > nRefDepth )
{
if( pCur->HasChildren() && pView->IsExpanded(pCur) )
@@ -2510,7 +2510,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
while( pNewCursor && !IsSelectable(pNewCursor) )
{
- pNewCursor = (SvLBoxEntry*)(pView->NextVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->NextVisible( pNewCursor ));
}
if( pNewCursor && pNewCursor != pCursor )
@@ -2530,7 +2530,7 @@ sal_Bool SvImpLBox::KeyInput( const KeyEvent& rKEvt)
while( pNewCursor && !IsSelectable(pNewCursor) )
{
- pNewCursor = (SvLBoxEntry*)(pView->PrevVisible( pNewCursor ));
+ pNewCursor = (SvTreeListEntry*)(pView->PrevVisible( pNewCursor ));
}
if( pNewCursor && pNewCursor != pCursor)
@@ -2580,7 +2580,7 @@ void SvImpLBox::GetFocus()
}
if( m_nStyle & WB_HIDESELECTION )
{
- SvLBoxEntry* pEntry = pView->FirstSelected();
+ SvTreeListEntry* pEntry = pView->FirstSelected();
while( pEntry )
{
InvalidateEntry( pEntry );
@@ -2598,7 +2598,7 @@ void SvImpLBox::LoseFocus()
if( m_nStyle & WB_HIDESELECTION )
{
- SvLBoxEntry* pEntry = pView->FirstSelected();
+ SvTreeListEntry* pEntry = pView->FirstSelected();
while( pEntry )
{
//SvViewData* pViewData = pView->GetViewData( pEntry );
@@ -2614,7 +2614,7 @@ void SvImpLBox::LoseFocus()
// SelectionEngine
// ********************************************************************
-inline void SvImpLBox::SelectEntry( SvLBoxEntry* pEntry, sal_Bool bSelect )
+inline void SvImpLBox::SelectEntry( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
pView->Select( pEntry, bSelect );
}
@@ -2648,7 +2648,7 @@ void ImpLBSelEng::DestroyAnchor()
sal_Bool ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelectAtCursor)
{
- SvLBoxEntry* pNewCursor = pImp->MakePointVisible( rPoint );
+ SvTreeListEntry* pNewCursor = pImp->MakePointVisible( rPoint );
if( pNewCursor != pImp->pCursor )
pImp->BeginScroll();
@@ -2666,7 +2666,7 @@ sal_Bool ImpLBSelEng::SetCursorAtPoint(const Point& rPoint, sal_Bool bDontSelect
sal_Bool ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint )
{
- SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint );
+ SvTreeListEntry* pEntry = pImp->MakePointVisible( rPoint );
if( pEntry )
return pView->IsSelected(pEntry);
return sal_False;
@@ -2674,7 +2674,7 @@ sal_Bool ImpLBSelEng::IsSelectionAtPoint( const Point& rPoint )
void ImpLBSelEng::DeselectAtPoint( const Point& rPoint )
{
- SvLBoxEntry* pEntry = pImp->MakePointVisible( rPoint );
+ SvTreeListEntry* pEntry = pImp->MakePointVisible( rPoint );
if( !pEntry )
return;
pImp->SelectEntry( pEntry, sal_False );
@@ -2690,9 +2690,9 @@ void ImpLBSelEng::DeselectAll()
// Selection
// ***********************************************************************
-void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCursor)
+void SvImpLBox::SetAnchorSelection(SvTreeListEntry* pOldCursor,SvTreeListEntry* pNewCursor)
{
- SvLBoxEntry* pEntry;
+ SvTreeListEntry* pEntry;
sal_uLong nAnchorVisPos = pView->GetVisiblePos( pAnchor );
sal_uLong nOldVisPos = pView->GetVisiblePos( pOldCursor );
sal_uLong nNewVisPos = pView->GetVisiblePos( pNewCursor );
@@ -2706,7 +2706,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pNewCursor )
{
pView->Select( pEntry, sal_True );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_True );
@@ -2719,7 +2719,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pOldCursor )
{
pView->Select( pEntry, sal_False );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_False );
@@ -2728,7 +2728,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pAnchor )
{
pView->Select( pEntry, sal_True );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_True );
@@ -2738,11 +2738,11 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
if( nNewVisPos < nOldVisPos )
{
pEntry = pNewCursor;
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
while( pEntry && pEntry != pOldCursor )
{
pView->Select( pEntry, sal_False );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_False );
@@ -2757,7 +2757,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pOldCursor )
{
pView->Select( pEntry, sal_True );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_True );
@@ -2770,7 +2770,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pAnchor )
{
pView->Select( pEntry, sal_False );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_False );
@@ -2778,7 +2778,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pNewCursor )
{
pView->Select( pEntry, sal_True );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
if( pEntry )
pView->Select( pEntry, sal_True );
@@ -2791,7 +2791,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
while( pEntry && pEntry != pNewCursor )
{
pView->Select( pEntry, sal_False );
- pEntry = (SvLBoxEntry*)(pView->NextVisible( pEntry ));
+ pEntry = (SvTreeListEntry*)(pView->NextVisible( pEntry ));
}
return;
}
@@ -2801,7 +2801,7 @@ void SvImpLBox::SetAnchorSelection(SvLBoxEntry* pOldCursor,SvLBoxEntry* pNewCurs
void SvImpLBox::SelAllDestrAnch( sal_Bool bSelect, sal_Bool bDestroyAnchor,
sal_Bool bSingleSelToo )
{
- SvLBoxEntry* pEntry;
+ SvTreeListEntry* pEntry;
nFlags &= (~F_DESEL_ALL);
if( bSelect && bSimpleTravel )
{
@@ -2914,7 +2914,7 @@ IMPL_LINK_NOARG(SvImpLBox, BeginDragHdl)
return 0;
}
-void SvImpLBox::PaintDDCursor( SvLBoxEntry* pInsertionPos )
+void SvImpLBox::PaintDDCursor( SvTreeListEntry* pInsertionPos )
{
long nY;
if( pInsertionPos )
@@ -2963,20 +2963,20 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
{
Point aPopupPos;
sal_Bool bClickedIsFreePlace = sal_False;
- std::stack<SvLBoxEntry*> aSelRestore;
+ std::stack<SvTreeListEntry*> aSelRestore;
if( rCEvt.IsMouseEvent() )
{ // change selection, if mouse position doesn't fit to selection
aPopupPos = rCEvt.GetMousePosPixel();
- SvLBoxEntry* pClickedEntry = GetEntry( aPopupPos );
+ SvTreeListEntry* pClickedEntry = GetEntry( aPopupPos );
if( pClickedEntry )
{ // mouse in non empty area
sal_Bool bClickedIsSelected = sal_False;
// collect the currently selected entries
- SvLBoxEntry* pSelected = pView->FirstSelected();
+ SvTreeListEntry* pSelected = pView->FirstSelected();
while( pSelected )
{
bClickedIsSelected |= ( pClickedEntry == pSelected );
@@ -2994,7 +2994,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
{
bClickedIsFreePlace = sal_True;
sal_Int32 nSelectedEntries = pView->GetSelectionCount();
- SvLBoxEntry* pSelected = pView->FirstSelected();
+ SvTreeListEntry* pSelected = pView->FirstSelected();
for(sal_uInt16 nSel = 0; nSel < nSelectedEntries; nSel++ )
{
aSelRestore.push(pSelected);
@@ -3015,7 +3015,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
if( nSelectionCount )
{ // now always take first visible as base for positioning the menu
- SvLBoxEntry* pSelected = pView->FirstSelected();
+ SvTreeListEntry* pSelected = pView->FirstSelected();
while( pSelected )
{
if( IsEntryInView( pSelected ) )
@@ -3053,7 +3053,7 @@ void SvImpLBox::Command( const CommandEvent& rCEvt )
{
while(!aSelRestore.empty())
{
- SvLBoxEntry* pEntry = aSelRestore.top();
+ SvTreeListEntry* pEntry = aSelRestore.top();
//#i19717# the entry is maybe already deleted
bool bFound = false;
for(sal_uLong nEntry = 0; nEntry < pView->GetEntryCount(); nEntry++)
@@ -3110,7 +3110,7 @@ void SvImpLBox::Invalidate()
pView->SetClipRegion();
}
-void SvImpLBox::SetCurEntry( SvLBoxEntry* pEntry )
+void SvImpLBox::SetCurEntry( SvTreeListEntry* pEntry )
{
if ( ( aSelEng.GetSelectionMode() != SINGLE_SELECTION )
&& ( aSelEng.GetSelectionMode() != NO_SELECTION )
@@ -3139,7 +3139,7 @@ IMPL_LINK_NOARG(SvImpLBox, EditTimerCall)
}
}
- SvLBoxEntry* pEntry = GetCurEntry();
+ SvTreeListEntry* pEntry = GetCurEntry();
if( pEntry )
{
ShowCursor( sal_False );
@@ -3158,7 +3158,7 @@ sal_Bool SvImpLBox::RequestHelp( const HelpEvent& rHEvt )
if( !GetVisibleArea().IsInside( aPos ))
return sal_False;
- SvLBoxEntry* pEntry = GetEntry( aPos );
+ SvTreeListEntry* pEntry = GetEntry( aPos );
if( pEntry )
{
// recalculate text rectangle
@@ -3237,7 +3237,7 @@ void SvImpLBox::SetUpdateMode( sal_Bool bMode )
}
}
-sal_Bool SvImpLBox::SetMostRight( SvLBoxEntry* pEntry )
+sal_Bool SvImpLBox::SetMostRight( SvTreeListEntry* pEntry )
{
if( pView->nTreeFlags & TREEFLAG_RECALCTABS )
{
@@ -3279,23 +3279,23 @@ sal_Bool SvImpLBox::SetMostRight( SvLBoxEntry* pEntry )
return sal_False;
}
-void SvImpLBox::FindMostRight( SvLBoxEntry* pEntryToIgnore )
+void SvImpLBox::FindMostRight( SvTreeListEntry* pEntryToIgnore )
{
nMostRight = -1;
pMostRightEntry = 0;
if( !pView->GetModel() )
return;
- SvLBoxEntry* pEntry = (SvLBoxEntry*)pView->FirstVisible();
+ SvTreeListEntry* pEntry = (SvTreeListEntry*)pView->FirstVisible();
while( pEntry )
{
if( pEntry != pEntryToIgnore )
SetMostRight( pEntry );
- pEntry = (SvLBoxEntry*)pView->NextVisible( pEntry );
+ pEntry = (SvTreeListEntry*)pView->NextVisible( pEntry );
}
}
-void SvImpLBox::FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore )
+void SvImpLBox::FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* pEntryToIgnore )
{
if( !pParent )
FindMostRight( pEntryToIgnore );
@@ -3303,7 +3303,7 @@ void SvImpLBox::FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore
FindMostRight_Impl( pParent, pEntryToIgnore );
}
-void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToIgnore )
+void SvImpLBox::FindMostRight_Impl( SvTreeListEntry* pParent, SvTreeListEntry* pEntryToIgnore )
{
SvTreeEntryList* pList = pTree->GetChildList( pParent );
@@ -3313,7 +3313,7 @@ void SvImpLBox::FindMostRight_Impl( SvLBoxEntry* pParent, SvLBoxEntry* pEntryToI
size_t nCount = pList->size();
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
- SvLBoxEntry* pChild = (SvLBoxEntry*)(*pList)[ nCur ];
+ SvTreeListEntry* pChild = (SvTreeListEntry*)(*pList)[ nCur ];
if( pChild != pEntryToIgnore )
{
SetMostRight( pChild );
@@ -3359,12 +3359,12 @@ void SvImpLBox::StopUserEvent()
}
}
-void SvImpLBox::ShowFocusRect( const SvLBoxEntry* pEntry )
+void SvImpLBox::ShowFocusRect( const SvTreeListEntry* pEntry )
{
if( pEntry )
{
- long nY = GetEntryLine( (SvLBoxEntry*)pEntry );
- Rectangle aRect = pView->GetFocusRect( (SvLBoxEntry*)pEntry, nY );
+ long nY = GetEntryLine( (SvTreeListEntry*)pEntry );
+ Rectangle aRect = pView->GetFocusRect( (SvTreeListEntry*)pEntry, nY );
Region aOldClip( pView->GetClipRegion());
Region aClipRegion( GetClipRegionRect() );
pView->SetClipRegion( aClipRegion );
@@ -3428,11 +3428,11 @@ bool SvImpLBox::SetCurrentTabPos( sal_uInt16 _nNewPos )
// -----------------------------------------------------------------------
-bool SvImpLBox::IsSelectable( const SvLBoxEntry* pEntry )
+bool SvImpLBox::IsSelectable( const SvTreeListEntry* pEntry )
{
if( pEntry )
{
- SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(const_cast<SvLBoxEntry*>(pEntry));
+ SvViewDataEntry* pViewDataNewCur = pView->GetViewDataEntry(const_cast<SvTreeListEntry*>(pEntry));
return (pViewDataNewCur == 0) || pViewDataNewCur->IsSelectable();
}
else
diff --git a/svtools/source/contnr/svlbitm.cxx b/svtools/source/contnr/svlbitm.cxx
index 0d3e4e8b7085..b1214111215b 100644
--- a/svtools/source/contnr/svlbitm.cxx
+++ b/svtools/source/contnr/svlbitm.cxx
@@ -35,7 +35,7 @@
struct SvLBoxButtonData_Impl
{
- SvLBoxEntry* pEntry;
+ SvTreeListEntry* pEntry;
sal_Bool bDefaultImages;
sal_Bool bShowRadioButton;
@@ -123,7 +123,7 @@ void SvLBoxButtonData::SetWidthAndHeight()
}
-void SvLBoxButtonData::StoreButtonState( SvLBoxEntry* pActEntry, sal_uInt16 nItemFlags )
+void SvLBoxButtonData::StoreButtonState( SvTreeListEntry* pActEntry, sal_uInt16 nItemFlags )
{
DBG_CHKTHIS(SvLBoxButtonData,0);
pImpl->pEntry = pActEntry;
@@ -151,7 +151,7 @@ SvButtonState SvLBoxButtonData::ConvertToButtonState( sal_uInt16 nItemFlags ) co
}
}
-SvLBoxEntry* SvLBoxButtonData::GetActEntry() const
+SvTreeListEntry* SvLBoxButtonData::GetActEntry() const
{
DBG_ASSERT( pImpl, "-SvLBoxButtonData::GetActEntry(): don't use me that way!" );
return pImpl->pEntry;
@@ -196,7 +196,7 @@ sal_Bool SvLBoxButtonData::IsRadio() {
DBG_NAME(SvLBoxString);
-SvLBoxString::SvLBoxString(SvLBoxEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr)
+SvLBoxString::SvLBoxString(SvTreeListEntry* pEntry, sal_uInt16 nFlags, const rtl::OUString& rStr)
: SvLBoxItem(pEntry, nFlags)
{
DBG_CTOR(SvLBoxString,0);
@@ -220,7 +220,7 @@ sal_uInt16 SvLBoxString::IsA()
}
void SvLBoxString::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */,
- SvLBoxEntry* _pEntry)
+ SvTreeListEntry* _pEntry)
{
DBG_CHKTHIS(SvLBoxString,0);
if ( _pEntry )
@@ -248,7 +248,7 @@ void SvLBoxString::Clone( SvLBoxItem* pSource )
}
void SvLBoxString::InitViewData(
- SvTreeListBox* pView, SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
+ SvTreeListBox* pView, SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
{
DBG_CHKTHIS(SvLBoxString,0);
if( !pViewData )
@@ -278,7 +278,7 @@ sal_uInt16 SvLBoxBmp::IsA()
return SV_ITEM_ID_LBOXBMP;
}
-void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry,
+void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData)
{
DBG_CHKTHIS(SvLBoxBmp,0);
@@ -288,7 +288,7 @@ void SvLBoxBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry,
}
void SvLBoxBmp::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */,
- SvLBoxEntry* )
+ SvTreeListEntry* )
{
DBG_CHKTHIS(SvLBoxBmp,0);
sal_uInt16 nStyle = rDev.IsEnabled() ? 0 : IMAGE_DRAW_DISABLE;
@@ -313,7 +313,7 @@ void SvLBoxBmp::Clone( SvLBoxItem* pSource )
DBG_NAME(SvLBoxButton);
-SvLBoxButton::SvLBoxButton( SvLBoxEntry* pEntry, SvLBoxButtonKind eTheKind,
+SvLBoxButton::SvLBoxButton( SvTreeListEntry* pEntry, SvLBoxButtonKind eTheKind,
sal_uInt16 nFlags, SvLBoxButtonData* pBData )
: SvLBoxItem( pEntry, nFlags )
{
@@ -344,7 +344,7 @@ sal_uInt16 SvLBoxButton::IsA()
return SV_ITEM_ID_LBOXBUTTON;
}
-sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvLBoxEntry* pEntry )
+sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvLBoxButton,0);
if ( CheckModification() )
@@ -360,7 +360,7 @@ sal_Bool SvLBoxButton::ClickHdl( SvTreeListBox*, SvLBoxEntry* pEntry )
}
void SvLBoxButton::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */,
- SvLBoxEntry* /*pEntry*/ )
+ SvTreeListEntry* /*pEntry*/ )
{
DBG_CHKTHIS(SvLBoxButton,0);
sal_uInt16 nIndex = eKind == SvLBoxButtonKind_staticImage
@@ -444,7 +444,7 @@ void SvLBoxButton::ImplAdjustBoxSize( Size& io_rSize, ControlType i_eType, Windo
}
}
-void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry,
+void SvLBoxButton::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData )
{
DBG_CHKTHIS(SvLBoxButton,0);
@@ -478,7 +478,7 @@ struct SvLBoxContextBmp_Impl
// ***************************************************************
DBG_NAME(SvLBoxContextBmp)
-SvLBoxContextBmp::SvLBoxContextBmp( SvLBoxEntry* pEntry, sal_uInt16 nItemFlags,
+SvLBoxContextBmp::SvLBoxContextBmp( SvTreeListEntry* pEntry, sal_uInt16 nItemFlags,
Image aBmp1, Image aBmp2, sal_uInt16 nEntryFlags )
:SvLBoxItem( pEntry, nItemFlags )
,m_pImpl( new SvLBoxContextBmp_Impl )
@@ -527,7 +527,7 @@ Image& SvLBoxContextBmp::implGetImageStore( sal_Bool _bFirst )
return _bFirst ? m_pImpl->m_aImage1 : m_pImpl->m_aImage2;
}
-void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry,
+void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry,
SvViewDataItem* pViewData)
{
DBG_CHKTHIS(SvLBoxContextBmp,0);
@@ -537,7 +537,7 @@ void SvLBoxContextBmp::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry,
}
void SvLBoxContextBmp::Paint( const Point& _rPos, SvTreeListBox& _rDev,
- sal_uInt16 _nViewDataEntryFlags, SvLBoxEntry* _pEntry )
+ sal_uInt16 _nViewDataEntryFlags, SvTreeListEntry* _pEntry )
{
DBG_CHKTHIS(SvLBoxContextBmp,0);
diff --git a/svtools/source/contnr/svtabbx.cxx b/svtools/source/contnr/svtabbx.cxx
index 6f410fa4e846..64a1bd8ec499 100644
--- a/svtools/source/contnr/svtabbx.cxx
+++ b/svtools/source/contnr/svtabbx.cxx
@@ -79,7 +79,7 @@ void SvTabListBox::SetTabs()
}
}
-void SvTabListBox::InitEntry( SvLBoxEntry* pEntry, const XubString& rStr,
+void SvTabListBox::InitEntry( SvTreeListEntry* pEntry, const XubString& rStr,
const Image& rColl, const Image& rExp, SvLBoxButtonKind eButtonKind )
{
SvTreeListBox::InitEntry( pEntry, rStr, rColl, rExp, eButtonKind );
@@ -181,7 +181,7 @@ void SvTabListBox::SetTab( sal_uInt16 nTab,long nValue,MapUnit eMapUnit )
}
}
-SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pParent,
+SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText, SvTreeListEntry* pParent,
sal_Bool /*bChildrenOnDemand*/,
sal_uLong nPos, void* pUserData,
SvLBoxButtonKind )
@@ -189,10 +189,10 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText, SvLBoxEntry* pPa
return InsertEntryToColumn( rText, pParent, nPos, 0xffff, pUserData );
}
-SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText,
+SvTreeListEntry* SvTabListBox::InsertEntry( const XubString& rText,
const Image& rExpandedEntryBmp,
const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent,
+ SvTreeListEntry* pParent,
sal_Bool /*bChildrenOnDemand*/,
sal_uLong nPos, void* pUserData,
SvLBoxButtonKind )
@@ -201,7 +201,7 @@ SvLBoxEntry* SvTabListBox::InsertEntry( const XubString& rText,
pParent, nPos, 0xffff, pUserData );
}
-SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol,
+SvTreeListEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol,
void* pUser )
{
XubString aStr;
@@ -227,9 +227,9 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn(const XubString& rStr,SvLBoxEntry
return SvTreeListBox::InsertEntry( aFirstStr, pParent, sal_False, nPos, pUser );
}
-SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
+SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser )
+ SvTreeListEntry* pParent,sal_uLong nPos,sal_uInt16 nCol, void* pUser )
{
XubString aStr;
if( nCol != 0xffff )
@@ -258,18 +258,18 @@ SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr,
pParent, sal_False, nPos, pUser );
}
-SvLBoxEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos,
+SvTreeListEntry* SvTabListBox::InsertEntryToColumn( const XubString& rStr, sal_uLong nPos,
sal_uInt16 nCol, void* pUser )
{
return InsertEntryToColumn( rStr,0,nPos, nCol, pUser );
}
-String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry ) const
+String SvTabListBox::GetEntryText( SvTreeListEntry* pEntry ) const
{
return GetEntryText( pEntry, 0xffff );
}
-String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
+String SvTabListBox::GetEntryText( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
{
DBG_ASSERT(pEntry,"GetEntryText:Invalid Entry");
XubString aResult;
@@ -303,17 +303,17 @@ String SvTabListBox::GetEntryText( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
String SvTabListBox::GetEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
{
- SvLBoxEntry* pEntry = GetEntryOnPos( nPos );
+ SvTreeListEntry* pEntry = GetEntryOnPos( nPos );
return GetEntryText( pEntry, nCol );
}
void SvTabListBox::SetEntryText( const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol )
{
- SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos );
+ SvTreeListEntry* pEntry = SvTreeListBox::GetEntry( nPos );
SetEntryText( rStr, pEntry, nCol );
}
-void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal_uInt16 nCol )
+void SvTabListBox::SetEntryText( const XubString& rStr, SvTreeListEntry* pEntry, sal_uInt16 nCol )
{
DBG_ASSERT(pEntry,"SetEntryText:Invalid Entry");
if( !pEntry )
@@ -372,7 +372,7 @@ void SvTabListBox::SetEntryText( const XubString& rStr, SvLBoxEntry* pEntry, sal
String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const
{
- SvLBoxEntry* pEntry = GetEntryOnPos( nPos );
+ SvTreeListEntry* pEntry = GetEntryOnPos( nPos );
DBG_ASSERT( pEntry, "SvTabListBox::GetCellText(): Invalid Entry" );
XubString aResult;
if ( pEntry && pEntry->ItemCount() > ( nCol + 1 ) )
@@ -387,7 +387,7 @@ String SvTabListBox::GetCellText( sal_uLong nPos, sal_uInt16 nCol ) const
sal_uLong SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol )
{
sal_uLong nPos = 0;
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while( pEntry )
{
XubString aStr( GetEntryText( pEntry, nCol ));
@@ -399,10 +399,10 @@ sal_uLong SvTabListBox::GetEntryPos( const XubString& rStr, sal_uInt16 nCol )
return 0xffffffff;
}
-sal_uLong SvTabListBox::GetEntryPos( const SvLBoxEntry* pEntry ) const
+sal_uLong SvTabListBox::GetEntryPos( const SvTreeListEntry* pEntry ) const
{
sal_uLong nPos = 0;
- SvLBoxEntry* pTmpEntry = First();
+ SvTreeListEntry* pTmpEntry = First();
while( pTmpEntry )
{
if ( pTmpEntry == pEntry )
@@ -444,7 +444,7 @@ const xub_Unicode* SvTabListBox::GetToken( const xub_Unicode* pPtr, sal_uInt16&
String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
{
- SvLBoxEntry* pEntry = SvTreeListBox::GetEntry( nPos );
+ SvTreeListEntry* pEntry = SvTreeListBox::GetEntry( nPos );
DBG_ASSERT( pEntry, "GetTabEntryText(): Invalid entry " );
XubString aResult;
if ( pEntry )
@@ -480,13 +480,13 @@ String SvTabListBox::GetTabEntryText( sal_uLong nPos, sal_uInt16 nCol ) const
return aResult;
}
-SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
+SvTreeListEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
{
- SvLBoxEntry* pEntry = NULL;
+ SvTreeListEntry* pEntry = NULL;
sal_uLong i, nPos = 0, nCount = GetLevelChildCount( NULL );
for ( i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pParent = GetEntry(i);
+ SvTreeListEntry* pParent = GetEntry(i);
if ( nPos == _nEntryPos )
{
pEntry = pParent;
@@ -504,18 +504,18 @@ SvLBoxEntry* SvTabListBox::GetEntryOnPos( sal_uLong _nEntryPos ) const
return pEntry;
}
-SvLBoxEntry* SvTabListBox::GetChildOnPos( SvLBoxEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const
+SvTreeListEntry* SvTabListBox::GetChildOnPos( SvTreeListEntry* _pParent, sal_uLong _nEntryPos, sal_uLong& _rPos ) const
{
sal_uLong i, nCount = GetLevelChildCount( _pParent );
for ( i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pParent = GetEntry( _pParent, i );
+ SvTreeListEntry* pParent = GetEntry( _pParent, i );
if ( _rPos == _nEntryPos )
return pParent;
else
{
_rPos++;
- SvLBoxEntry* pEntry = GetChildOnPos( pParent, _nEntryPos, _rPos );
+ SvTreeListEntry* pEntry = GetChildOnPos( pParent, _nEntryPos, _rPos );
if ( pEntry )
return pEntry;
}
@@ -616,7 +616,7 @@ void SvHeaderTabListBox::InitHeaderBar( HeaderBar* pHeaderBar )
// -----------------------------------------------------------------------
-sal_Bool SvHeaderTabListBox::IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol ) const
+sal_Bool SvHeaderTabListBox::IsItemChecked( SvTreeListEntry* pEntry, sal_uInt16 nCol ) const
{
SvButtonState eState = SV_BUTTON_UNCHECKED;
SvLBoxButton* pItem = (SvLBoxButton*)( pEntry->GetItem( nCol + 1 ) );
@@ -632,31 +632,31 @@ sal_Bool SvHeaderTabListBox::IsItemChecked( SvLBoxEntry* pEntry, sal_uInt16 nCol
// -----------------------------------------------------------------------
-SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn(
+SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
const XubString& rStr, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{
- SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData );
+ SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, nPos, nCol, pUserData );
RecalculateAccessibleChildren();
return pEntry;
}
// -----------------------------------------------------------------------
-SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn(
- const XubString& rStr, SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
+SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
+ const XubString& rStr, SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{
- SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData );
+ SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn( rStr, pParent, nPos, nCol, pUserData );
RecalculateAccessibleChildren();
return pEntry;
}
// -----------------------------------------------------------------------
-SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn(
+SvTreeListEntry* SvHeaderTabListBox::InsertEntryToColumn(
const XubString& rStr, const Image& rExpandedEntryBmp, const Image& rCollapsedEntryBmp,
- SvLBoxEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
+ SvTreeListEntry* pParent, sal_uLong nPos, sal_uInt16 nCol, void* pUserData )
{
- SvLBoxEntry* pEntry = SvTabListBox::InsertEntryToColumn(
+ SvTreeListEntry* pEntry = SvTabListBox::InsertEntryToColumn(
rStr, rExpandedEntryBmp, rCollapsedEntryBmp, pParent, nPos, nCol, pUserData );
RecalculateAccessibleChildren();
return pEntry;
@@ -665,7 +665,7 @@ SvLBoxEntry* SvHeaderTabListBox::InsertEntryToColumn(
// -----------------------------------------------------------------------
sal_uLong SvHeaderTabListBox::Insert(
- SvLBoxEntry* pEnt, SvLBoxEntry* pPar, sal_uLong nPos )
+ SvTreeListEntry* pEnt, SvTreeListEntry* pPar, sal_uLong nPos )
{
sal_uLong n = SvTabListBox::Insert( pEnt, pPar, nPos );
RecalculateAccessibleChildren();
@@ -674,7 +674,7 @@ sal_uLong SvHeaderTabListBox::Insert(
// -----------------------------------------------------------------------
-sal_uLong SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos )
+sal_uLong SvHeaderTabListBox::Insert( SvTreeListEntry* pEntry, sal_uLong nRootPos )
{
sal_uLong nPos = SvTabListBox::Insert( pEntry, nRootPos );
RecalculateAccessibleChildren();
@@ -683,7 +683,7 @@ sal_uLong SvHeaderTabListBox::Insert( SvLBoxEntry* pEntry, sal_uLong nRootPos )
// -----------------------------------------------------------------------
-void SvHeaderTabListBox::RemoveEntry( SvLBoxEntry* _pEntry )
+void SvHeaderTabListBox::RemoveEntry( SvTreeListEntry* _pEntry )
{
GetModel()->Remove( _pEntry );
m_aAccessibleChildren.clear();
@@ -745,7 +745,7 @@ void SvHeaderTabListBox::RecalculateAccessibleChildren()
sal_Bool SvHeaderTabListBox::IsCellCheckBox( long _nRow, sal_uInt16 _nColumn, TriState& _rState )
{
sal_Bool bRet = sal_False;
- SvLBoxEntry* pEntry = GetEntry( _nRow );
+ SvTreeListEntry* pEntry = GetEntry( _nRow );
if ( pEntry )
{
sal_uInt16 nItemCount = pEntry->ItemCount();
@@ -781,7 +781,7 @@ sal_uInt16 SvHeaderTabListBox::GetColumnCount() const
sal_Int32 SvHeaderTabListBox::GetCurrRow() const
{
sal_Int32 nRet = -1;
- SvLBoxEntry* pEntry = GetCurEntry();
+ SvTreeListEntry* pEntry = GetCurEntry();
if ( pEntry )
{
sal_uLong nCount = GetEntryCount();
@@ -875,7 +875,7 @@ sal_Int32 SvHeaderTabListBox::GetSelectedColumnCount() const
// -----------------------------------------------------------------------
bool SvHeaderTabListBox::IsRowSelected( long _nRow ) const
{
- SvLBoxEntry* pEntry = GetEntry( _nRow );
+ SvTreeListEntry* pEntry = GetEntry( _nRow );
return ( pEntry && IsSelected( pEntry ) );
}
// -----------------------------------------------------------------------
@@ -930,7 +930,7 @@ Rectangle SvHeaderTabListBox::GetFieldRectPixelAbs( sal_Int32 _nRow, sal_uInt16
{
DBG_ASSERT( !_bIsHeader || 0 == _nRow, "invalid parameters" );
Rectangle aRect;
- SvLBoxEntry* pEntry = GetEntry( _nRow );
+ SvTreeListEntry* pEntry = GetEntry( _nRow );
if ( pEntry )
{
aRect = _bIsHeader ? calcHeaderRect( sal_True, sal_False ) : GetBoundingRect( pEntry );
diff --git a/svtools/source/contnr/treelist.cxx b/svtools/source/contnr/treelist.cxx
index 17f56c50a2a9..8cf16a9f6b8a 100644
--- a/svtools/source/contnr/treelist.cxx
+++ b/svtools/source/contnr/treelist.cxx
@@ -30,12 +30,12 @@
SvTreeEntryList::SvTreeEntryList() {}
-void SvTreeEntryList::push_back( SvListEntry* pItem )
+void SvTreeEntryList::push_back( SvTreeListEntry* pItem )
{
maEntryList.push_back( pItem );
}
-void SvTreeEntryList::insert( SvListEntry* pItem, size_t i )
+void SvTreeEntryList::insert( SvTreeListEntry* pItem, size_t i )
{
if ( i < maEntryList.size() )
{
@@ -47,9 +47,9 @@ void SvTreeEntryList::insert( SvListEntry* pItem, size_t i )
}
}
-void SvTreeEntryList::remove( SvListEntry* pItem )
+void SvTreeEntryList::remove( SvTreeListEntry* pItem )
{
- for (std::vector<SvListEntry*>::iterator it = maEntryList.begin(); it != maEntryList.end(); ++it)
+ for (std::vector<SvTreeListEntry*>::iterator it = maEntryList.begin(); it != maEntryList.end(); ++it)
{
if ( *it == pItem )
{
@@ -66,7 +66,7 @@ void SvTreeEntryList::remove( size_t i )
}
}
-void SvTreeEntryList::replace( SvListEntry* pNew, SvListEntry* pOld )
+void SvTreeEntryList::replace( SvTreeListEntry* pNew, SvTreeListEntry* pOld )
{
for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) {
if ( maEntryList[ i ] == pOld ) {
@@ -91,7 +91,7 @@ size_t SvTreeEntryList::size() const
return maEntryList.size();
}
-size_t SvTreeEntryList::GetPos(const SvListEntry* pItem) const
+size_t SvTreeEntryList::GetPos(const SvTreeListEntry* pItem) const
{
for ( size_t i = 0, n = maEntryList.size(); i < n; ++i ) {
if ( maEntryList[ i ] == pItem ) {
@@ -101,12 +101,12 @@ size_t SvTreeEntryList::GetPos(const SvListEntry* pItem) const
return (size_t)~0;
}
-SvListEntry* SvTreeEntryList::operator[](size_t i)
+SvTreeListEntry* SvTreeEntryList::operator[](size_t i)
{
return i < maEntryList.size() ? maEntryList[i] : NULL;
}
-const SvListEntry* SvTreeEntryList::operator[](size_t i) const
+const SvTreeListEntry* SvTreeEntryList::operator[](size_t i) const
{
return i < maEntryList.size() ? maEntryList[i] : NULL;
}
@@ -131,12 +131,12 @@ SvTreeEntryList::iterator SvTreeEntryList::end()
return maEntryList.end();
}
-SvListEntry* SvTreeEntryList::front()
+SvTreeListEntry* SvTreeEntryList::front()
{
return maEntryList.front();
}
-SvListEntry* SvTreeEntryList::back()
+SvTreeListEntry* SvTreeEntryList::back()
{
return maEntryList.back();
}
@@ -152,7 +152,7 @@ SvTreeEntryList::SvTreeEntryList(const SvTreeEntryList& rList)
{
maEntryList.clear();
for ( size_t i = 0, n = rList.size(); i < n; ++i )
- maEntryList.push_back(const_cast<SvListEntry*>(rList[i]));
+ maEntryList.push_back(const_cast<SvTreeListEntry*>(rList[i]));
}
DBG_NAME(SvViewData);
@@ -192,7 +192,7 @@ SvTreeList::SvTreeList()
nEntryCount = 0;
bAbsPositionsValid = sal_False;
nRefCount = 1;
- pRootItem = new SvListEntry;
+ pRootItem = new SvTreeListEntry;
eSortMode = SortNone;
}
@@ -220,8 +220,8 @@ SvTreeList::~SvTreeList()
void SvTreeList::Broadcast(
sal_uInt16 nActionId,
- SvListEntry* pEntry1,
- SvListEntry* pEntry2,
+ SvTreeListEntry* pEntry1,
+ SvTreeListEntry* pEntry2,
sal_uLong nPos
) {
sal_uLong nViewCount = aViewList.size();
@@ -259,7 +259,7 @@ void SvTreeList::RemoveView( SvListView* pView )
// an entry is visible if all parents are expanded
-sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntry ) const
+sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pView&&pEntry,"IsVisible:Invalid Params");
sal_Bool bRetVal=sal_False;
@@ -275,7 +275,7 @@ sal_Bool SvTreeList::IsEntryVisible( const SvListView* pView, SvListEntry* pEntr
return bRetVal;
}
-sal_uInt16 SvTreeList::GetDepth( SvListEntry* pEntry ) const
+sal_uInt16 SvTreeList::GetDepth( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry&&pEntry!=pRootItem,"GetDepth:Bad Entry");
sal_uInt16 nDepth = 0;
@@ -314,7 +314,7 @@ void SvTreeList::Clear()
|*
*************************************************************************/
-bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild) const
+bool SvTreeList::IsChild(const SvTreeListEntry* pParent, const SvTreeListEntry* pChild) const
{
if ( !pParent )
pParent = pRootItem;
@@ -327,7 +327,7 @@ bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild)
SvTreeEntryList::const_iterator it = pList->begin(), itEnd = pList->end();
while (!bIsChild && it != itEnd)
{
- const SvListEntry* pActualChild = *it;
+ const SvTreeListEntry* pActualChild = *it;
if ( pActualChild == pChild )
bIsChild = true;
else
@@ -340,7 +340,7 @@ bool SvTreeList::IsChild(const SvListEntry* pParent, const SvListEntry* pChild)
return bIsChild;
}
-sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos)
+sal_uLong SvTreeList::Move(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetParent,sal_uLong nListPos)
{
// pDest may be 0!
DBG_ASSERT(pSrcEntry,"Entry?");
@@ -362,7 +362,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
// insert dummy pointer, as nListPos might become invalid because of the
// following Remove.
- SvListEntry* pDummy = 0;
+ SvTreeListEntry* pDummy = 0;
pDstList->insert( pDummy, nListPos );
// delete
@@ -371,7 +371,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
if ( pSrcList->empty() )
{
// no children, thus delete child list
- SvListEntry* pParent = pSrcEntry->pParent;
+ SvTreeListEntry* pParent = pSrcEntry->pParent;
pParent->pChildren = 0;
delete pSrcList;
pSrcList = 0;
@@ -398,7 +398,7 @@ sal_uLong SvTreeList::Move(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
return nRetVal;
}
-sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal_uLong nListPos)
+sal_uLong SvTreeList::Copy(SvTreeListEntry* pSrcEntry,SvTreeListEntry* pTargetParent,sal_uLong nListPos)
{
// pDest may be 0!
DBG_ASSERT(pSrcEntry,"Entry?");
@@ -410,7 +410,7 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
bAbsPositionsValid = sal_False;
sal_uLong nCloneCount = 0;
- SvListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount );
+ SvTreeListEntry* pClonedEntry = Clone( pSrcEntry, nCloneCount );
nEntryCount += nCloneCount;
SvTreeEntryList* pDstList = pTargetParent->pChildren;
@@ -434,9 +434,9 @@ sal_uLong SvTreeList::Copy(SvListEntry* pSrcEntry,SvListEntry* pTargetParent,sal
|*
*************************************************************************/
-void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry )
+void SvTreeList::Move( SvTreeListEntry* pSrcEntry, SvTreeListEntry* pDstEntry )
{
- SvListEntry* pParent;
+ SvTreeListEntry* pParent;
sal_uLong nPos;
if ( !pDstEntry )
@@ -453,8 +453,8 @@ void SvTreeList::Move( SvListEntry* pSrcEntry, SvListEntry* pDstEntry )
Move( pSrcEntry, pParent, nPos );
}
-void SvTreeList::InsertTree(SvListEntry* pSrcEntry,
- SvListEntry* pTargetParent,sal_uLong nListPos)
+void SvTreeList::InsertTree(SvTreeListEntry* pSrcEntry,
+ SvTreeListEntry* pTargetParent,sal_uLong nListPos)
{
DBG_ASSERT(pSrcEntry,"InsertTree:Entry?");
if ( !pSrcEntry )
@@ -483,18 +483,18 @@ CheckIntegrity();
Broadcast(LISTACTION_INSERTED_TREE, pSrcEntry );
}
-SvListEntry* SvTreeList::CloneEntry( SvListEntry* pSource ) const
+SvTreeListEntry* SvTreeList::CloneEntry( SvTreeListEntry* pSource ) const
{
if( aCloneLink.IsSet() )
- return (SvListEntry*)aCloneLink.Call( pSource );
- SvListEntry* pEntry = CreateEntry();
+ return (SvTreeListEntry*)aCloneLink.Call( pSource );
+ SvTreeListEntry* pEntry = CreateEntry();
pSource->Clone( pEntry );
return pSource;
}
-SvListEntry* SvTreeList::CreateEntry() const
+SvTreeListEntry* SvTreeList::CreateEntry() const
{
- return new SvListEntry;
+ return new SvTreeListEntry;
}
/*************************************************************************
@@ -503,9 +503,9 @@ SvListEntry* SvTreeList::CreateEntry() const
|*
*************************************************************************/
-SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const
+SvTreeListEntry* SvTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const
{
- SvListEntry* pClonedEntry = CloneEntry( pEntry );
+ SvTreeListEntry* pClonedEntry = CloneEntry( pEntry );
nCloneCount = 1;
SvTreeEntryList* pChildren = pEntry->pChildren;
if ( pChildren )
@@ -520,7 +520,7 @@ SvListEntry* SvTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) co
*************************************************************************/
SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren,
- SvListEntry* pNewParent,
+ SvTreeListEntry* pNewParent,
sal_uLong& nCloneCount ) const
{
DBG_ASSERT(!pChildren->empty(),"Children?");
@@ -528,8 +528,8 @@ SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren,
SvTreeEntryList::iterator it = pChildren->begin(), itEnd = pChildren->end();
while (it != itEnd)
{
- SvListEntry* pChild = *it;
- SvListEntry* pNewChild = CloneEntry( pChild );
+ SvTreeListEntry* pChild = *it;
+ SvTreeListEntry* pNewChild = CloneEntry( pChild );
nCloneCount++;
pNewChild->pParent = pNewParent;
SvTreeEntryList* pSubChildren = pChild->pChildren;
@@ -552,7 +552,7 @@ SvTreeEntryList* SvTreeList::CloneChildren( SvTreeEntryList* pChildren,
|*
*************************************************************************/
-sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const
+sal_uLong SvTreeList::GetChildCount( SvTreeListEntry* pParent ) const
{
if ( !pParent )
return GetEntryCount();
@@ -577,7 +577,7 @@ sal_uLong SvTreeList::GetChildCount( SvListEntry* pParent ) const
|*
*************************************************************************/
-sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry* pParent) const
+sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvTreeListEntry* pParent) const
{
DBG_ASSERT(pView,"GetVisChildCount:No View");
if ( !pParent )
@@ -596,7 +596,7 @@ sal_uLong SvTreeList::GetVisibleChildCount(const SvListView* pView, SvListEntry*
return nCount;
}
-sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry* pParent) const
+sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvTreeListEntry* pParent) const
{
DBG_ASSERT(pView,"GetChildSelCount:No View");
if ( !pParent )
@@ -623,10 +623,10 @@ sal_uLong SvTreeList::GetChildSelectionCount(const SvListView* pView,SvListEntry
|*
*************************************************************************/
-SvListEntry* SvTreeList::First() const
+SvTreeListEntry* SvTreeList::First() const
{
if ( nEntryCount )
- return (SvListEntry*)(*pRootItem->pChildren)[ 0 ];
+ return (SvTreeListEntry*)(*pRootItem->pChildren)[ 0 ];
else
return 0;
}
@@ -636,7 +636,7 @@ SvListEntry* SvTreeList::First() const
|* SvTreeList::Next
|*
*************************************************************************/
-SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) const
+SvTreeListEntry* SvTreeList::Next( SvTreeListEntry* pActEntry, sal_uInt16* pDepth ) const
{
DBG_ASSERT( pActEntry && pActEntry->pParent, "SvTreeList::Next: invalid entry/parent!" );
if ( !pActEntry || !pActEntry->pParent )
@@ -656,7 +656,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
if ( pActEntry->pChildren /* && pActEntry->pChildren->Count() */ )
{
nDepth++;
- pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ];
+ pActEntry = (SvTreeListEntry*)(*pActEntry->pChildren)[ 0 ];
if ( bWithDepth )
*pDepth = nDepth;
return pActEntry;
@@ -664,13 +664,13 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
if ( pActualList->size() > ( nActualPos + 1 ) )
{
- pActEntry = (SvListEntry*)(*pActualList)[ nActualPos + 1 ];
+ pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos + 1 ];
if ( bWithDepth )
*pDepth = nDepth;
return pActEntry;
}
- SvListEntry* pParent = pActEntry->pParent;
+ SvTreeListEntry* pParent = pActEntry->pParent;
nDepth--;
while( pParent != pRootItem && pParent != 0 )
{
@@ -680,7 +680,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
nActualPos = pParent->GetChildListPos();
if ( pActualList->size() > ( nActualPos + 1 ) )
{
- pActEntry = (SvListEntry*)(*pActualList)[ nActualPos + 1 ];
+ pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos + 1 ];
if ( bWithDepth )
*pDepth = nDepth;
return pActEntry;
@@ -696,7 +696,7 @@ SvListEntry* SvTreeList::Next( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
|* SvTreeList::Prev
|*
*************************************************************************/
-SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth ) const
+SvTreeListEntry* SvTreeList::Prev( SvTreeListEntry* pActEntry, sal_uInt16* pDepth ) const
{
DBG_ASSERT(pActEntry!=0,"Entry?");
@@ -745,12 +745,12 @@ SvListEntry* SvTreeList::Prev( SvListEntry* pActEntry, sal_uInt16* pDepth ) cons
|*
*************************************************************************/
-SvListEntry* SvTreeList::Last() const
+SvTreeListEntry* SvTreeList::Last() const
{
SvTreeEntryList* pActList = pRootItem->pChildren;
// if ( pActList->Count() == 0 )
// return 0;
- SvListEntry* pEntry = 0;
+ SvTreeListEntry* pEntry = 0;
while( pActList )
{
pEntry = pActList->back();
@@ -767,7 +767,7 @@ SvListEntry* SvTreeList::Last() const
|*
*************************************************************************/
-sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvListEntry* pEntry ) const
+sal_uLong SvTreeList::GetVisiblePos( const SvListView* pView, SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pView&&pEntry,"View/Entry?");
@@ -796,7 +796,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const
return pView->nVisibleCount;
sal_uLong nPos = 0;
- SvListEntry* pEntry = First(); // first entry is always visible
+ SvTreeListEntry* pEntry = First(); // first entry is always visible
while ( pEntry )
{
SvViewData* pViewData = pView->GetViewData( pEntry );
@@ -825,7 +825,7 @@ sal_uLong SvTreeList::GetVisibleCount( SvListView* pView ) const
// For performance reasons, this function assumes that the passed entry is
// already visible.
-SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEntry,sal_uInt16* pActDepth) const
+SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry* pActEntry,sal_uInt16* pActDepth) const
{
DBG_ASSERT(pView,"NextVisible:No View");
if ( !pActEntry )
@@ -846,7 +846,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn
{
DBG_ASSERT(pActEntry->pChildren,"Children?");
nDepth++;
- pActEntry = (SvListEntry*)(*pActEntry->pChildren)[ 0 ];
+ pActEntry = (SvTreeListEntry*)(*pActEntry->pChildren)[ 0 ];
if ( bWithDepth )
*pActDepth = nDepth;
return pActEntry;
@@ -855,13 +855,13 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn
nActualPos++;
if ( pActualList->size() > nActualPos )
{
- pActEntry = (SvListEntry*)(*pActualList)[ nActualPos ];
+ pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos ];
if ( bWithDepth )
*pActDepth = nDepth;
return pActEntry;
}
- SvListEntry* pParent = pActEntry->pParent;
+ SvTreeListEntry* pParent = pActEntry->pParent;
nDepth--;
while( pParent != pRootItem )
{
@@ -870,7 +870,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn
nActualPos++;
if ( pActualList->size() > nActualPos )
{
- pActEntry = (SvListEntry*)(*pActualList)[ nActualPos ];
+ pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos ];
if ( bWithDepth )
*pActDepth = nDepth;
return pActEntry;
@@ -891,7 +891,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pActEn
// For performance reasons, this function assumes that the passed entry is
// already visible.
-SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActEntry, sal_uInt16* pActDepth) const
+SvTreeListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvTreeListEntry* pActEntry, sal_uInt16* pActDepth) const
{
DBG_ASSERT(pView&&pActEntry,"PrevVis:View/Entry?");
@@ -908,7 +908,7 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE
if ( nActualPos > 0 )
{
- pActEntry = (SvListEntry*)(*pActualList)[ nActualPos - 1 ];
+ pActEntry = (SvTreeListEntry*)(*pActualList)[ nActualPos - 1 ];
while( pView->IsExpanded(pActEntry) )
{
pActualList = pActEntry->pChildren;
@@ -940,10 +940,10 @@ SvListEntry* SvTreeList::PrevVisible(const SvListView* pView, SvListEntry* pActE
|*
*************************************************************************/
-SvListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDepth) const
+SvTreeListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDepth) const
{
DBG_ASSERT(pView,"LastVis:No View");
- SvListEntry* pEntry = Last();
+ SvTreeListEntry* pEntry = Last();
while( pEntry && !IsEntryVisible( pView, pEntry ) )
pEntry = PrevVisible( pView, pEntry );
if ( pEntry && pDepth )
@@ -957,7 +957,7 @@ SvListEntry* SvTreeList::LastVisible( const SvListView* pView, sal_uInt16* pDept
|*
*************************************************************************/
-SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry,sal_uInt16& nDelta) const
+SvTreeListEntry* SvTreeList::NextVisible(const SvListView* pView,SvTreeListEntry* pEntry,sal_uInt16& nDelta) const
{
DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"NextVis:Wrong Prms/!Vis");
@@ -986,7 +986,7 @@ SvListEntry* SvTreeList::NextVisible(const SvListView* pView,SvListEntry* pEntry
|*
*************************************************************************/
-SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEntry, sal_uInt16& nDelta ) const
+SvTreeListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvTreeListEntry* pEntry, sal_uInt16& nDelta ) const
{
DBG_ASSERT(pView&&pEntry&&IsEntryVisible(pView,pEntry),"PrevVis:Parms/!Vis");
@@ -1012,31 +1012,31 @@ SvListEntry* SvTreeList::PrevVisible( const SvListView* pView, SvListEntry* pEnt
|*
*************************************************************************/
-SvListEntry* SvTreeList::FirstSelected( const SvListView* pView) const
+SvTreeListEntry* SvTreeList::FirstSelected( const SvListView* pView) const
{
DBG_ASSERT(pView,"FirstSel:No View");
if( !pView )
return 0;
- SvListEntry* pActSelEntry = First();
+ SvTreeListEntry* pActSelEntry = First();
while( pActSelEntry && !pView->IsSelected(pActSelEntry) )
pActSelEntry = NextVisible( pView, pActSelEntry );
return pActSelEntry;
}
-SvListEntry* SvTreeList::FirstChild( SvListEntry* pParent ) const
+SvTreeListEntry* SvTreeList::FirstChild( SvTreeListEntry* pParent ) const
{
if ( !pParent )
pParent = pRootItem;
- SvListEntry* pResult;
+ SvTreeListEntry* pResult;
if ( pParent->pChildren )
- pResult = (SvListEntry*)(*pParent->pChildren)[ 0 ];
+ pResult = (SvTreeListEntry*)(*pParent->pChildren)[ 0 ];
else
pResult = 0;
return pResult;
}
-SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::NextSibling( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"Entry?");
if( !pEntry )
@@ -1044,11 +1044,11 @@ SvListEntry* SvTreeList::NextSibling( SvListEntry* pEntry ) const
SvTreeEntryList* pList = pEntry->pParent->pChildren;
sal_uLong nPos = pEntry->GetChildListPos();
nPos++;
- pEntry = (SvListEntry*)(*pList)[ nPos ];
+ pEntry = (SvTreeListEntry*)(*pList)[ nPos ];
return pEntry;
}
-SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::PrevSibling( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"Entry?");
if( !pEntry )
@@ -1059,17 +1059,17 @@ SvListEntry* SvTreeList::PrevSibling( SvListEntry* pEntry ) const
if ( nPos == 0 )
return 0;
nPos--;
- pEntry = (SvListEntry*)(*pList)[ nPos ];
+ pEntry = (SvTreeListEntry*)(*pList)[ nPos ];
return pEntry;
}
-SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::LastSibling( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"LastSibling:Entry?");
if( !pEntry )
return 0;
- SvListEntry* pSib = 0;
+ SvTreeListEntry* pSib = 0;
SvTreeEntryList* pSibs = pEntry->pParent->pChildren;
if ( pSibs )
pSib = pSibs->back();
@@ -1083,7 +1083,7 @@ SvListEntry* SvTreeList::LastSibling( SvListEntry* pEntry ) const
|*
*************************************************************************/
-SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::NextSelected( const SvListView* pView, SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pView&&pEntry,"NextSel:View/Entry?");
pEntry = Next( pEntry );
@@ -1098,7 +1098,7 @@ SvListEntry* SvTreeList::NextSelected( const SvListView* pView, SvListEntry* pEn
|*
*************************************************************************/
-SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEntry) const
+SvTreeListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvTreeListEntry* pEntry) const
{
DBG_ASSERT(pView&&pEntry,"PrevSel:View/Entry?");
pEntry = Prev( pEntry );
@@ -1114,10 +1114,10 @@ SvListEntry* SvTreeList::PrevSelected( const SvListView* pView, SvListEntry* pEn
|*
*************************************************************************/
-SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const
+SvTreeListEntry* SvTreeList::LastSelected( const SvListView* pView ) const
{
DBG_ASSERT(pView,"LastSel:No View");
- SvListEntry* pEntry = Last();
+ SvTreeListEntry* pEntry = Last();
while( pEntry && !pView->IsSelected(pEntry) )
pEntry = Prev( pEntry );
return pEntry;
@@ -1128,7 +1128,7 @@ SvListEntry* SvTreeList::LastSelected( const SvListView* pView ) const
|* SvTreeList::Insert
|*
*************************************************************************/
-sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uLong nPos )
+sal_uLong SvTreeList::Insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
{
DBG_ASSERT( pEntry,"Entry?");
@@ -1170,7 +1170,7 @@ sal_uLong SvTreeList::Insert( SvListEntry* pEntry,SvListEntry* pParent,sal_uLong
|*
*************************************************************************/
-sal_uLong SvTreeList::GetAbsPos( SvListEntry* pEntry) const
+sal_uLong SvTreeList::GetAbsPos( SvTreeListEntry* pEntry) const
{
if ( !bAbsPositionsValid )
((SvTreeList*)this)->SetAbsolutePositions();
@@ -1186,7 +1186,7 @@ sal_uLong SvTreeList::GetAbsPos( SvListEntry* pEntry) const
void SvTreeList::SetAbsolutePositions()
{
sal_uLong nPos = 0;
- SvListEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
pEntry->nAbsPos = nPos;
@@ -1206,7 +1206,7 @@ CheckIntegrity();
|*
*************************************************************************/
-void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry )
+void SvTreeList::Expand( SvListView* pView, SvTreeListEntry* pEntry )
{
DBG_ASSERT(pEntry&&pView,"Expand:View/Entry?");
if ( pView->IsExpanded(pEntry) )
@@ -1216,7 +1216,7 @@ void SvTreeList::Expand( SvListView* pView, SvListEntry* pEntry )
SvViewData* pViewData = pView->GetViewData(pEntry);
pViewData->nFlags |= SVLISTENTRYFLAG_EXPANDED;
- SvListEntry* pParent = pEntry->pParent;
+ SvTreeListEntry* pParent = pEntry->pParent;
// if parent is visible, invalidate status data
if ( pView->IsExpanded( pParent ) )
{
@@ -1234,7 +1234,7 @@ CheckIntegrity();
|*
*************************************************************************/
-void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry )
+void SvTreeList::Collapse( SvListView* pView, SvTreeListEntry* pEntry )
{
DBG_ASSERT(pView&&pEntry,"Collapse:View/Entry?");
if ( !pView->IsExpanded(pEntry) )
@@ -1245,7 +1245,7 @@ void SvTreeList::Collapse( SvListView* pView, SvListEntry* pEntry )
SvViewData* pViewData = pView->GetViewData( pEntry );
pViewData->nFlags &=(~SVLISTENTRYFLAG_EXPANDED);
- SvListEntry* pParent = pEntry->pParent;
+ SvTreeListEntry* pParent = pEntry->pParent;
if ( pView->IsExpanded(pParent) )
{
pView->nVisibleCount = 0;
@@ -1263,7 +1263,7 @@ CheckIntegrity();
|*
*************************************************************************/
-sal_Bool SvTreeList::Select( SvListView* pView, SvListEntry* pEntry, sal_Bool bSelect )
+sal_Bool SvTreeList::Select( SvListView* pView, SvTreeListEntry* pEntry, sal_Bool bSelect )
{
DBG_ASSERT(pView&&pEntry,"Select:View/Entry?");
SvViewData* pViewData = pView->GetViewData( pEntry );
@@ -1298,7 +1298,7 @@ sal_Bool SvTreeList::Select( SvListView* pView, SvListEntry* pEntry, sal_Bool bS
|* SvTreeList::Remove
|*
*************************************************************************/
-sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
+sal_Bool SvTreeList::Remove( SvTreeListEntry* pEntry )
{
DBG_ASSERT(pEntry,"Cannot remove root, use clear");
@@ -1315,7 +1315,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
sal_uLong nRemoved = 1 + GetChildCount(pEntry);
bAbsPositionsValid = sal_False;
- SvListEntry* pParent = pEntry->pParent;
+ SvTreeListEntry* pParent = pEntry->pParent;
SvTreeEntryList* pList = pParent->pChildren;
DBG_ASSERT(pList,"Remove:No Childlist");
sal_Bool bLastEntry = sal_False;
@@ -1365,7 +1365,7 @@ sal_Bool SvTreeList::Remove( SvListEntry* pEntry )
void SvTreeList::SelectAll( SvListView* pView, sal_Bool bSelect )
{
DBG_ASSERT(pView,"SelectAll:NoView");
- SvListEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( pEntry )
{
SvViewData* pViewData = pView->GetViewData( pEntry );
@@ -1386,9 +1386,9 @@ CheckIntegrity();
}
-SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
+SvTreeListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
{
- SvListEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( nAbsPos && pEntry )
{
pEntry = Next( pEntry );
@@ -1397,10 +1397,10 @@ SvListEntry* SvTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
return pEntry;
}
-SvListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uLong nVisPos ) const
+SvTreeListEntry* SvTreeList::GetEntryAtVisPos( const SvListView* pView, sal_uLong nVisPos ) const
{
DBG_ASSERT(pView,"GetEntryAtVisPos:No View");
- SvListEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while ( nVisPos && pEntry )
{
pEntry = NextVisible( pView, pEntry );
@@ -1413,21 +1413,21 @@ void SvTreeList::SetListPositions( SvTreeEntryList* pList )
{
if( !pList->empty() )
{
- SvListEntry* pEntry = (SvListEntry*)(*pList)[ 0 ];
+ SvTreeListEntry* pEntry = (SvTreeListEntry*)(*pList)[ 0 ];
if( pEntry->pParent )
pEntry->pParent->InvalidateChildrensListPositions();
}
}
-void SvTreeList::InvalidateEntry( SvListEntry* pEntry )
+void SvTreeList::InvalidateEntry( SvTreeListEntry* pEntry )
{
Broadcast( LISTACTION_INVALIDATE_ENTRY, pEntry );
}
-SvListEntry* SvTreeList::GetRootLevelParent( SvListEntry* pEntry ) const
+SvTreeListEntry* SvTreeList::GetRootLevelParent( SvTreeListEntry* pEntry ) const
{
DBG_ASSERT(pEntry,"GetRootLevelParent:No Entry");
- SvListEntry* pCurParent = 0;
+ SvTreeListEntry* pCurParent = 0;
if ( pEntry )
{
pCurParent = pEntry->pParent;
@@ -1484,7 +1484,7 @@ void SvListView::InitTable()
maDataTable.clear();
}
- SvListEntry* pEntry;
+ SvTreeListEntry* pEntry;
SvViewData* pViewData;
// insert root entry
@@ -1504,7 +1504,7 @@ void SvListView::InitTable()
}
}
-SvViewData* SvListView::CreateViewData( SvListEntry* )
+SvViewData* SvListView::CreateViewData( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
return new SvViewData;
@@ -1519,7 +1519,7 @@ void SvListView::Clear()
if( pModel )
{
// insert root entry
- SvListEntry* pEntry = pModel->pRootItem;
+ SvTreeListEntry* pEntry = pModel->pRootItem;
SvViewData* pViewData = new SvViewData;
pViewData->nFlags = SVLISTENTRYFLAG_EXPANDED;
maDataTable.insert( pEntry, pViewData );
@@ -1551,47 +1551,47 @@ void SvListView::ModelHasCleared()
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelHasInserted( SvListEntry* )
+void SvListView::ModelHasInserted( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelHasInsertedTree( SvListEntry* )
+void SvListView::ModelHasInsertedTree( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelIsMoving( SvListEntry* /* pSource */ ,
- SvListEntry* /* pTargetParent */ , sal_uLong /* nPos */ )
+void SvListView::ModelIsMoving( SvTreeListEntry* /* pSource */ ,
+ SvTreeListEntry* /* pTargetParent */ , sal_uLong /* nPos */ )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelHasMoved( SvListEntry* )
+void SvListView::ModelHasMoved( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelIsRemoving( SvListEntry* )
+void SvListView::ModelIsRemoving( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelHasRemoved( SvListEntry* )
+void SvListView::ModelHasRemoved( SvTreeListEntry* )
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ModelHasEntryInvalidated( SvListEntry*)
+void SvListView::ModelHasEntryInvalidated( SvTreeListEntry*)
{
DBG_CHKTHIS(SvListView,0);
}
-void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong)
+void SvListView::ActionMoving( SvTreeListEntry* pEntry,SvTreeListEntry*,sal_uLong)
{
DBG_CHKTHIS(SvListView,0);
- SvListEntry* pParent = pEntry->pParent;
+ SvTreeListEntry* pParent = pEntry->pParent;
DBG_ASSERT(pParent,"Model not consistent");
if( pParent != pModel->pRootItem && pParent->pChildren->size() == 1 )
{
@@ -1603,8 +1603,8 @@ void SvListView::ActionMoving( SvListEntry* pEntry,SvListEntry*,sal_uLong)
bVisPositionsValid = sal_False;
}
-void SvListView::ActionMoved( SvListEntry* /* pEntry */ ,
- SvListEntry* /* pTargetPrnt */ ,
+void SvListView::ActionMoved( SvTreeListEntry* /* pEntry */ ,
+ SvTreeListEntry* /* pTargetPrnt */ ,
sal_uLong /* nChildPos */ )
{
DBG_CHKTHIS(SvListView,0);
@@ -1612,7 +1612,7 @@ void SvListView::ActionMoved( SvListEntry* /* pEntry */ ,
bVisPositionsValid = sal_False;
}
-void SvListView::ActionInserted( SvListEntry* pEntry )
+void SvListView::ActionInserted( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Insert:No Entry");
@@ -1630,7 +1630,7 @@ void SvListView::ActionInserted( SvListEntry* pEntry )
}
}
-void SvListView::ActionInsertedTree( SvListEntry* pEntry )
+void SvListView::ActionInsertedTree( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvListView,0);
if ( pModel->IsEntryVisible( this, pEntry ))
@@ -1639,7 +1639,7 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry )
bVisPositionsValid = sal_False;
}
// iterate over entry and its children
- SvListEntry* pCurEntry = pEntry;
+ SvTreeListEntry* pCurEntry = pEntry;
sal_uInt16 nRefDepth = pModel->GetDepth( pCurEntry );
while( pCurEntry )
{
@@ -1654,7 +1654,7 @@ void SvListView::ActionInsertedTree( SvListEntry* pEntry )
}
}
-void SvListView::RemoveViewData( SvListEntry* pParent )
+void SvListView::RemoveViewData( SvTreeListEntry* pParent )
{
SvTreeEntryList* pChildren = pParent->pChildren;
if (!pChildren)
@@ -1663,7 +1663,7 @@ void SvListView::RemoveViewData( SvListEntry* pParent )
SvTreeEntryList::iterator it = pChildren->begin(), itEnd = pChildren->end();
for (; it != itEnd; ++it)
{
- SvListEntry* pCur = *it;
+ SvTreeListEntry* pCur = *it;
maDataTable.erase(pCur);
if (pCur->HasChildren())
RemoveViewData(pCur);
@@ -1672,7 +1672,7 @@ void SvListView::RemoveViewData( SvListEntry* pParent )
-void SvListView::ActionRemoving( SvListEntry* pEntry )
+void SvListView::ActionRemoving( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvListView,0);
DBG_ASSERT(pEntry,"Remove:No Entry");
@@ -1700,7 +1700,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry )
maDataTable.erase(pEntry);
RemoveViewData( pEntry );
- SvListEntry* pCurEntry = pEntry->pParent;
+ SvTreeListEntry* pCurEntry = pEntry->pParent;
if ( pCurEntry && pCurEntry != pModel->pRootItem &&
pCurEntry->pChildren->size() == 1 )
{
@@ -1709,7 +1709,7 @@ void SvListView::ActionRemoving( SvListEntry* pEntry )
}
}
-void SvListView::ActionRemoved( SvListEntry* /* pEntry */ )
+void SvListView::ActionRemoved( SvTreeListEntry* /* pEntry */ )
{
DBG_CHKTHIS(SvListView,0);
}
@@ -1720,8 +1720,8 @@ void SvListView::ActionClear()
Clear();
}
-void SvListView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos )
+void SvListView::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1,
+ SvTreeListEntry* pEntry2, sal_uLong nPos )
{
DBG_CHKTHIS(SvListView,0);
switch( nActionId )
@@ -1770,11 +1770,11 @@ void SvListView::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
}
}
-void SvListView::InitViewData( SvViewData*, SvListEntry* )
+void SvListView::InitViewData( SvViewData*, SvTreeListEntry* )
{
}
-StringCompare SvTreeList::Compare( SvListEntry* pLeft, SvListEntry* pRight) const
+StringCompare SvTreeList::Compare( SvTreeListEntry* pLeft, SvTreeListEntry* pRight) const
{
if( aCompareLink.IsSet())
{
@@ -1794,7 +1794,7 @@ void SvTreeList::Resort()
Broadcast( LISTACTION_RESORTED );
}
-void SvTreeList::ResortChildren( SvListEntry* pParent )
+void SvTreeList::ResortChildren( SvTreeListEntry* pParent )
{
DBG_ASSERT(pParent,"Parent not set");
SvTreeEntryList* pChildList = pParent->pChildren;
@@ -1806,7 +1806,7 @@ void SvTreeList::ResortChildren( SvListEntry* pParent )
size_t nCount = aList.size();
for( size_t nCur = 0; nCur < nCount; nCur++ )
{
- SvListEntry* pCurEntry = (SvListEntry*)aList[ nCur ];
+ SvTreeListEntry* pCurEntry = (SvTreeListEntry*)aList[ nCur ];
sal_uLong nListPos = ULONG_MAX;
GetInsertionPos( pCurEntry, pParent, nListPos );
pChildList->insert( pCurEntry, nListPos );
@@ -1816,7 +1816,7 @@ void SvTreeList::ResortChildren( SvListEntry* pParent )
SetListPositions( (SvTreeEntryList*)pChildList );
}
-void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
+void SvTreeList::GetInsertionPos( SvTreeListEntry* pEntry, SvTreeListEntry* pParent,
sal_uLong& rPos )
{
DBG_ASSERT(pEntry,"No Entry");
@@ -1837,7 +1837,7 @@ void SvTreeList::GetInsertionPos( SvListEntry* pEntry, SvListEntry* pParent,
do
{
k = (i+j)/2;
- SvListEntry* pTempEntry = (SvListEntry*)(*pChildList)[ k ];
+ SvTreeListEntry* pTempEntry = (SvTreeListEntry*)(*pChildList)[ k ];
eCompare = Compare( pEntry, pTempEntry );
if( eSortMode == SortDescending && eCompare != COMPARE_EQUAL )
{
diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx
index a16efd6e9e4b..8bce6bb4918a 100644
--- a/svtools/source/contnr/treelistbox.cxx
+++ b/svtools/source/contnr/treelistbox.cxx
@@ -351,7 +351,7 @@ long SvLBoxTab::CalcOffset( long nItemWidth, long nTabWidth )
DBG_NAME(SvLBoxItem);
-SvLBoxItem::SvLBoxItem( SvLBoxEntry*, sal_uInt16 )
+SvLBoxItem::SvLBoxItem( SvTreeListEntry*, sal_uInt16 )
{
DBG_CTOR(SvLBoxItem,0);
}
@@ -366,7 +366,7 @@ SvLBoxItem::~SvLBoxItem()
DBG_DTOR(SvLBoxItem,0);
}
-const Size& SvLBoxItem::GetSize( SvTreeListBox* pView,SvLBoxEntry* pEntry )
+const Size& SvLBoxItem::GetSize( SvTreeListBox* pView,SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvLBoxItem,0);
SvViewDataItem* pViewData = pView->GetViewDataItem( pEntry, this );
@@ -385,69 +385,69 @@ SvViewDataItem::~SvViewDataItem()
DBG_DTOR(SvViewDataItem,0);
}
-SvLBoxEntry* SvLBoxTreeList::First() const
+SvTreeListEntry* SvLBoxTreeList::First() const
{
- return (SvLBoxEntry*)SvTreeList::First();
+ return (SvTreeListEntry*)SvTreeList::First();
}
-SvLBoxEntry* SvLBoxTreeList::Next( SvListEntry* pEntry, sal_uInt16* pDepth ) const
+SvTreeListEntry* SvLBoxTreeList::Next( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const
{
- return (SvLBoxEntry*)SvTreeList::Next(pEntry,pDepth);
+ return (SvTreeListEntry*)SvTreeList::Next(pEntry,pDepth);
}
-SvLBoxEntry* SvLBoxTreeList::Prev( SvListEntry* pEntry, sal_uInt16* pDepth ) const
+SvTreeListEntry* SvLBoxTreeList::Prev( SvTreeListEntry* pEntry, sal_uInt16* pDepth ) const
{
- return (SvLBoxEntry*)SvTreeList::Prev(pEntry,pDepth);
+ return (SvTreeListEntry*)SvTreeList::Prev(pEntry,pDepth);
}
-SvLBoxEntry* SvLBoxTreeList::Last() const
+SvTreeListEntry* SvLBoxTreeList::Last() const
{
- return (SvLBoxEntry*)SvTreeList::Last();
+ return (SvTreeListEntry*)SvTreeList::Last();
}
-SvLBoxEntry* SvLBoxTreeList::Clone( SvListEntry* pEntry, sal_uLong& nCloneCount ) const
+SvTreeListEntry* SvLBoxTreeList::Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const
{
- return (SvLBoxEntry*)SvTreeList::Clone(pEntry,nCloneCount);
+ return (SvTreeListEntry*)SvTreeList::Clone(pEntry,nCloneCount);
}
-SvLBoxEntry* SvLBoxTreeList::GetEntry( SvListEntry* pParent, sal_uLong nPos ) const
+SvTreeListEntry* SvLBoxTreeList::GetEntry( SvTreeListEntry* pParent, sal_uLong nPos ) const
{
- return (SvLBoxEntry*)SvTreeList::GetEntry(pParent,nPos);
+ return (SvTreeListEntry*)SvTreeList::GetEntry(pParent,nPos);
}
-SvLBoxEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const
+SvTreeListEntry* SvLBoxTreeList::GetEntry( sal_uLong nRootPos ) const
{
- return (SvLBoxEntry*)SvTreeList::GetEntry(nRootPos);
+ return (SvTreeListEntry*)SvTreeList::GetEntry(nRootPos);
}
-SvLBoxEntry* SvLBoxTreeList::GetParent( SvListEntry* pEntry ) const
+SvTreeListEntry* SvLBoxTreeList::GetParent( SvTreeListEntry* pEntry ) const
{
- return (SvLBoxEntry*)SvTreeList::GetParent(pEntry);
+ return (SvTreeListEntry*)SvTreeList::GetParent(pEntry);
}
-SvLBoxEntry* SvLBoxTreeList::FirstChild( SvLBoxEntry* pParent ) const
+SvTreeListEntry* SvLBoxTreeList::FirstChild( SvTreeListEntry* pParent ) const
{
- return (SvLBoxEntry*)SvTreeList::FirstChild(pParent);
+ return (SvTreeListEntry*)SvTreeList::FirstChild(pParent);
}
-SvLBoxEntry* SvLBoxTreeList::NextSibling( SvLBoxEntry* pEntry ) const
+SvTreeListEntry* SvLBoxTreeList::NextSibling( SvTreeListEntry* pEntry ) const
{
- return (SvLBoxEntry*)SvTreeList::NextSibling(pEntry);
+ return (SvTreeListEntry*)SvTreeList::NextSibling(pEntry);
}
-SvLBoxEntry* SvLBoxTreeList::PrevSibling( SvLBoxEntry* pEntry ) const
+SvTreeListEntry* SvLBoxTreeList::PrevSibling( SvTreeListEntry* pEntry ) const
{
- return (SvLBoxEntry*)SvTreeList::PrevSibling(pEntry);
+ return (SvTreeListEntry*)SvTreeList::PrevSibling(pEntry);
}
-SvLBoxEntry* SvLBoxTreeList::LastSibling( SvLBoxEntry* pEntry ) const
+SvTreeListEntry* SvLBoxTreeList::LastSibling( SvTreeListEntry* pEntry ) const
{
- return (SvLBoxEntry*)SvTreeList::LastSibling(pEntry);
+ return (SvTreeListEntry*)SvTreeList::LastSibling(pEntry);
}
-SvLBoxEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
+SvTreeListEntry* SvLBoxTreeList::GetEntryAtAbsPos( sal_uLong nAbsPos ) const
{
- return (SvLBoxEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos);
+ return (SvTreeListEntry*)SvTreeList::GetEntryAtAbsPos( nAbsPos);
}
// ***************************************************************
@@ -566,21 +566,21 @@ bool SvTreeListBox::IsEntryMnemonicsEnabled() const
return mpImpl->m_bEntryMnemonicsEnabled;
}
-IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvListEntry*, pEntry )
+IMPL_LINK_INLINE_START( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
- return (long)(CloneEntry((SvLBoxEntry*)pEntry));
+ return (long)(CloneEntry((SvTreeListEntry*)pEntry));
}
-IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvListEntry*, pEntry )
+IMPL_LINK_INLINE_END( SvTreeListBox, CloneHdl_Impl, SvTreeListEntry*, pEntry )
-sal_uLong SvTreeListBox::Insert( SvLBoxEntry* pEntry, SvLBoxEntry* pParent, sal_uLong nPos )
+sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry, SvTreeListEntry* pParent, sal_uLong nPos )
{
DBG_CHKTHIS(SvTreeListBox,0);
sal_uLong nInsPos = pModel->Insert( pEntry, pParent, nPos );
return nInsPos;
}
-sal_uLong SvTreeListBox::Insert( SvLBoxEntry* pEntry,sal_uLong nRootPos )
+sal_uLong SvTreeListBox::Insert( SvTreeListEntry* pEntry,sal_uLong nRootPos )
{
DBG_CHKTHIS(SvTreeListBox,0);
sal_uLong nInsPos = pModel->Insert( pEntry, nRootPos );
@@ -658,7 +658,7 @@ sal_Bool SvTreeListBox::CheckDragAndDropMode( SvTreeListBox* pSource, sal_Int8 n
-void SvTreeListBox::NotifyRemoving( SvLBoxEntry* )
+void SvTreeListBox::NotifyRemoving( SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
}
@@ -679,17 +679,17 @@ void SvTreeListBox::NotifyRemoving( SvLBoxEntry* )
*/
#ifdef DBG_UTIL
sal_Bool SvTreeListBox::NotifyMoving(
- SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel()
- SvLBoxEntry* pEntry, // entry that we want to move, from
+ SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
+ SvTreeListEntry* pEntry, // entry that we want to move, from
// GetSourceListBox()->GetModel()
- SvLBoxEntry*& rpNewParent, // new target parent
+ SvTreeListEntry*& rpNewParent, // new target parent
sal_uLong& rNewChildPos) // position in childlist of target parent
#else
sal_Bool SvTreeListBox::NotifyMoving(
- SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel()
- SvLBoxEntry*, // entry that we want to move, from
+ SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
+ SvTreeListEntry*, // entry that we want to move, from
// GetSourceListBox()->GetModel()
- SvLBoxEntry*& rpNewParent, // new target parent
+ SvTreeListEntry*& rpNewParent, // new target parent
sal_uLong& rNewChildPos) // position in childlist of target parent
#endif
{
@@ -722,10 +722,10 @@ sal_Bool SvTreeListBox::NotifyMoving(
}
sal_Bool SvTreeListBox::NotifyCopying(
- SvLBoxEntry* pTarget, // D&D dropping position in this->GetModel()
- SvLBoxEntry* pEntry, // entry that we want to move, from
+ SvTreeListEntry* pTarget, // D&D dropping position in this->GetModel()
+ SvTreeListEntry* pEntry, // entry that we want to move, from
// GetSourceListBox()->GetModel()
- SvLBoxEntry*& rpNewParent, // new target parent
+ SvTreeListEntry*& rpNewParent, // new target parent
sal_uLong& rNewChildPos) // position in childlist of target parent
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -733,7 +733,7 @@ sal_Bool SvTreeListBox::NotifyCopying(
}
// return: all entries copied
-sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget )
+sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget )
{
DBG_CHKTHIS(SvTreeListBox,0);
nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying
@@ -745,7 +745,7 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar
// cache selection to simplify iterating over the selection when doing a D&D
// exchange within the same listbox
- SvLBoxEntry* pSourceEntry = pSource->FirstSelected();
+ SvTreeListEntry* pSourceEntry = pSource->FirstSelected();
while ( pSourceEntry )
{
// children are copied automatically
@@ -757,8 +757,8 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar
SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end();
for (; it != itEnd; ++it)
{
- pSourceEntry = static_cast<SvLBoxEntry*>(*it);
- SvLBoxEntry* pNewParent = 0;
+ pSourceEntry = static_cast<SvTreeListEntry*>(*it);
+ SvTreeListEntry* pNewParent = 0;
sal_uLong nInsertionPos = ULONG_MAX;
sal_Bool bOk=NotifyCopying(pTarget,pSourceEntry,pNewParent,nInsertionPos);
if ( bOk )
@@ -766,15 +766,15 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar
if ( bClone )
{
sal_uLong nCloneCount = 0;
- pSourceEntry = (SvLBoxEntry*)
- pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount );
- pModel->InsertTree( (SvListEntry*)pSourceEntry,
- (SvListEntry*)pNewParent, nInsertionPos );
+ pSourceEntry = (SvTreeListEntry*)
+ pModel->Clone( (SvTreeListEntry*)pSourceEntry, nCloneCount );
+ pModel->InsertTree( (SvTreeListEntry*)pSourceEntry,
+ (SvTreeListEntry*)pNewParent, nInsertionPos );
}
else
{
- sal_uLong nListPos = pModel->Copy( (SvListEntry*)pSourceEntry,
- (SvListEntry*)pNewParent, nInsertionPos );
+ sal_uLong nListPos = pModel->Copy( (SvTreeListEntry*)pSourceEntry,
+ (SvTreeListEntry*)pNewParent, nInsertionPos );
pSourceEntry = GetEntry( pNewParent, nListPos );
}
}
@@ -789,12 +789,12 @@ sal_Bool SvTreeListBox::CopySelection( SvTreeListBox* pSource, SvLBoxEntry* pTar
}
// return: all entries were moved
-sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvLBoxEntry* pTarget )
+sal_Bool SvTreeListBox::MoveSelection( SvTreeListBox* pSource, SvTreeListEntry* pTarget )
{
return MoveSelectionCopyFallbackPossible( pSource, pTarget, sal_False );
}
-sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvLBoxEntry* pTarget, sal_Bool bAllowCopyFallback )
+sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSource, SvTreeListEntry* pTarget, sal_Bool bAllowCopyFallback )
{
DBG_CHKTHIS(SvTreeListBox,0);
nCurEntrySelPos = 0; // selection counter for NotifyMoving/Copying
@@ -805,7 +805,7 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc
if ( bClone )
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
- SvLBoxEntry* pSourceEntry = pSource->FirstSelected();
+ SvTreeListEntry* pSourceEntry = pSource->FirstSelected();
while ( pSourceEntry )
{
// children are automatically moved
@@ -817,9 +817,9 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc
SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end();
for (; it != itEnd; ++it)
{
- pSourceEntry = static_cast<SvLBoxEntry*>(*it);
+ pSourceEntry = static_cast<SvTreeListEntry*>(*it);
- SvLBoxEntry* pNewParent = 0;
+ SvTreeListEntry* pNewParent = 0;
sal_uLong nInsertionPos = ULONG_MAX;
sal_Bool bOk = NotifyMoving(pTarget,pSourceEntry,pNewParent,nInsertionPos);
sal_Bool bCopyOk = bOk;
@@ -834,19 +834,19 @@ sal_Bool SvTreeListBox::MoveSelectionCopyFallbackPossible( SvTreeListBox* pSourc
if ( bClone )
{
sal_uLong nCloneCount = 0;
- pSourceEntry = (SvLBoxEntry*)
- pModel->Clone( (SvListEntry*)pSourceEntry, nCloneCount );
- pModel->InsertTree( (SvListEntry*)pSourceEntry,
- (SvListEntry*)pNewParent, nInsertionPos );
+ pSourceEntry = (SvTreeListEntry*)
+ pModel->Clone( (SvTreeListEntry*)pSourceEntry, nCloneCount );
+ pModel->InsertTree( (SvTreeListEntry*)pSourceEntry,
+ (SvTreeListEntry*)pNewParent, nInsertionPos );
}
else
{
if ( bOk )
- pModel->Move( (SvListEntry*)pSourceEntry,
- (SvListEntry*)pNewParent, nInsertionPos );
+ pModel->Move( (SvTreeListEntry*)pSourceEntry,
+ (SvTreeListEntry*)pNewParent, nInsertionPos );
else
- pModel->Copy( (SvListEntry*)pSourceEntry,
- (SvListEntry*)pNewParent, nInsertionPos );
+ pModel->Copy( (SvTreeListEntry*)pSourceEntry,
+ (SvTreeListEntry*)pNewParent, nInsertionPos );
}
}
else
@@ -865,7 +865,7 @@ void SvTreeListBox::RemoveSelection()
SvTreeEntryList aList;
// cache selection, as the implementation deselects everything on the first
// remove
- SvLBoxEntry* pEntry = FirstSelected();
+ SvTreeListEntry* pEntry = FirstSelected();
while ( pEntry )
{
aList.push_back( pEntry );
@@ -878,7 +878,7 @@ void SvTreeListBox::RemoveSelection()
SvTreeEntryList::iterator it = aList.begin(), itEnd = aList.end();
for (; it != itEnd; ++it)
{
- pEntry = static_cast<SvLBoxEntry*>(*it);
+ pEntry = static_cast<SvTreeListEntry*>(*it);
pModel->Remove(pEntry);
}
}
@@ -891,7 +891,7 @@ SvTreeListBox* SvTreeListBox::GetSourceView() const
void SvTreeListBox::RecalcViewData()
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while( pEntry )
{
sal_uInt16 nCount = pEntry->ItemCount();
@@ -907,12 +907,12 @@ void SvTreeListBox::RecalcViewData()
}
}
-void SvTreeListBox::ViewDataInitialized( SvLBoxEntry* )
+void SvTreeListBox::ViewDataInitialized( SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
}
-void SvTreeListBox::ImplShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool bShow)
+void SvTreeListBox::ImplShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool bShow)
{
DBG_CHKTHIS(SvTreeListBox,0);
if ( bShow && (nImpFlags & SVLBOX_TARGEMPH_VIS) )
@@ -932,12 +932,12 @@ void SvTreeListBox::OnCurrentEntryChanged()
mpImpl->m_aQuickSelectionEngine.Reset();
}
-SvLBoxEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const
+SvTreeListEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _rPath ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxEntry* pEntry = NULL;
- SvLBoxEntry* pParent = NULL;
+ SvTreeListEntry* pEntry = NULL;
+ SvTreeListEntry* pParent = NULL;
for( ::std::deque< sal_Int32 >::const_iterator pItem = _rPath.begin(); pItem != _rPath.end(); ++pItem )
{
pEntry = GetEntry( pParent, *pItem );
@@ -949,19 +949,19 @@ SvLBoxEntry* SvTreeListBox::GetEntryFromPath( const ::std::deque< sal_Int32 >& _
return pEntry;
}
-void SvTreeListBox::FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const
+void SvTreeListBox::FillEntryPath( SvTreeListEntry* pEntry, ::std::deque< sal_Int32 >& _rPath ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
if ( pEntry )
{
- SvLBoxEntry* pParentEntry = GetParent( pEntry );
+ SvTreeListEntry* pParentEntry = GetParent( pEntry );
while ( sal_True )
{
sal_uLong i, nCount = GetLevelChildCount( pParentEntry );
for ( i = 0; i < nCount; ++i )
{
- SvLBoxEntry* pTemp = GetEntry( pParentEntry, i );
+ SvTreeListEntry* pTemp = GetEntry( pParentEntry, i );
DBG_ASSERT( pEntry, "invalid entry" );
if ( pEntry == pTemp )
{
@@ -981,12 +981,12 @@ void SvTreeListBox::FillEntryPath( SvLBoxEntry* pEntry, ::std::deque< sal_Int32
}
}
-sal_uLong SvTreeListBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const
+sal_uLong SvTreeListBox::GetLevelChildCount( SvTreeListEntry* _pParent ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
sal_uLong nCount = 0;
- SvLBoxEntry* pEntry = FirstChild( _pParent );
+ SvTreeListEntry* pEntry = FirstChild( _pParent );
while ( pEntry )
{
++nCount;
@@ -996,17 +996,17 @@ sal_uLong SvTreeListBox::GetLevelChildCount( SvLBoxEntry* _pParent ) const
return nCount;
}
-SvViewData* SvTreeListBox::CreateViewData( SvListEntry* )
+SvViewData* SvTreeListBox::CreateViewData( SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvViewDataEntry* pEntryData = new SvViewDataEntry;
return (SvViewData*)pEntryData;
}
-void SvTreeListBox::InitViewData( SvViewData* pData, SvListEntry* pEntry )
+void SvTreeListBox::InitViewData( SvViewData* pData, SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxEntry* pInhEntry = (SvLBoxEntry*)pEntry;
+ SvTreeListEntry* pInhEntry = (SvTreeListEntry*)pEntry;
SvViewDataEntry* pEntryData = (SvViewDataEntry*)pData;
pEntryData->pItemData = new SvViewDataItem[ pInhEntry->ItemCount() ];
@@ -1029,9 +1029,9 @@ void SvTreeListBox::EnableSelectionAsDropTarget( sal_Bool bEnable, sal_Bool bWit
{
DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nRefDepth;
- SvLBoxEntry* pTemp;
+ SvTreeListEntry* pTemp;
- SvLBoxEntry* pSelEntry = FirstSelected();
+ SvTreeListEntry* pSelEntry = FirstSelected();
while( pSelEntry )
{
if ( !bEnable )
@@ -1144,17 +1144,17 @@ void SvTreeListBox::ForbidEmptyText()
mpImpl->m_bIsEmptyTextAllowed = false;
}
-SvLBoxEntry* SvTreeListBox::CreateEntry() const
+SvTreeListEntry* SvTreeListBox::CreateEntry() const
{
DBG_CHKTHIS(SvTreeListBox,0);
- return new SvLBoxEntry;
+ return new SvTreeListEntry;
}
const void* SvTreeListBox::FirstSearchEntry( String& _rEntryText ) const
{
- SvLBoxEntry* pEntry = GetCurEntry();
+ SvTreeListEntry* pEntry = GetCurEntry();
if ( pEntry )
- pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) );
+ pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( NextSearchEntry( pEntry, _rEntryText ) ) );
else
{
pEntry = FirstSelected();
@@ -1170,7 +1170,7 @@ const void* SvTreeListBox::FirstSearchEntry( String& _rEntryText ) const
const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, String& _rEntryText ) const
{
- SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pCurrentSearchEntry ) );
+ SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pCurrentSearchEntry ) );
if ( ( ( GetChildCount( pEntry ) > 0 )
|| ( pEntry->HasChildrenOnDemand() )
@@ -1196,7 +1196,7 @@ const void* SvTreeListBox::NextSearchEntry( const void* _pCurrentSearchEntry, St
void SvTreeListBox::SelectSearchEntry( const void* _pEntry )
{
- SvLBoxEntry* pEntry = const_cast< SvLBoxEntry* >( static_cast< const SvLBoxEntry* >( _pEntry ) );
+ SvTreeListEntry* pEntry = const_cast< SvTreeListEntry* >( static_cast< const SvTreeListEntry* >( _pEntry ) );
DBG_ASSERT( pEntry, "SvTreeListBox::SelectSearchEntry: invalid entry!" );
if ( !pEntry )
return;
@@ -1214,7 +1214,7 @@ void SvTreeListBox::ExecuteSearchEntry( const void* /*_pEntry*/ ) const
::vcl::StringEntryIdentifier SvTreeListBox::CurrentEntry( String& _out_entryText ) const
{
// always accept the current entry if there is one
- SvLBoxEntry* pCurrentEntry( GetCurEntry() );
+ SvTreeListEntry* pCurrentEntry( GetCurEntry() );
if ( pCurrentEntry )
{
_out_entryText = GetEntryText( pCurrentEntry );
@@ -1286,7 +1286,7 @@ sal_Int8 SvTreeListBox::AcceptDrop( const AcceptDropEvent& rEvt )
}
else
{
- SvLBoxEntry* pEntry = GetDropTarget( rEvt.maPosPixel );
+ SvTreeListEntry* pEntry = GetDropTarget( rEvt.maPosPixel );
if( !IsDropFormatSupported( SOT_FORMATSTR_ID_TREELISTBOX ) )
{
SAL_WARN( "svtools.contnr", "SvTreeListBox::QueryDrop(): no format" );
@@ -1347,7 +1347,7 @@ sal_Int8 SvTreeListBox::ExecuteDrop( const ExecuteDropEvent& rEvt, SvTreeListBox
ReadDragServerInfo( rEvt.maPosPixel, &aDDInfo );
- SvLBoxEntry* pTarget = pTargetEntry; // may be 0!
+ SvTreeListEntry* pTarget = pTargetEntry; // may be 0!
if( DND_ACTION_COPY == rEvt.mnAction )
{
@@ -1388,7 +1388,7 @@ void SvTreeListBox::StartDrag( sal_Int8, const Point& rPosPixel )
ReleaseMouse();
- SvLBoxEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos );
+ SvTreeListEntry* pEntry = GetEntry( rPosPixel ); // GetDropTarget( rPos );
if( !pEntry )
{
DragFinished( DND_ACTION_NONE );
@@ -1458,13 +1458,13 @@ nAction
nDragDropMode = nOldDragMode;
}
-DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvLBoxEntry* )
+DragDropMode SvTreeListBox::NotifyStartDrag( TransferDataContainer&, SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
return (DragDropMode)0xffff;
}
-sal_Bool SvTreeListBox::NotifyAcceptDrop( SvLBoxEntry* )
+sal_Bool SvTreeListBox::NotifyAcceptDrop( SvTreeListEntry* )
{
DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
@@ -1601,7 +1601,7 @@ void SvTreeListBox::SetBaseModel( SvLBoxTreeList* pNewModel )
// does the CleanUp
SvListView::SetModel( pNewModel );
pModel->SetCloneLink( LINK(this, SvTreeListBox, CloneHdl_Impl ));
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
while( pEntry )
{
ModelHasInserted( pEntry );
@@ -1782,7 +1782,7 @@ void SvTreeListBox::SetTabs()
pImp->NotifyTabsChanged();
}
-void SvTreeListBox::InitEntry( SvLBoxEntry* pEntry,
+void SvTreeListBox::InitEntry( SvTreeListEntry* pEntry,
const XubString& aStr, const Image& aCollEntryBmp, const Image& aExpEntryBmp,
SvLBoxButtonKind eButtonKind)
{
@@ -1805,7 +1805,7 @@ void SvTreeListBox::InitEntry( SvLBoxEntry* pEntry,
pEntry->AddItem( pString );
}
-String SvTreeListBox::GetEntryText(SvLBoxEntry* pEntry) const
+String SvTreeListBox::GetEntryText(SvTreeListEntry* pEntry) const
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT( pEntry, "SvTreeListBox::GetEntryText(): no entry" );
@@ -1814,7 +1814,7 @@ String SvTreeListBox::GetEntryText(SvLBoxEntry* pEntry) const
return pItem->GetText();
}
-String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const
+String SvTreeListBox::SearchEntryText( SvTreeListEntry* pEntry ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT( pEntry, "SvTreeListBox::SearchEntryText(): no entry" );
@@ -1835,7 +1835,7 @@ String SvTreeListBox::SearchEntryText( SvLBoxEntry* pEntry ) const
return sRet;
}
-const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const
+const Image& SvTreeListBox::GetExpandedEntryBmp(SvTreeListEntry* pEntry) const
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Entry?");
@@ -1844,7 +1844,7 @@ const Image& SvTreeListBox::GetExpandedEntryBmp(SvLBoxEntry* pEntry) const
return pItem->GetBitmap2( );
}
-const Image& SvTreeListBox::GetCollapsedEntryBmp( SvLBoxEntry* pEntry ) const
+const Image& SvTreeListBox::GetCollapsedEntryBmp( SvTreeListEntry* pEntry ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Entry?");
@@ -1862,9 +1862,9 @@ IMPL_LINK_INLINE_START( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pDa
}
IMPL_LINK_INLINE_END( SvTreeListBox, CheckButtonClick, SvLBoxButtonData *, pData )
-SvLBoxEntry* SvTreeListBox::InsertEntry(
+SvTreeListEntry* SvTreeListBox::InsertEntry(
const XubString& aText,
- SvLBoxEntry* pParent,
+ SvTreeListEntry* pParent,
sal_Bool bChildrenOnDemand, sal_uLong nPos,
void* pUser,
SvLBoxButtonKind eButtonKind
@@ -1879,7 +1879,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry(
aCurInsertedExpBmp = rDefExpBmp;
aCurInsertedColBmp = rDefColBmp;
- SvLBoxEntry* pEntry = CreateEntry();
+ SvTreeListEntry* pEntry = CreateEntry();
pEntry->SetUserData( pUser );
InitEntry( pEntry, aText, rDefColBmp, rDefExpBmp, eButtonKind );
pEntry->EnableChildrenOnDemand( bChildrenOnDemand );
@@ -1897,9 +1897,9 @@ SvLBoxEntry* SvTreeListBox::InsertEntry(
return pEntry;
}
-SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
+SvTreeListEntry* SvTreeListBox::InsertEntry( const XubString& aText,
const Image& aExpEntryBmp, const Image& aCollEntryBmp,
- SvLBoxEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser,
+ SvTreeListEntry* pParent, sal_Bool bChildrenOnDemand, sal_uLong nPos, void* pUser,
SvLBoxButtonKind eButtonKind )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -1908,7 +1908,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
aCurInsertedExpBmp = aExpEntryBmp;
aCurInsertedColBmp = aCollEntryBmp;
- SvLBoxEntry* pEntry = CreateEntry();
+ SvTreeListEntry* pEntry = CreateEntry();
pEntry->SetUserData( pUser );
InitEntry( pEntry, aText, aCollEntryBmp, aExpEntryBmp, eButtonKind );
@@ -1927,7 +1927,7 @@ SvLBoxEntry* SvTreeListBox::InsertEntry( const XubString& aText,
return pEntry;
}
-void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr)
+void SvTreeListBox::SetEntryText( SvTreeListEntry* pEntry, const XubString& aStr)
{
DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxString* pItem = (SvLBoxString*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXSTRING));
@@ -1937,7 +1937,7 @@ void SvTreeListBox::SetEntryText( SvLBoxEntry* pEntry, const XubString& aStr)
GetModel()->InvalidateEntry( pEntry );
}
-void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp )
+void SvTreeListBox::SetExpandedEntryBmp( SvTreeListEntry* pEntry, const Image& aBmp )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
@@ -1956,7 +1956,7 @@ void SvTreeListBox::SetExpandedEntryBmp( SvLBoxEntry* pEntry, const Image& aBmp
}
}
-void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp )
+void SvTreeListBox::SetCollapsedEntryBmp(SvTreeListEntry* pEntry,const Image& aBmp )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxContextBmp* pItem = (SvLBoxContextBmp*)(pEntry->GetFirstItem(SV_ITEM_ID_LBOXCONTEXTBMP));
@@ -1975,11 +1975,11 @@ void SvTreeListBox::SetCollapsedEntryBmp(SvLBoxEntry* pEntry,const Image& aBmp )
}
}
-void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry )
+void SvTreeListBox::ImpEntryInserted( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxEntry* pParent = (SvLBoxEntry*)pModel->GetParent( pEntry );
+ SvTreeListEntry* pParent = (SvTreeListEntry*)pModel->GetParent( pEntry );
if( pParent )
{
sal_uInt16 nFlags = pParent->GetFlags();
@@ -2004,7 +2004,7 @@ void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry )
nTreeFlags |= TREEFLAG_RECALCTABS;
}
}
- SetEntryHeight( (SvLBoxEntry*)pEntry );
+ SetEntryHeight( (SvTreeListEntry*)pEntry );
if( nTreeFlags & TREEFLAG_CHKBTN )
{
@@ -2023,7 +2023,7 @@ void SvTreeListBox::ImpEntryInserted( SvLBoxEntry* pEntry )
-void SvTreeListBox::SetCheckButtonState( SvLBoxEntry* pEntry, SvButtonState eState)
+void SvTreeListBox::SetCheckButtonState( SvTreeListEntry* pEntry, SvButtonState eState)
{
DBG_CHKTHIS(SvTreeListBox,0);
if( nTreeFlags & TREEFLAG_CHKBTN )
@@ -2049,7 +2049,7 @@ void SvTreeListBox::SetCheckButtonState( SvLBoxEntry* pEntry, SvButtonState eSta
}
}
-SvButtonState SvTreeListBox::GetCheckButtonState( SvLBoxEntry* pEntry ) const
+SvButtonState SvTreeListBox::GetCheckButtonState( SvTreeListEntry* pEntry ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
SvButtonState eState = SV_BUTTON_UNCHECKED;
@@ -2075,11 +2075,11 @@ void SvTreeListBox::CheckButtonHdl()
//
// TODO: Currently all data is cloned so that they conform to the default tree
// view format. Actually, the model should be used as a reference here. This
-// leads to us _not_ calling SvLBoxEntry::Clone, but only its base class
-// SvListEntry.
+// leads to us _not_ calling SvTreeListEntry::Clone, but only its base class
+// SvTreeListEntry.
//
-SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
+SvTreeListEntry* SvTreeListBox::CloneEntry( SvTreeListEntry* pSource )
{
DBG_CHKTHIS(SvTreeListBox,0);
XubString aStr;
@@ -2099,9 +2099,9 @@ SvLBoxEntry* SvTreeListBox::CloneEntry( SvLBoxEntry* pSource )
SvLBoxButton* pButtonItem = (SvLBoxButton*)(pSource->GetFirstItem(SV_ITEM_ID_LBOXBUTTON));
if( pButtonItem )
eButtonKind = pButtonItem->GetKind();
- SvLBoxEntry* pClone = CreateEntry();
+ SvTreeListEntry* pClone = CreateEntry();
InitEntry( pClone, aStr, aCollEntryBmp, aExpEntryBmp, eButtonKind );
- pClone->SvListEntry::Clone( pSource );
+ pClone->SvTreeListEntry::Clone( pSource );
pClone->EnableChildrenOnDemand( pSource->HasChildrenOnDemand() );
pClone->SetUserData( pSource->GetUserData() );
@@ -2192,13 +2192,13 @@ void SvTreeListBox::SetNodeBitmaps( const Image& rCollapsedNodeBmp, const Image&
SetTabs();
}
-sal_Bool SvTreeListBox::EditingEntry( SvLBoxEntry*, Selection& )
+sal_Bool SvTreeListBox::EditingEntry( SvTreeListEntry*, Selection& )
{
DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
}
-sal_Bool SvTreeListBox::EditedEntry( SvLBoxEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/)
+sal_Bool SvTreeListBox::EditedEntry( SvTreeListEntry* /*pEntry*/,const rtl::OUString& /*rNewText*/)
{
DBG_CHKTHIS(SvTreeListBox,0);
return sal_True;
@@ -2228,7 +2228,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
{
case KEY_F1:
{
- SvLBoxEntry* pEntry = First();
+ SvTreeListEntry* pEntry = First();
pEntry = NextVisible( pEntry );
SetEntryText( pEntry, "SetEntryText" );
}
@@ -2246,7 +2246,7 @@ void SvTreeListBox::KeyInput( const KeyEvent& rKEvt )
nImpFlags &= ~SVLBOX_IS_TRAVELSELECT;
}
-void SvTreeListBox::RequestingChildren( SvLBoxEntry* pParent )
+void SvTreeListBox::RequestingChildren( SvTreeListEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
if( !pParent->HasChildren() )
@@ -2259,7 +2259,7 @@ void SvTreeListBox::GetFocus()
pImp->GetFocus();
Control::GetFocus();
- SvLBoxEntry* pEntry = FirstSelected();
+ SvTreeListEntry* pEntry = FirstSelected();
if ( pEntry )
pImp->CallEventListeners( VCLEVENT_LISTBOX_SELECT, pEntry );
@@ -2294,7 +2294,7 @@ void SvTreeListBox::ModelHasCleared()
SvListView::ModelHasCleared();
}
-void SvTreeListBox::ShowTargetEmphasis( SvLBoxEntry* pEntry, sal_Bool /*bShow*/ )
+void SvTreeListBox::ShowTargetEmphasis( SvTreeListEntry* pEntry, sal_Bool /*bShow*/ )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->PaintDDCursor( pEntry );
@@ -2369,7 +2369,7 @@ short SvTreeListBox::GetHeightOffset(const Font& /* rFont */, Size& aSizeLogic )
return nOffset;
}
-void SvTreeListBox::SetEntryHeight( SvLBoxEntry* pEntry )
+void SvTreeListBox::SetEntryHeight( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
short nHeight, nHeightMax=0;
@@ -2434,7 +2434,7 @@ void SvTreeListBox::AdjustEntryHeight( const Font& rFont )
}
}
-sal_Bool SvTreeListBox::Expand( SvLBoxEntry* pParent )
+sal_Bool SvTreeListBox::Expand( SvTreeListEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
pHdlEntry = pParent;
@@ -2476,7 +2476,7 @@ sal_Bool SvTreeListBox::Expand( SvLBoxEntry* pParent )
return bExpanded;
}
-sal_Bool SvTreeListBox::Collapse( SvLBoxEntry* pParent )
+sal_Bool SvTreeListBox::Collapse( SvTreeListEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
nImpFlags &= ~SVLBOX_IS_EXPANDING;
@@ -2502,7 +2502,7 @@ sal_Bool SvTreeListBox::Collapse( SvLBoxEntry* pParent )
return bCollapsed;
}
-sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
+sal_Bool SvTreeListBox::Select( SvTreeListEntry* pEntry, sal_Bool bSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"Select: Null-Ptr");
@@ -2523,7 +2523,7 @@ sal_Bool SvTreeListBox::Select( SvLBoxEntry* pEntry, sal_Bool bSelect )
return bRetVal;
}
-sal_uLong SvTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect )
+sal_uLong SvTreeListBox::SelectChildren( SvTreeListEntry* pParent, sal_Bool bSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->DestroyAnchor();
@@ -2531,7 +2531,7 @@ sal_uLong SvTreeListBox::SelectChildren( SvLBoxEntry* pParent, sal_Bool bSelect
if( !pParent->HasChildren() )
return 0;
sal_uInt16 nRefDepth = pModel->GetDepth( pParent );
- SvLBoxEntry* pChild = FirstChild( pParent );
+ SvTreeListEntry* pChild = FirstChild( pParent );
do {
nRet++;
Select( pChild, bSelect );
@@ -2549,51 +2549,51 @@ void SvTreeListBox::SelectAll( sal_Bool bSelect, sal_Bool )
sal_True ); // even when using SINGLE_SELECTION, deselect the cursor
}
-void SvTreeListBox::ModelHasInsertedTree( SvListEntry* pEntry )
+void SvTreeListBox::ModelHasInsertedTree( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
- sal_uInt16 nRefDepth = pModel->GetDepth( (SvLBoxEntry*)pEntry );
- SvLBoxEntry* pTmp = (SvLBoxEntry*)pEntry;
+ sal_uInt16 nRefDepth = pModel->GetDepth( (SvTreeListEntry*)pEntry );
+ SvTreeListEntry* pTmp = (SvTreeListEntry*)pEntry;
do
{
ImpEntryInserted( pTmp );
pTmp = Next( pTmp );
} while( pTmp && nRefDepth < pModel->GetDepth( pTmp ) );
- pImp->TreeInserted( (SvLBoxEntry*)pEntry );
+ pImp->TreeInserted( (SvTreeListEntry*)pEntry );
}
-void SvTreeListBox::ModelHasInserted( SvListEntry* pEntry )
+void SvTreeListBox::ModelHasInserted( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
- ImpEntryInserted( (SvLBoxEntry*)pEntry );
- pImp->EntryInserted( (SvLBoxEntry*)pEntry );
+ ImpEntryInserted( (SvTreeListEntry*)pEntry );
+ pImp->EntryInserted( (SvTreeListEntry*)pEntry );
}
-void SvTreeListBox::ModelIsMoving(SvListEntry* pSource,
- SvListEntry* /* pTargetParent */,
+void SvTreeListBox::ModelIsMoving(SvTreeListEntry* pSource,
+ SvTreeListEntry* /* pTargetParent */,
sal_uLong /* nChildPos */ )
{
DBG_CHKTHIS(SvTreeListBox,0);
- pImp->MovingEntry( (SvLBoxEntry*)pSource );
+ pImp->MovingEntry( (SvTreeListEntry*)pSource );
}
-void SvTreeListBox::ModelHasMoved( SvListEntry* pSource )
+void SvTreeListBox::ModelHasMoved( SvTreeListEntry* pSource )
{
DBG_CHKTHIS(SvTreeListBox,0);
- pImp->EntryMoved( (SvLBoxEntry*)pSource );
+ pImp->EntryMoved( (SvTreeListEntry*)pSource );
}
-void SvTreeListBox::ModelIsRemoving( SvListEntry* pEntry )
+void SvTreeListBox::ModelIsRemoving( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
if(pEdEntry == pEntry)
pEdEntry = NULL;
- pImp->RemovingEntry( (SvLBoxEntry*)pEntry );
- NotifyRemoving( (SvLBoxEntry*)pEntry );
+ pImp->RemovingEntry( (SvTreeListEntry*)pEntry );
+ NotifyRemoving( (SvTreeListEntry*)pEntry );
}
-void SvTreeListBox::ModelHasRemoved( SvListEntry* pEntry )
+void SvTreeListBox::ModelHasRemoved( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
if ( pEntry == pHdlEntry)
@@ -2676,13 +2676,13 @@ void SvTreeListBox::SetSpaceBetweenEntries( short nOffsLogic )
}
}
-void SvTreeListBox::SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect )
+void SvTreeListBox::SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetCursor(pEntry, bForceNoSelect);
}
-void SvTreeListBox::SetCurEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::SetCurEntry( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
pImp->SetCurEntry( pEntry );
@@ -2693,43 +2693,43 @@ Image SvTreeListBox::GetExpandedNodeBmp( ) const
return pImp->GetExpandedNodeBmp( );
}
-Point SvTreeListBox::GetEntryPosition( SvLBoxEntry* pEntry ) const
+Point SvTreeListBox::GetEntryPosition( SvTreeListEntry* pEntry ) const
{
return pImp->GetEntryPosition( pEntry );
}
-void SvTreeListBox::ShowEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::ShowEntry( SvTreeListEntry* pEntry )
{
MakeVisible( pEntry );
}
-void SvTreeListBox::MakeVisible( SvLBoxEntry* pEntry )
+void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry )
{
pImp->MakeVisible(pEntry);
}
-void SvTreeListBox::MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop )
+void SvTreeListBox::MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop )
{
pImp->MakeVisible( pEntry, bMoveToTop );
}
-void SvTreeListBox::ModelHasEntryInvalidated( SvListEntry* pEntry )
+void SvTreeListBox::ModelHasEntryInvalidated( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
// reinitialize the separate items of the entries
- sal_uInt16 nCount = ((SvLBoxEntry*)pEntry)->ItemCount();
+ sal_uInt16 nCount = ((SvTreeListEntry*)pEntry)->ItemCount();
for( sal_uInt16 nIdx = 0; nIdx < nCount; nIdx++ )
{
- SvLBoxItem* pItem = ((SvLBoxEntry*)pEntry)->GetItem( nIdx );
- pItem->InitViewData( this, (SvLBoxEntry*)pEntry, 0 );
+ SvLBoxItem* pItem = ((SvTreeListEntry*)pEntry)->GetItem( nIdx );
+ pItem->InitViewData( this, (SvTreeListEntry*)pEntry, 0 );
}
// repaint
- pImp->InvalidateEntry( (SvLBoxEntry*)pEntry );
+ pImp->InvalidateEntry( (SvTreeListEntry*)pEntry );
}
-void SvTreeListBox::EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
+void SvTreeListBox::EditItemText( SvTreeListEntry* pEntry, SvLBoxString* pItem,
const Selection& rSelection )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -2768,13 +2768,13 @@ void SvTreeListBox::EditItemText( SvLBoxEntry* pEntry, SvLBoxString* pItem,
EditText( pItem->GetText(), aRect, rSelection );
}
-void SvTreeListBox::EditEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::EditEntry( SvTreeListEntry* pEntry )
{
pImp->aEditClickPos = Point( -1, -1 );
ImplEditEntry( pEntry );
}
-void SvTreeListBox::ImplEditEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::ImplEditEntry( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
if( IsEditingActive() )
@@ -2853,7 +2853,7 @@ void SvTreeListBox::EditedText( const XubString& rStr )
}
}
-SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
+SvTreeListEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
{
DBG_CHKTHIS(SvTreeListBox,0);
// scroll
@@ -2872,10 +2872,10 @@ SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
}
}
- SvLBoxEntry* pTarget = pImp->GetEntry( rPos );
+ SvTreeListEntry* pTarget = pImp->GetEntry( rPos );
// when dropping in a vacant space, use the last entry
if( !pTarget )
- return (SvLBoxEntry*)LastVisible();
+ return (SvTreeListEntry*)LastVisible();
else if( (GetDragDropMode() & SV_DRAGDROP_ENABLE_TOP) &&
pTarget == First() && rPos.Y() < 6 )
return 0;
@@ -2884,10 +2884,10 @@ SvLBoxEntry* SvTreeListBox::GetDropTarget( const Point& rPos )
}
-SvLBoxEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const
+SvTreeListEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const
{
DBG_CHKTHIS(SvTreeListBox,0);
- SvLBoxEntry* pEntry = pImp->GetEntry( rPos );
+ SvTreeListEntry* pEntry = pImp->GetEntry( rPos );
if( pEntry && bHit )
{
long nLine = pImp->GetEntryLine( pEntry );
@@ -2897,7 +2897,7 @@ SvLBoxEntry* SvTreeListBox::GetEntry( const Point& rPos, sal_Bool bHit ) const
return pEntry;
}
-SvLBoxEntry* SvTreeListBox::GetCurEntry() const
+SvTreeListEntry* SvTreeListBox::GetCurEntry() const
{
DBG_CHKTHIS(SvTreeListBox,0);
return pImp->GetCurEntry();
@@ -2925,7 +2925,7 @@ void SvTreeListBox::ImplInitStyle()
Invalidate();
}
-void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::PaintEntry( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"PaintEntry:No Entry");
@@ -2933,7 +2933,7 @@ void SvTreeListBox::PaintEntry( SvLBoxEntry* pEntry )
pImp->PaintEntry( pEntry );
}
-void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry )
+void SvTreeListBox::InvalidateEntry( SvTreeListEntry* pEntry )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pEntry,"InvalidateEntry:No Entry");
@@ -2944,14 +2944,14 @@ void SvTreeListBox::InvalidateEntry( SvLBoxEntry* pEntry )
}
-long SvTreeListBox::PaintEntry(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFlags)
+long SvTreeListBox::PaintEntry(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags)
{
return PaintEntry1(pEntry,nLine,nTabFlags);
}
#define SV_TAB_BORDER 8
-long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFlags,
+long SvTreeListBox::PaintEntry1(SvTreeListEntry* pEntry,long nLine,sal_uInt16 nTabFlags,
sal_Bool bHasClipRegion )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -3253,11 +3253,11 @@ long SvTreeListBox::PaintEntry1(SvLBoxEntry* pEntry,long nLine,sal_uInt16 nTabFl
return 0; // nRowLen;
}
-void SvTreeListBox::PreparePaint( SvLBoxEntry* )
+void SvTreeListBox::PreparePaint( SvTreeListEntry* )
{
}
-Rectangle SvTreeListBox::GetFocusRect( SvLBoxEntry* pEntry, long nLine )
+Rectangle SvTreeListBox::GetFocusRect( SvTreeListEntry* pEntry, long nLine )
{
DBG_CHKTHIS(SvTreeListBox,0);
Size aSize;
@@ -3352,7 +3352,7 @@ Rectangle SvTreeListBox::GetFocusRect( SvLBoxEntry* pEntry, long nLine )
}
-long SvTreeListBox::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
+long SvTreeListBox::GetTabPos( SvTreeListEntry* pEntry, SvLBoxTab* pTab)
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pTab,"No Tab");
@@ -3366,7 +3366,7 @@ long SvTreeListBox::GetTabPos( SvLBoxEntry* pEntry, SvLBoxTab* pTab)
return nPos;
}
-SvLBoxItem* SvTreeListBox::GetItem_Impl( SvLBoxEntry* pEntry, long nX,
+SvLBoxItem* SvTreeListBox::GetItem_Impl( SvTreeListEntry* pEntry, long nX,
SvLBoxTab** ppTab, sal_uInt16 nEmptyWidth )
{
DBG_CHKTHIS(SvTreeListBox,0);
@@ -3426,12 +3426,12 @@ SvLBoxItem* SvTreeListBox::GetItem_Impl( SvLBoxEntry* pEntry, long nX,
return pItemClicked;
}
-SvLBoxItem* SvTreeListBox::GetItem(SvLBoxEntry* pEntry,long nX,SvLBoxTab** ppTab)
+SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX,SvLBoxTab** ppTab)
{
return GetItem_Impl( pEntry, nX, ppTab, 0 );
}
-SvLBoxItem* SvTreeListBox::GetItem(SvLBoxEntry* pEntry,long nX )
+SvLBoxItem* SvTreeListBox::GetItem(SvTreeListEntry* pEntry,long nX )
{
DBG_CHKTHIS(SvTreeListBox,0);
SvLBoxTab* pDummyTab;
@@ -3483,7 +3483,7 @@ SvLBoxTab* SvTreeListBox::GetFirstDynamicTab() const
return GetFirstDynamicTab( nDummy );
}
-SvLBoxTab* SvTreeListBox::GetTab( SvLBoxEntry* pEntry, SvLBoxItem* pItem) const
+SvLBoxTab* SvTreeListBox::GetTab( SvTreeListEntry* pEntry, SvLBoxItem* pItem) const
{
DBG_CHKTHIS(SvTreeListBox,0);
sal_uInt16 nPos = pEntry->GetPos( pItem );
@@ -3580,12 +3580,12 @@ void SvTreeListBox::SetHighlightRange( sal_uInt16 nStart, sal_uInt16 nEnd)
pImp->RecalcFocusRect();
}
-sal_uLong SvTreeListBox::GetAscInsertionPos(SvLBoxEntry*,SvLBoxEntry*)
+sal_uLong SvTreeListBox::GetAscInsertionPos(SvTreeListEntry*,SvTreeListEntry*)
{
return LIST_APPEND;
}
-sal_uLong SvTreeListBox::GetDescInsertionPos(SvLBoxEntry*,SvLBoxEntry*)
+sal_uLong SvTreeListBox::GetDescInsertionPos(SvTreeListEntry*,SvTreeListEntry*)
{
DBG_CHKTHIS(SvTreeListBox,0);
return LIST_APPEND;
@@ -3595,7 +3595,7 @@ Region SvTreeListBox::GetDragRegion() const
{
DBG_CHKTHIS(SvTreeListBox,0);
Rectangle aRect;
- SvLBoxEntry* pEntry = GetCurEntry();
+ SvTreeListEntry* pEntry = GetCurEntry();
if( pEntry )
{
Point aPos = GetEntryPosition( pEntry );
@@ -3614,14 +3614,14 @@ void SvTreeListBox::Command( const CommandEvent& rCEvt )
}
-void SvTreeListBox::RemoveParentKeepChildren( SvLBoxEntry* pParent )
+void SvTreeListBox::RemoveParentKeepChildren( SvTreeListEntry* pParent )
{
DBG_CHKTHIS(SvTreeListBox,0);
DBG_ASSERT(pParent,"RemoveParentKeepChildren:No Parent");
- SvLBoxEntry* pNewParent = GetParent( pParent );
+ SvTreeListEntry* pNewParent = GetParent( pParent );
if( pParent->HasChildren())
{
- SvLBoxEntry* pChild = FirstChild( pParent );
+ SvTreeListEntry* pChild = FirstChild( pParent );
while( pChild )
{
pModel->Move( pChild, pNewParent, LIST_APPEND );
@@ -3670,22 +3670,22 @@ void SvTreeListBox::RequestHelp( const HelpEvent& rHEvt )
Control::RequestHelp( rHEvt );
}
-void SvTreeListBox::CursorMoved( SvLBoxEntry* )
+void SvTreeListBox::CursorMoved( SvTreeListEntry* )
{
}
IMPL_LINK( SvTreeListBox, DefaultCompare, SvSortData*, pData )
{
- SvLBoxEntry* pLeft = (SvLBoxEntry*)(pData->pLeft );
- SvLBoxEntry* pRight = (SvLBoxEntry*)(pData->pRight );
+ SvTreeListEntry* pLeft = (SvTreeListEntry*)(pData->pLeft );
+ SvTreeListEntry* pRight = (SvTreeListEntry*)(pData->pRight );
String aLeft( ((SvLBoxString*)(pLeft->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
String aRight( ((SvLBoxString*)(pRight->GetFirstItem(SV_ITEM_ID_LBOXSTRING)))->GetText());
pImp->UpdateStringSorter();
return pImp->m_pStringSorter->compare(aLeft, aRight);
}
-void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry1,
- SvListEntry* pEntry2, sal_uLong nPos )
+void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvTreeListEntry* pEntry1,
+ SvTreeListEntry* pEntry2, sal_uLong nPos )
{
if( nActionId == LISTACTION_CLEARING )
CancelTextEditing();
@@ -3695,7 +3695,7 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry
{
case LISTACTION_INSERTED:
{
- SvLBoxEntry* pEntry( dynamic_cast< SvLBoxEntry* >( pEntry1 ) );
+ SvTreeListEntry* pEntry( dynamic_cast< SvTreeListEntry* >( pEntry1 ) );
if ( !pEntry )
{
SAL_WARN( "svtools.contnr", "SvTreeListBox::ModelNotification: invalid entry!" );
@@ -3723,7 +3723,7 @@ void SvTreeListBox::ModelNotification( sal_uInt16 nActionId, SvListEntry* pEntry
case LISTACTION_RESORTED:
// after a selection: show first entry and also keep the selection
- MakeVisible( (SvLBoxEntry*)pModel->First(), sal_True );
+ MakeVisible( (SvTreeListEntry*)pModel->First(), sal_True );
SetUpdateMode( sal_True );
break;
@@ -3759,15 +3759,15 @@ void SvTreeListBox::EnableAsyncDrag( sal_Bool b )
pImp->EnableAsyncDrag( b );
}
-SvLBoxEntry* SvTreeListBox::GetFirstEntryInView() const
+SvTreeListEntry* SvTreeListBox::GetFirstEntryInView() const
{
Point aPos;
return GetEntry( aPos );
}
-SvLBoxEntry* SvTreeListBox::GetNextEntryInView(SvLBoxEntry* pEntry ) const
+SvTreeListEntry* SvTreeListBox::GetNextEntryInView(SvTreeListEntry* pEntry ) const
{
- SvLBoxEntry* pNext = (SvLBoxEntry*)NextVisible( pEntry );
+ SvTreeListEntry* pNext = (SvTreeListEntry*)NextVisible( pEntry );
if( pNext )
{
Point aPos( GetEntryPosition(pNext) );
@@ -3778,13 +3778,13 @@ SvLBoxEntry* SvTreeListBox::GetNextEntryInView(SvLBoxEntry* pEntry ) const
return pNext;
}
-SvLBoxEntry* SvTreeListBox::GetLastEntryInView() const
+SvTreeListEntry* SvTreeListBox::GetLastEntryInView() const
{
- SvLBoxEntry* pEntry = GetFirstEntryInView();
- SvLBoxEntry* pNext = 0;
+ SvTreeListEntry* pEntry = GetFirstEntryInView();
+ SvTreeListEntry* pNext = 0;
while( pEntry )
{
- pNext = (SvLBoxEntry*)NextVisible( pEntry );
+ pNext = (SvTreeListEntry*)NextVisible( pEntry );
if( pNext )
{
Point aPos( GetEntryPosition(pNext) );
@@ -3800,7 +3800,7 @@ SvLBoxEntry* SvTreeListBox::GetLastEntryInView() const
return pEntry;
}
-void SvTreeListBox::ShowFocusRect( const SvLBoxEntry* pEntry )
+void SvTreeListBox::ShowFocusRect( const SvTreeListEntry* pEntry )
{
pImp->ShowFocusRect( pEntry );
}
@@ -3935,7 +3935,7 @@ void SvTreeListBox::EnableList( bool _bEnable )
return xAccessible;
}
-void SvTreeListBox::FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const
+void SvTreeListBox::FillAccessibleEntryStateSet( SvTreeListEntry* pEntry, ::utl::AccessibleStateSetHelper& rStateSet ) const
{
DBG_ASSERT( pEntry, "SvTreeListBox::FillAccessibleEntryStateSet: invalid entry" );
@@ -3954,7 +3954,7 @@ void SvTreeListBox::FillAccessibleEntryStateSet( SvLBoxEntry* pEntry, ::utl::Acc
rStateSet.AddState( AccessibleStateType::SELECTED );
}
-Rectangle SvTreeListBox::GetBoundingRect( SvLBoxEntry* pEntry )
+Rectangle SvTreeListBox::GetBoundingRect( SvTreeListEntry* pEntry )
{
Point aPos = GetEntryPosition( pEntry );
Rectangle aRect = GetFocusRect( pEntry, aPos.Y() );
diff --git a/svtools/source/contnr/treelistentry.cxx b/svtools/source/contnr/treelistentry.cxx
index cacc12d1980e..80264004625c 100644
--- a/svtools/source/contnr/treelistentry.cxx
+++ b/svtools/source/contnr/treelistentry.cxx
@@ -32,50 +32,7 @@
#include "tools/debug.hxx"
-DBG_NAME(SvListEntry);
-
-SvListEntry::SvListEntry()
-{
- DBG_CTOR(SvListEntry,0);
- pChildren = 0;
- pParent = 0;
- nListPos = 0;
- nAbsPos = 0;
-}
-
-SvListEntry::SvListEntry( const SvListEntry& rEntry )
-{
- DBG_CTOR(SvListEntry,0);
- pChildren = 0;
- pParent = 0;
- nListPos &= 0x80000000;
- nListPos |= ( rEntry.nListPos & 0x7fffffff);
- nAbsPos = rEntry.nAbsPos;
-}
-
-SvListEntry::~SvListEntry()
-{
- DBG_DTOR(SvListEntry,0);
- if ( pChildren )
- {
- pChildren->DestroyAll();
- delete pChildren;
- }
-#ifdef DBG_UTIL
- pChildren = 0;
- pParent = 0;
-#endif
-}
-
-void SvListEntry::Clone( SvListEntry* pSource)
-{
- DBG_CHKTHIS(SvListEntry,0);
- nListPos &= 0x80000000;
- nListPos |= ( pSource->nListPos & 0x7fffffff);
- nAbsPos = pSource->nAbsPos;
-}
-
-void SvListEntry::SetListPositions()
+void SvTreeListEntry::SetListPositions()
{
if( pChildren )
{
@@ -83,7 +40,7 @@ void SvListEntry::SetListPositions()
sal_uLong nCur = 0;
for (; it != itEnd; ++it)
{
- SvListEntry* pEntry = *it;
+ SvTreeListEntry* pEntry = *it;
pEntry->nListPos &= 0x80000000;
pEntry->nListPos |= nCur;
++nCur;
@@ -92,26 +49,12 @@ void SvListEntry::SetListPositions()
nListPos &= (~0x80000000);
}
-// ***************************************************************
-// class SvLBoxEntry
-// ***************************************************************
-
-DBG_NAME(SvLBoxEntry);
-
-SvLBoxEntry::SvLBoxEntry() : aItems()
-{
- DBG_CTOR(SvLBoxEntry,0);
- nEntryFlags = 0;
- pUserData = 0;
-}
-
-SvLBoxEntry::~SvLBoxEntry()
+void SvTreeListEntry::InvalidateChildrensListPositions()
{
- DBG_DTOR(SvLBoxEntry,0);
- DeleteItems_Impl();
+ nListPos |= 0x80000000;
}
-void SvLBoxEntry::DeleteItems_Impl()
+void SvTreeListEntry::DeleteItems_Impl()
{
DBG_CHKTHIS(SvLBoxEntry,0);
sal_uInt16 nCount = aItems.size();
@@ -124,45 +67,100 @@ void SvLBoxEntry::DeleteItems_Impl()
aItems.clear();
}
+SvTreeListEntry::SvTreeListEntry() :
+ pParent(NULL),
+ pChildren(NULL),
+ nAbsPos(0),
+ nListPos(0),
+ pUserData(NULL),
+ nEntryFlags(0)
+{
+}
-void SvLBoxEntry::AddItem( SvLBoxItem* pItem )
+SvTreeListEntry::SvTreeListEntry(const SvTreeListEntry& r) :
+ pParent(NULL),
+ pChildren(NULL),
+ nAbsPos(r.nAbsPos),
+ nListPos(r.nListPos & 0x7FFFFFFF)
{
- DBG_CHKTHIS(SvLBoxEntry,0);
- aItems.push_back( pItem );
}
-void SvLBoxEntry::Clone( SvListEntry* pSource )
+SvTreeListEntry::~SvTreeListEntry()
{
- DBG_CHKTHIS(SvLBoxEntry,0);
- SvListEntry::Clone( pSource );
+ if ( pChildren )
+ {
+ pChildren->DestroyAll();
+ delete pChildren;
+ }
+#ifdef DBG_UTIL
+ pChildren = 0;
+ pParent = 0;
+#endif
+
+ DeleteItems_Impl();
+}
+
+bool SvTreeListEntry::HasChildren() const
+{
+ return pChildren != NULL;
+}
+
+bool SvTreeListEntry::HasChildListPos() const
+{
+ if( pParent && !(pParent->nListPos & 0x80000000) )
+ return true;
+ else return false;
+}
+
+sal_uLong SvTreeListEntry::GetChildListPos() const
+{
+ if( pParent && (pParent->nListPos & 0x80000000) )
+ pParent->SetListPositions();
+ return ( nListPos & 0x7fffffff );
+}
+
+void SvTreeListEntry::Clone(SvTreeListEntry* pSource)
+{
+ nListPos &= 0x80000000;
+ nListPos |= ( pSource->nListPos & 0x7fffffff);
+ nAbsPos = pSource->nAbsPos;
+
SvLBoxItem* pNewItem;
DeleteItems_Impl();
- sal_uInt16 nCount = ((SvLBoxEntry*)pSource)->ItemCount();
+ sal_uInt16 nCount = ((SvTreeListEntry*)pSource)->ItemCount();
sal_uInt16 nCurPos = 0;
while( nCurPos < nCount )
{
- SvLBoxItem* pItem = ((SvLBoxEntry*)pSource)->GetItem( nCurPos );
+ SvLBoxItem* pItem = ((SvTreeListEntry*)pSource)->GetItem( nCurPos );
pNewItem = pItem->Create();
pNewItem->Clone( pItem );
AddItem( pNewItem );
nCurPos++;
}
- pUserData = ((SvLBoxEntry*)pSource)->GetUserData();
- nEntryFlags = ((SvLBoxEntry*)pSource)->nEntryFlags;
+ pUserData = ((SvTreeListEntry*)pSource)->GetUserData();
+ nEntryFlags = ((SvTreeListEntry*)pSource)->nEntryFlags;
}
-void SvLBoxEntry::EnableChildrenOnDemand( sal_Bool bEnable )
+sal_uInt16 SvTreeListEntry::ItemCount() const
+{
+ return (sal_uInt16)aItems.size();
+}
+
+void SvTreeListEntry::AddItem( SvLBoxItem* pItem )
+{
+ aItems.push_back( pItem );
+}
+
+void SvTreeListEntry::EnableChildrenOnDemand( bool bEnable )
{
- DBG_CHKTHIS(SvLBoxEntry,0);
if ( bEnable )
nEntryFlags |= SV_ENTRYFLAG_CHILDREN_ON_DEMAND;
else
nEntryFlags &= (~SV_ENTRYFLAG_CHILDREN_ON_DEMAND);
}
-void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos )
+void SvTreeListEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos )
{
- DBG_CHKTHIS(SvLBoxEntry,0);
DBG_ASSERT(pNewItem,"ReplaceItem:No Item");
SvLBoxItem* pOld = GetItem( nPos );
if ( pOld )
@@ -172,7 +170,12 @@ void SvLBoxEntry::ReplaceItem( SvLBoxItem* pNewItem, sal_uInt16 nPos )
}
}
-SvLBoxItem* SvLBoxEntry::GetFirstItem( sal_uInt16 nId )
+SvLBoxItem* SvTreeListEntry::GetItem( sal_uInt16 nPos ) const
+{
+ return aItems[nPos];
+}
+
+SvLBoxItem* SvTreeListEntry::GetFirstItem( sal_uInt16 nId )
{
sal_uInt16 nCount = aItems.size();
sal_uInt16 nCur = 0;
@@ -187,10 +190,40 @@ SvLBoxItem* SvLBoxEntry::GetFirstItem( sal_uInt16 nId )
return 0;
}
-sal_uInt16 SvLBoxEntry::GetPos( SvLBoxItem* pItem ) const
+sal_uInt16 SvTreeListEntry::GetPos( SvLBoxItem* pItem ) const
{
std::vector<SvLBoxItem*>::const_iterator it = std::find( aItems.begin(), aItems.end(), pItem );
return it == aItems.end() ? USHRT_MAX : it - aItems.begin();
}
+void* SvTreeListEntry::GetUserData() const
+{
+ return pUserData;
+}
+
+void SvTreeListEntry::SetUserData( void* pPtr )
+{
+ pUserData = pPtr;
+}
+
+bool SvTreeListEntry::HasChildrenOnDemand() const
+{
+ return (bool)((nEntryFlags & SV_ENTRYFLAG_CHILDREN_ON_DEMAND)!=0);
+}
+
+bool SvTreeListEntry::HasInUseEmphasis() const
+{
+ return (bool)((nEntryFlags & SV_ENTRYFLAG_IN_USE)!=0);
+}
+
+sal_uInt16 SvTreeListEntry::GetFlags() const
+{
+ return nEntryFlags;
+}
+
+void SvTreeListEntry::SetFlags( sal_uInt16 nFlags )
+{
+ nEntryFlags = nFlags;
+}
+
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/svtools/source/inc/svimpbox.hxx b/svtools/source/inc/svimpbox.hxx
index e8c6a5941582..998b8da9bf55 100644
--- a/svtools/source/inc/svimpbox.hxx
+++ b/svtools/source/inc/svimpbox.hxx
@@ -42,7 +42,7 @@ class SvTreeListBox;
class Point;
class SvLBoxTreeList;
class SvImpLBox;
-class SvLBoxEntry;
+class SvTreeListEntry;
class SvLBoxTab;
namespace comphelper
{
@@ -97,12 +97,12 @@ friend class SvTreeListBox;
private:
SvTreeListBox* pView;
SvLBoxTreeList* pTree;
- SvLBoxEntry* pCursor;
- SvLBoxEntry* pStartEntry;
- SvLBoxEntry* pAnchor;
- SvLBoxEntry* pMostRightEntry;
+ SvTreeListEntry* pCursor;
+ SvTreeListEntry* pStartEntry;
+ SvTreeListEntry* pAnchor;
+ SvTreeListEntry* pMostRightEntry;
SvLBoxButton* pActiveButton;
- SvLBoxEntry* pActiveEntry;
+ SvTreeListEntry* pActiveEntry;
SvLBoxTab* pActiveTab;
ScrollBar aVerSBar;
@@ -183,7 +183,7 @@ private:
// setzt Thumb auf FirstEntryToDraw
void SyncVerThumb();
sal_Bool IsLineVisible( long nY ) const;
- long GetEntryLine( SvLBoxEntry* pEntry ) const;
+ long GetEntryLine( SvTreeListEntry* pEntry ) const;
void FillView();
void CursorDown();
void CursorUp();
@@ -191,7 +191,7 @@ private:
void PageDown( sal_uInt16 nDelta );
void PageUp( sal_uInt16 nDelta );
- void SetCursor( SvLBoxEntry* pEntry, sal_Bool bForceNoSelect = sal_False );
+ void SetCursor( SvTreeListEntry* pEntry, sal_Bool bForceNoSelect = sal_False );
void DrawNet();
@@ -204,19 +204,19 @@ private:
void SetNodeBmpTabDistance();
// Selection-Engine
- SvLBoxEntry* MakePointVisible( const Point& rPoint,
+ SvTreeListEntry* MakePointVisible( const Point& rPoint,
sal_Bool bNotifyScroll=sal_True );
- void SetAnchorSelection( SvLBoxEntry* pOld,
- SvLBoxEntry* pNewCursor );
+ void SetAnchorSelection( SvTreeListEntry* pOld,
+ SvTreeListEntry* pNewCursor );
void BeginDrag();
sal_Bool ButtonDownCheckCtrl( const MouseEvent& rMEvt,
- SvLBoxEntry* pEntry, long nY );
+ SvTreeListEntry* pEntry, long nY );
sal_Bool MouseMoveCheckCtrl( const MouseEvent& rMEvt,
- SvLBoxEntry* pEntry );
+ SvTreeListEntry* pEntry );
sal_Bool ButtonUpCheckCtrl( const MouseEvent& rMEvt );
sal_Bool ButtonDownCheckExpand( const MouseEvent&,
- SvLBoxEntry*,long nY );
+ SvTreeListEntry*,long nY );
void PositionScrollBars( Size& rOSize, sal_uInt16 nMask );
sal_uInt16 AdjustScrollBars( Size& rSize );
@@ -225,14 +225,14 @@ private:
void EndScroll();
sal_Bool InScroll() const { return (sal_Bool)(nFlags & F_IN_SCROLLING)!=0;}
Rectangle GetVisibleArea() const;
- sal_Bool EntryReallyHit(SvLBoxEntry* pEntry,const Point& rPos,long nLine);
+ sal_Bool EntryReallyHit(SvTreeListEntry* pEntry,const Point& rPos,long nLine);
void InitScrollBarBox();
SvLBoxTab* NextTab( SvLBoxTab* );
- sal_Bool SetMostRight( SvLBoxEntry* pEntry );
- void FindMostRight( SvLBoxEntry* EntryToIgnore );
- void FindMostRight( SvLBoxEntry* pParent, SvLBoxEntry* EntryToIgnore );
- void FindMostRight_Impl( SvLBoxEntry* pParent,SvLBoxEntry* EntryToIgnore );
+ sal_Bool SetMostRight( SvTreeListEntry* pEntry );
+ void FindMostRight( SvTreeListEntry* EntryToIgnore );
+ void FindMostRight( SvTreeListEntry* pParent, SvTreeListEntry* EntryToIgnore );
+ void FindMostRight_Impl( SvTreeListEntry* pParent,SvTreeListEntry* EntryToIgnore );
void NotifyTabsChanged();
inline sal_Bool IsExpandable() const // if element at cursor can be expanded in general
@@ -245,11 +245,11 @@ private:
void UpdateStringSorter();
// #97680# --------------------
- short UpdateContextBmpWidthVector( SvLBoxEntry* pEntry, short nWidth );
- void UpdateContextBmpWidthMax( SvLBoxEntry* pEntry );
- void UpdateContextBmpWidthVectorFromMovedEntry( SvLBoxEntry* pEntry );
+ short UpdateContextBmpWidthVector( SvTreeListEntry* pEntry, short nWidth );
+ void UpdateContextBmpWidthMax( SvTreeListEntry* pEntry );
+ void UpdateContextBmpWidthVectorFromMovedEntry( SvTreeListEntry* pEntry );
- void CalcCellFocusRect( SvLBoxEntry* pEntry, Rectangle& rRect );
+ void CalcCellFocusRect( SvTreeListEntry* pEntry, Rectangle& rRect );
inline sal_Bool AreChildrenTransient() const { return bAreChildrenTransient; }
inline void SetChildrenNotTransient() { bAreChildrenTransient = sal_False; }
@@ -264,17 +264,17 @@ public:
ExtendedWinBits GetExtendedWindowBits() const { return nExtendedWinBits; }
void SetModel( SvLBoxTreeList* pModel ) { pTree = pModel;}
- void EntryInserted( SvLBoxEntry*);
- void RemovingEntry( SvLBoxEntry* pEntry );
+ void EntryInserted( SvTreeListEntry*);
+ void RemovingEntry( SvTreeListEntry* pEntry );
void EntryRemoved();
- void MovingEntry( SvLBoxEntry* pEntry );
- void EntryMoved( SvLBoxEntry* pEntry );
- void TreeInserted( SvLBoxEntry* pEntry );
+ void MovingEntry( SvTreeListEntry* pEntry );
+ void EntryMoved( SvTreeListEntry* pEntry );
+ void TreeInserted( SvTreeListEntry* pEntry );
- void EntryExpanded( SvLBoxEntry* pEntry );
- void EntryCollapsed( SvLBoxEntry* pEntry );
- void CollapsingEntry( SvLBoxEntry* pEntry );
- void EntrySelected( SvLBoxEntry*, sal_Bool bSelect );
+ void EntryExpanded( SvTreeListEntry* pEntry );
+ void EntryCollapsed( SvTreeListEntry* pEntry );
+ void CollapsingEntry( SvTreeListEntry* pEntry );
+ void EntrySelected( SvTreeListEntry*, sal_Bool bSelect );
void Paint( const Rectangle& rRect );
void MouseButtonDown( const MouseEvent& );
@@ -288,28 +288,28 @@ public:
sal_Bool bInvalidateCompleteView= sal_True,
sal_Bool bUpdateVerSBar = sal_True );
void SetEntryHeight( short nHeight );
- void PaintEntry( SvLBoxEntry* pEntry );
- void InvalidateEntry( SvLBoxEntry* );
+ void PaintEntry( SvTreeListEntry* pEntry );
+ void InvalidateEntry( SvTreeListEntry* );
void RecalcFocusRect();
- inline void SelectEntry( SvLBoxEntry* pEntry, sal_Bool bSelect );
+ inline void SelectEntry( SvTreeListEntry* pEntry, sal_Bool bSelect );
void SetDragDropMode( DragDropMode eDDMode );
void SetSelectionMode( SelectionMode eSelMode );
void SetAddMode( sal_Bool ) { aSelEng.AddAlways(sal_False); }
sal_Bool IsAddMode() const { return aSelEng.IsAlwaysAdding(); }
- SvLBoxEntry* GetCurrentEntry() const { return pCursor; }
- sal_Bool IsEntryInView( SvLBoxEntry* ) const;
- SvLBoxEntry* GetEntry( const Point& rPos ) const;
+ SvTreeListEntry* GetCurrentEntry() const { return pCursor; }
+ sal_Bool IsEntryInView( SvTreeListEntry* ) const;
+ SvTreeListEntry* GetEntry( const Point& rPos ) const;
// gibt letzten Eintrag zurueck, falls Pos unter letztem Eintrag
- SvLBoxEntry* GetClickedEntry( const Point& ) const;
- SvLBoxEntry* GetCurEntry() const { return pCursor; }
- void SetCurEntry( SvLBoxEntry* );
- Point GetEntryPosition( SvLBoxEntry* ) const;
- void MakeVisible( SvLBoxEntry* pEntry, sal_Bool bMoveToTop=sal_False );
+ SvTreeListEntry* GetClickedEntry( const Point& ) const;
+ SvTreeListEntry* GetCurEntry() const { return pCursor; }
+ void SetCurEntry( SvTreeListEntry* );
+ Point GetEntryPosition( SvTreeListEntry* ) const;
+ void MakeVisible( SvTreeListEntry* pEntry, sal_Bool bMoveToTop=sal_False );
void ScrollToAbsPos( long nPos );
- void PaintDDCursor( SvLBoxEntry* );
+ void PaintDDCursor( SvTreeListEntry* );
// Images
inline Image& implGetImageLocation( const ImageType _eType );
@@ -343,14 +343,14 @@ public:
sal_Bool RequestHelp( const HelpEvent& rHEvt );
void EndSelection();
- sal_Bool IsNodeButton( const Point& rPosPixel, SvLBoxEntry* pEntry ) const;
+ sal_Bool IsNodeButton( const Point& rPosPixel, SvTreeListEntry* pEntry ) const;
void RepaintScrollBars();
void EnableAsyncDrag( sal_Bool b) { bAsyncBeginDrag = b; }
void SetUpdateMode( sal_Bool );
sal_Bool GetUpdateMode() const { return bUpdateMode; }
Rectangle GetClipRegionRect() const;
sal_Bool HasHorScrollBar() const { return aHorSBar.IsVisible(); }
- void ShowFocusRect( const SvLBoxEntry* pEntry );
+ void ShowFocusRect( const SvTreeListEntry* pEntry );
void CallEventListeners( sal_uLong nEvent, void* pData = NULL );
/** Enables, that one cell of a tablistbox entry can be focused */
@@ -359,7 +359,7 @@ public:
bool SetCurrentTabPos( sal_uInt16 _nNewPos );
inline sal_uInt16 GetCurrentTabPos() const { return nCurTabPos; }
- bool IsSelectable( const SvLBoxEntry* pEntry );
+ bool IsSelectable( const SvTreeListEntry* pEntry );
};
inline Image& SvImpLBox::implGetImageLocation( const ImageType _eType )
@@ -418,12 +418,12 @@ inline const Image& SvImpLBox::GetDefaultEntryColBmp( )
return implGetImageLocation( itEntryDefCollapsed );
}
-inline Point SvImpLBox::GetEntryPosition( SvLBoxEntry* pEntry ) const
+inline Point SvImpLBox::GetEntryPosition( SvTreeListEntry* pEntry ) const
{
return Point( 0, GetEntryLine( pEntry ) );
}
-inline void SvImpLBox::PaintEntry( SvLBoxEntry* pEntry )
+inline void SvImpLBox::PaintEntry( SvTreeListEntry* pEntry )
{
long nY = GetEntryLine( pEntry );
pView->PaintEntry( pEntry, nY );
@@ -437,7 +437,7 @@ inline sal_Bool SvImpLBox::IsLineVisible( long nY ) const
return bRet;
}
-inline void SvImpLBox::TreeInserted( SvLBoxEntry* pInsTree )
+inline void SvImpLBox::TreeInserted( SvTreeListEntry* pInsTree )
{
EntryInserted( pInsTree );
}
diff --git a/svtools/source/uno/treecontrolpeer.cxx b/svtools/source/uno/treecontrolpeer.cxx
index 3e8648ccad95..f77786864cba 100644
--- a/svtools/source/uno/treecontrolpeer.cxx
+++ b/svtools/source/uno/treecontrolpeer.cxx
@@ -80,7 +80,7 @@ public:
class ImplContextGraphicItem : public SvLBoxContextBmp
{
public:
- ImplContextGraphicItem( SvLBoxEntry* pEntry,sal_uInt16 nFlags,Image& rI1,Image& rI2, sal_uInt16 nEntryFlagsBmp1)
+ ImplContextGraphicItem( SvTreeListEntry* pEntry,sal_uInt16 nFlags,Image& rI1,Image& rI2, sal_uInt16 nEntryFlagsBmp1)
: SvLBoxContextBmp( pEntry, nFlags, rI1, rI2, nEntryFlagsBmp1 ) {}
OUString msExpandedGraphicURL;
@@ -95,12 +95,12 @@ public:
UnoTreeListBoxImpl( TreeControlPeer* pPeer, Window* pParent, WinBits nWinStyle );
~UnoTreeListBoxImpl();
- sal_uInt32 insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos=LIST_APPEND );
+ sal_uInt32 insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos=LIST_APPEND );
- virtual void RequestingChildren( SvLBoxEntry* pParent );
+ virtual void RequestingChildren( SvTreeListEntry* pParent );
- virtual sal_Bool EditingEntry( SvLBoxEntry* pEntry, Selection& );
- virtual sal_Bool EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText );
+ virtual sal_Bool EditingEntry( SvTreeListEntry* pEntry, Selection& );
+ virtual sal_Bool EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText );
DECL_LINK(OnSelectionChangeHdl, void *);
DECL_LINK(OnExpandingHdl, void *);
@@ -115,15 +115,15 @@ private:
class UnoTreeListItem : public SvLBoxString
{
public:
- UnoTreeListItem( SvLBoxEntry* );
+ UnoTreeListItem( SvTreeListEntry* );
UnoTreeListItem();
virtual ~UnoTreeListItem();
- void InitViewData( SvTreeListBox*,SvLBoxEntry*,SvViewDataItem* );
+ void InitViewData( SvTreeListBox*,SvTreeListEntry*,SvViewDataItem* );
Image GetImage() const;
void SetImage( const Image& rImage );
OUString GetGraphicURL() const;
void SetGraphicURL( const OUString& rGraphicURL );
- void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvLBoxEntry* );
+ void Paint( const Point&, SvTreeListBox& rDev, sal_uInt16 nFlags,SvTreeListEntry* );
SvLBoxItem* Create() const;
void Clone( SvLBoxItem* pSource );
@@ -134,7 +134,7 @@ private:
// --------------------------------------------------------------------
-class UnoTreeListEntry : public SvLBoxEntry
+class UnoTreeListEntry : public SvTreeListEntry
{
public:
UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer );
@@ -723,7 +723,7 @@ void SAL_CALL TreeControlPeer::setDefaultExpandedGraphicURL( const ::rtl::OUStri
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
- SvLBoxEntry* pEntry = rTree.First();
+ SvTreeListEntry* pEntry = rTree.First();
while( pEntry )
{
ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
@@ -761,7 +761,7 @@ void SAL_CALL TreeControlPeer::setDefaultCollapsedGraphicURL( const ::rtl::OUStr
UnoTreeListBoxImpl& rTree = getTreeListBoxOrThrow();
- SvLBoxEntry* pEntry = rTree.First();
+ SvTreeListEntry* pEntry = rTree.First();
while( pEntry )
{
ImplContextGraphicItem* pContextGraphicItem = dynamic_cast< ImplContextGraphicItem* >( pEntry->GetItem( 0 ) );
@@ -1200,7 +1200,7 @@ OUString TreeControlPeer::getEntryString( const Any& rValue )
Sequence< Any > aValues;
if( aValue >>= aValues )
{
- updateEntry( SvLBoxEntry& rEntry, aValues );
+ updateEntry( SvTreeListEntry& rEntry, aValues );
return;
}
}
@@ -1553,7 +1553,7 @@ IMPL_LINK_NOARG(UnoTreeListBoxImpl, OnExpandedHdl)
// --------------------------------------------------------------------
-sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,sal_uLong nPos )
+sal_uInt32 UnoTreeListBoxImpl::insert( SvTreeListEntry* pEntry,SvTreeListEntry* pParent,sal_uLong nPos )
{
if( pParent )
return SvTreeListBox::Insert( pEntry, pParent, nPos );
@@ -1563,7 +1563,7 @@ sal_uInt32 UnoTreeListBoxImpl::insert( SvLBoxEntry* pEntry,SvLBoxEntry* pParent,
// --------------------------------------------------------------------
-void UnoTreeListBoxImpl::RequestingChildren( SvLBoxEntry* pParent )
+void UnoTreeListBoxImpl::RequestingChildren( SvTreeListEntry* pParent )
{
UnoTreeListEntry* pEntry = dynamic_cast< UnoTreeListEntry* >( pParent );
if( pEntry && pEntry->mxNode.is() && mxPeer.is() )
@@ -1572,14 +1572,14 @@ void UnoTreeListBoxImpl::RequestingChildren( SvLBoxEntry* pParent )
// --------------------------------------------------------------------
-sal_Bool UnoTreeListBoxImpl::EditingEntry( SvLBoxEntry* pEntry, Selection& )
+sal_Bool UnoTreeListBoxImpl::EditingEntry( SvTreeListEntry* pEntry, Selection& )
{
return mxPeer.is() ? mxPeer->onEditingEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ) ) : false;
}
// --------------------------------------------------------------------
-sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUString& rNewText )
+sal_Bool UnoTreeListBoxImpl::EditedEntry( SvTreeListEntry* pEntry, const rtl::OUString& rNewText )
{
return mxPeer.is() ? mxPeer->onEditedEntry( dynamic_cast< UnoTreeListEntry* >( pEntry ), rNewText ) : false;
}
@@ -1588,7 +1588,7 @@ sal_Bool UnoTreeListBoxImpl::EditedEntry( SvLBoxEntry* pEntry, const rtl::OUStri
// class UnoTreeListItem
// ====================================================================
-UnoTreeListItem::UnoTreeListItem( SvLBoxEntry* pEntry )
+UnoTreeListItem::UnoTreeListItem( SvTreeListEntry* pEntry )
: SvLBoxString(pEntry, 0, rtl::OUString())
{
}
@@ -1608,7 +1608,7 @@ UnoTreeListItem::~UnoTreeListItem()
// --------------------------------------------------------------------
-void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, SvLBoxEntry* _pEntry)
+void UnoTreeListItem::Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 /* nFlags */, SvTreeListEntry* _pEntry)
{
Point aPos( rPos );
if( _pEntry )
@@ -1676,7 +1676,7 @@ void UnoTreeListItem::SetGraphicURL( const OUString& rGraphicURL )
// --------------------------------------------------------------------
-void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, SvViewDataItem* pViewData)
+void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvTreeListEntry* pEntry, SvViewDataItem* pViewData)
{
if( !pViewData )
pViewData = pView->GetViewDataItem( pEntry, this );
@@ -1699,7 +1699,7 @@ void UnoTreeListItem::InitViewData( SvTreeListBox* pView,SvLBoxEntry* pEntry, Sv
// --------------------------------------------------------------------
UnoTreeListEntry::UnoTreeListEntry( const Reference< XTreeNode >& xNode, TreeControlPeer* pPeer )
-: SvLBoxEntry()
+: SvTreeListEntry()
, mxNode( xNode )
, mpPeer( pPeer )
{
generated by cgit (git 2.34.1) at 2024-08-10 05:21:53 +0000