summaryrefslogtreecommitdiffstats
path: root/include/svtools
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2015-08-31 14:34:51 +0200
committerNoel Grandin <noel@peralex.com>2015-09-04 13:08:30 +0200
commited7ea6885400d62c84304917493ded4ba376c361 (patch)
treeaff4993be940f764817737f938fa20ff0f0a26fd /include/svtools
parentconvert Link<> to typed (diff)
downloadcore-ed7ea6885400d62c84304917493ded4ba376c361.tar.gz
core-ed7ea6885400d62c84304917493ded4ba376c361.zip
convert Link<> to typed
Change-Id: I42eba6c9b6295d94dddc49942d47d59f474bfd28
Diffstat (limited to 'include/svtools')
-rw-r--r--include/svtools/simptabl.hxx2
-rw-r--r--include/svtools/treelist.hxx12
-rw-r--r--include/svtools/treelistbox.hxx4
3 files changed, 9 insertions, 9 deletions
diff --git a/include/svtools/simptabl.hxx b/include/svtools/simptabl.hxx
index 4e1c64a6ec13..f892646e2231 100644
--- a/include/svtools/simptabl.hxx
+++ b/include/svtools/simptabl.hxx
@@ -67,7 +67,7 @@ private:
DECL_LINK_TYPED( DragHdl, HeaderBar*, void );
DECL_LINK_TYPED( EndDragHdl, HeaderBar*, void );
DECL_LINK_TYPED( HeaderBarClick, HeaderBar*, void );
- DECL_LINK( CompareHdl, SvSortData* );
+ DECL_LINK_TYPED( CompareHdl, const SvSortData&, sal_Int32 );
protected:
diff --git a/include/svtools/treelist.hxx b/include/svtools/treelist.hxx
index 510014ab507c..26e3f90d63b4 100644
--- a/include/svtools/treelist.hxx
+++ b/include/svtools/treelist.hxx
@@ -71,8 +71,8 @@ class SVT_DLLPUBLIC SvTreeList
ListViewsType aViewList;
sal_uLong nEntryCount;
- Link<> aCloneLink;
- Link<> aCompareLink;
+ Link<SvTreeListEntry*, SvTreeListEntry*> aCloneLink;
+ Link<const SvSortData&, sal_Int32> aCompareLink;
SvSortMode eSortMode;
sal_uInt16 nRefCount;
@@ -213,11 +213,11 @@ public:
// Declaration of the Clone Handler:
// DECL_LINK(CloneHdl,SvTreeListEntry*);
// The Handler needs to return a SvTreeListEntry*
- SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
- void SetCloneLink( const Link<>& rLink )
+ SvTreeListEntry* Clone( SvTreeListEntry* pEntry, sal_uLong& nCloneCount ) const;
+ void SetCloneLink( const Link<SvTreeListEntry*,SvTreeListEntry*>& rLink )
{ aCloneLink=rLink; }
- const Link<>& GetCloneLink() const
+ const Link<SvTreeListEntry*,SvTreeListEntry*>& GetCloneLink() const
{ return aCloneLink; }
SvTreeListEntry* CloneEntry( SvTreeListEntry* pSource ) const; // Calls the Clone Link
@@ -229,7 +229,7 @@ public:
void SetSortMode( SvSortMode eMode ) { eSortMode = eMode; }
SvSortMode GetSortMode() const { return eSortMode; }
sal_Int32 Compare(const SvTreeListEntry* pLeft, const SvTreeListEntry* pRight) const;
- void SetCompareHdl( const Link<>& rLink ) { aCompareLink = rLink; }
+ void SetCompareHdl( const Link<const SvSortData&, sal_Int32>& rLink ) { aCompareLink = rLink; }
void Resort();
void Reverse();
};
diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx
index 83789c788cf1..8e463afd3c5b 100644
--- a/include/svtools/treelistbox.hxx
+++ b/include/svtools/treelistbox.hxx
@@ -297,7 +297,7 @@ private:
DECL_DLLPRIVATE_LINK_TYPED( CheckButtonClick, SvLBoxButtonData *, void );
DECL_DLLPRIVATE_LINK( TextEditEndedHdl_Impl, void * );
// Handler that is called by TreeList to clone an Entry
- DECL_DLLPRIVATE_LINK( CloneHdl_Impl, SvTreeListEntry* );
+ DECL_DLLPRIVATE_LINK_TYPED( CloneHdl_Impl, SvTreeListEntry*, SvTreeListEntry* );
// Handler and methods for Drag - finished handler.
// The Handle retrieved by GetDragFinishedHdl can be set on the
@@ -777,7 +777,7 @@ public:
// A Parent's Children are turned into Children of the Parent which comes next in hierarchy
void RemoveParentKeepChildren( SvTreeListEntry* pParent );
- DECL_LINK( DefaultCompare, SvSortData* );
+ DECL_LINK_TYPED( DefaultCompare, const SvSortData&, sal_Int32 );
virtual void ModelNotification( SvListAction nActionId, SvTreeListEntry* pEntry1,
SvTreeListEntry* pEntry2, sal_uLong nPos ) SAL_OVERRIDE;