diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-09 21:29:49 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-10 11:25:45 +0200 |
| commit | 73d0dfd51caaa4cce8ad195fa2631f3fa00d691c (patch) | |
| tree | 77926d9ab23e0fff4781725d3f9952869d1c2401 /include | |
| parent | 3ae4264a0db7f725abc33779ec9b11a45e17e279 (diff) | |
Replace IMPL_STATIC_LINK[_TYPED] with more useful variants
Change-Id: I344ba9d22adada82170d45a4cf723af6a286b883
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/asynclink.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/calendar.hxx | 2 | ||||
| -rw-r--r-- | include/svtools/svparser.hxx | 4 | ||||
| -rw-r--r-- | include/svtools/treelistbox.hxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/include/svtools/asynclink.hxx b/include/svtools/asynclink.hxx index 643e002dd703..449a4db81b4c 100644 --- a/include/svtools/asynclink.hxx +++ b/include/svtools/asynclink.hxx @@ -40,8 +40,8 @@ class SVT_DLLPUBLIC AsynchronLink void* _pArg; ::osl::Mutex* _pMutex; - DECL_DLLPRIVATE_STATIC_LINK_TYPED( AsynchronLink, HandleCall_Idle, Idle*, void ); - DECL_DLLPRIVATE_STATIC_LINK( AsynchronLink, HandleCall_PostUserEvent, void* ); + DECL_DLLPRIVATE_LINK_TYPED( HandleCall_Idle, Idle*, void ); + DECL_DLLPRIVATE_LINK( HandleCall_PostUserEvent, void* ); SVT_DLLPRIVATE void Call_Impl( void* pArg ); public: diff --git a/include/svtools/calendar.hxx b/include/svtools/calendar.hxx index f1245fe3e048..c7f503ea4da3 100644 --- a/include/svtools/calendar.hxx +++ b/include/svtools/calendar.hxx @@ -254,7 +254,7 @@ private: protected: - DECL_STATIC_LINK_TYPED( Calendar, ScrollHdl, Timer *, void ); + DECL_LINK_TYPED( ScrollHdl, Timer *, void ); public: Calendar( vcl::Window* pParent, WinBits nWinStyle = 0 ); diff --git a/include/svtools/svparser.hxx b/include/svtools/svparser.hxx index 9fbd66fa21a0..b8705dc16ffc 100644 --- a/include/svtools/svparser.hxx +++ b/include/svtools/svparser.hxx @@ -44,7 +44,7 @@ enum SvParserState class SVT_DLLPUBLIC SvParser : public SvRefBase { - DECL_STATIC_LINK( SvParser, NewDataRead, void* ); + DECL_LINK( NewDataRead, void* ); protected: SvStream& rInput; @@ -138,7 +138,7 @@ public: Link<> GetAsynchCallLink() const { return LINK( const_cast<SvParser*>(this), SvParser, NewDataRead ); } - long CallAsyncCallLink() { return NewDataRead( this, 0 ); } + long CallAsyncCallLink() { return NewDataRead( 0 ); } // for asynchronous reading from the SvStream void SaveState( int nToken ); diff --git a/include/svtools/treelistbox.hxx b/include/svtools/treelistbox.hxx index d6a71ff5d15c..619b5cb8e2f4 100644 --- a/include/svtools/treelistbox.hxx +++ b/include/svtools/treelistbox.hxx @@ -309,7 +309,7 @@ private: // called for a deleted object. SVT_DLLPRIVATE static void AddBoxToDDList_Impl( const SvTreeListBox& rB ); SVT_DLLPRIVATE static void RemoveBoxFromDDList_Impl( const SvTreeListBox& rB ); - DECL_DLLPRIVATE_STATIC_LINK( SvTreeListBox, DragFinishHdl_Impl, sal_Int8* ); + DECL_DLLPRIVATE_LINK( DragFinishHdl_Impl, sal_Int8* ); protected: |