diff options
Diffstat (limited to 'sw/source/ui/inc')
-rw-r--r-- | sw/source/ui/inc/changedb.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/conttree.hxx | 58 | ||||
-rw-r--r-- | sw/source/ui/inc/dbtree.hxx | 2 | ||||
-rw-r--r-- | sw/source/ui/inc/glossary.hxx | 20 | ||||
-rw-r--r-- | sw/source/ui/inc/optload.hxx | 4 | ||||
-rw-r--r-- | sw/source/ui/inc/redlndlg.hxx | 8 | ||||
-rw-r--r-- | sw/source/ui/inc/regionsw.hxx | 2 |
7 files changed, 48 insertions, 48 deletions
diff --git a/sw/source/ui/inc/changedb.hxx b/sw/source/ui/inc/changedb.hxx index c7f6042c6e47..3395075623a3 100644 --- a/sw/source/ui/inc/changedb.hxx +++ b/sw/source/ui/inc/changedb.hxx @@ -72,7 +72,7 @@ class SwChangeDBDlg: public SvxStandardDialog virtual void Apply(); void UpdateFlds(); void FillDBPopup(); - SvLBoxEntry* Insert(const String& rDBName); + SvTreeListEntry* Insert(const String& rDBName); void ShowDBName(const SwDBData& rDBData); public: diff --git a/sw/source/ui/inc/conttree.hxx b/sw/source/ui/inc/conttree.hxx index 5725a5df0826..29445acf584d 100644 --- a/sw/source/ui/inc/conttree.hxx +++ b/sw/source/ui/inc/conttree.hxx @@ -110,7 +110,7 @@ class SwContentTree : public SvTreeListBox protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); virtual void DataChanged( const DataChangedEvent& rDCEvt ); SwNavigationPI* GetParentWindow(){return @@ -127,22 +127,22 @@ protected: sal_Bool HasContentChanged(); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); - void EditEntry( SvLBoxEntry* pEntry, sal_uInt8 nMode ); + void EditEntry( SvTreeListEntry* pEntry, sal_uInt8 nMode ); void GotoContent(SwContent* pCnt); static void SetInDrag(sal_Bool bSet) {bIsInDrag = bSet;} @@ -179,9 +179,9 @@ public: sal_uInt8 GetOutlineLevel()const {return nOutlineLevel;} void SetOutlineLevel(sal_uInt8 nSet); - sal_Bool Expand( SvLBoxEntry* pParent ); + sal_Bool Expand( SvTreeListEntry* pParent ); - sal_Bool Collapse( SvLBoxEntry* pParent ); + sal_Bool Collapse( SvTreeListEntry* pParent ); void ExecCommand(sal_uInt16 nCmd, sal_Bool bModifier); @@ -198,12 +198,12 @@ public: DECL_LINK( ContentDoubleClickHdl, void * ); DECL_LINK( TimerUpdate, void * ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual void RequestingChildren( SvLBoxEntry* pParent ); + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual void RequestingChildren( SvTreeListEntry* pParent ); virtual void GetFocus(); virtual void KeyInput(const KeyEvent& rKEvt); - virtual sal_Bool Select( SvLBoxEntry* pEntry, sal_Bool bSelect=sal_True ); + virtual sal_Bool Select( SvTreeListEntry* pEntry, sal_Bool bSelect=sal_True ); }; @@ -215,13 +215,13 @@ class SwLBoxString : public SvLBoxString { public: - SwLBoxString( SvLBoxEntry* pEntry, sal_uInt16 nFlags, + SwLBoxString( SvTreeListEntry* pEntry, sal_uInt16 nFlags, const String& rStr ) : SvLBoxString(pEntry,nFlags,rStr) { } virtual void Paint( const Point& rPos, SvTreeListBox& rDev, sal_uInt16 nFlags, - SvLBoxEntry* pEntry); + SvTreeListEntry* pEntry); }; namespace sfx2 { class DocumentInserter; } @@ -236,8 +236,8 @@ private: ImageList aEntryImages; SwWrtShell* pActiveShell; // - SvLBoxEntry* pEmphasisEntry; // Drag'n Drop emphasis - SvLBoxEntry* pDDSource; // source for Drag'n Drop + SvTreeListEntry* pEmphasisEntry; // Drag'n Drop emphasis + SvTreeListEntry* pDDSource; // source for Drag'n Drop SwGlblDocContents* pSwGlblDocContents; // array with sorted content Window* pDefParentWin; @@ -269,30 +269,30 @@ protected: virtual void RequestHelp( const HelpEvent& rHEvt ); - virtual long GetTabPos( SvLBoxEntry*, SvLBoxTab* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual long GetTabPos( SvTreeListEntry*, SvLBoxTab* ); + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); virtual void DragFinished( sal_Int8 ); virtual DragDropMode NotifyStartDrag( TransferDataContainer& rData, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); virtual void MouseButtonDown( const MouseEvent& rMEvt ); virtual void KeyInput(const KeyEvent& rKEvt); virtual void GetFocus(); virtual void SelectHdl(); virtual void DeselectHdl(); - virtual void InitEntry(SvLBoxEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); + virtual void InitEntry(SvTreeListEntry*,const XubString&,const Image&,const Image&,SvLBoxButtonKind); void Clear(); diff --git a/sw/source/ui/inc/dbtree.hxx b/sw/source/ui/inc/dbtree.hxx index fdcaf5368259..f4e060d13697 100644 --- a/sw/source/ui/inc/dbtree.hxx +++ b/sw/source/ui/inc/dbtree.hxx @@ -53,7 +53,7 @@ class SW_DLLPUBLIC SwDBTreeList : public SvTreeListBox SW_DLLPRIVATE DECL_LINK( DBCompare, SvSortData* ); SW_DLLPRIVATE void InitTreeList(); - SW_DLLPRIVATE virtual void RequestingChildren( SvLBoxEntry* pParent ); + SW_DLLPRIVATE virtual void RequestingChildren( SvTreeListEntry* pParent ); SW_DLLPRIVATE virtual sal_Int8 AcceptDrop( const AcceptDropEvent& rEvt ); SW_DLLPRIVATE virtual void StartDrag( sal_Int8 nAction, const Point& rPosPixel ); diff --git a/sw/source/ui/inc/glossary.hxx b/sw/source/ui/inc/glossary.hxx index c707f46e25e6..5a4b26284dff 100644 --- a/sw/source/ui/inc/glossary.hxx +++ b/sw/source/ui/inc/glossary.hxx @@ -63,20 +63,20 @@ class SwGlTreeListBox : public SvTreeListBox { const String sReadonly; - SvLBoxEntry* pDragEntry; + SvTreeListEntry* pDragEntry; virtual DragDropMode NotifyStartDrag( TransferDataContainer& rContainer, - SvLBoxEntry* ); - virtual sal_Bool NotifyAcceptDrop( SvLBoxEntry* ); + SvTreeListEntry* ); + virtual sal_Bool NotifyAcceptDrop( SvTreeListEntry* ); - virtual sal_Bool NotifyMoving( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyMoving( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos ); - virtual sal_Bool NotifyCopying( SvLBoxEntry* pTarget, - SvLBoxEntry* pEntry, - SvLBoxEntry*& rpNewParent, + virtual sal_Bool NotifyCopying( SvTreeListEntry* pTarget, + SvTreeListEntry* pEntry, + SvTreeListEntry*& rpNewParent, sal_uLong& rNewChildPos); public: SwGlTreeListBox(Window* pParent, const ResId& rResId); @@ -148,7 +148,7 @@ class SwGlossaryDlg : public SvxStandardDialog virtual void Apply(); void Init(); - SvLBoxEntry* DoesBlockExist(const String& sBlock, const String& rShort); + SvTreeListEntry* DoesBlockExist(const String& sBlock, const String& rShort); void ShowAutoText(const String& rGroup, const String& rShortName); void ResumeShowAutoText(); diff --git a/sw/source/ui/inc/optload.hxx b/sw/source/ui/inc/optload.hxx index 908aa53b97ef..162bf6e95457 100644 --- a/sw/source/ui/inc/optload.hxx +++ b/sw/source/ui/inc/optload.hxx @@ -32,7 +32,7 @@ #include <caption.hxx> class SwFldMgr; -class SvLBoxEntry; +class SvTreeListEntry; class SwWrtShell; class SwLoadOptPage : public SfxTabPage @@ -171,7 +171,7 @@ private: void SetOptions( const sal_uInt16 nPos, const SwCapObjType eType, const SvGlobalName *pOleId = 0); - void SaveEntry( SvLBoxEntry* pEntry ); + void SaveEntry( SvTreeListEntry* pEntry ); void DrawSample(); public: diff --git a/sw/source/ui/inc/redlndlg.hxx b/sw/source/ui/inc/redlndlg.hxx index c90a0edf0e18..6a47e80053c7 100644 --- a/sw/source/ui/inc/redlndlg.hxx +++ b/sw/source/ui/inc/redlndlg.hxx @@ -47,14 +47,14 @@ struct SwRedlineDataChild { const SwRedlineData* pChild; // link to original stacked data const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBChild; // corresponding TreeListBox entry + SvTreeListEntry* pTLBChild; // corresponding TreeListBox entry }; struct SwRedlineDataParent { const SwRedlineData* pData; // RedlineDataPtr const SwRedlineDataChild* pNext; // link to stacked data - SvLBoxEntry* pTLBParent; // corresponding TreeListBox entry + SvTreeListEntry* pTLBParent; // corresponding TreeListBox entry String sComment; // redline comment inline sal_Bool operator==( const SwRedlineDataParent& rObj ) const @@ -72,7 +72,7 @@ typedef SwRedlineDataChild* SwRedlineDataChildPtr; typedef boost::ptr_vector<SwRedlineDataChild> SwRedlineDataChildArr; -typedef SvLBoxEntry* SvLBoxEntryPtr; +typedef SvTreeListEntry* SvLBoxEntryPtr; typedef std::vector<SvLBoxEntryPtr> SvLBoxEntryArr; class SW_DLLPUBLIC SwRedlineAcceptDlg @@ -122,7 +122,7 @@ class SW_DLLPUBLIC SwRedlineAcceptDlg SW_DLLPRIVATE String GetRedlineText(const SwRedline& rRedln, DateTime &rDateTime, sal_uInt16 nStack = 0); SW_DLLPRIVATE const String& GetActionText(const SwRedline& rRedln, sal_uInt16 nStack = 0); - SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvLBoxEntry& rEntry) const; + SW_DLLPRIVATE sal_uInt16 GetRedlinePos( const SvTreeListEntry& rEntry) const; public: SwRedlineAcceptDlg(Dialog *pParent, sal_Bool bAutoFmt = sal_False); diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx index 8fce92f63ed1..37193e4cda4f 100644 --- a/sw/source/ui/inc/regionsw.hxx +++ b/sw/source/ui/inc/regionsw.hxx @@ -119,7 +119,7 @@ class SwEditRegionDlg : public SfxModalDialog Image BuildBitmap(sal_Bool bProtect,sal_Bool bHidden); - void RecurseList( const SwSectionFmt* pFmt, SvLBoxEntry* pEntry); + void RecurseList( const SwSectionFmt* pFmt, SvTreeListEntry* pEntry); sal_uInt16 FindArrPos(const SwSectionFmt* pFmt); DECL_LINK( GetFirstEntryHdl, SvTreeListBox * ); |