diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2015-05-04 17:28:40 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2015-05-05 10:21:54 +0200 |
| commit | 8cafd08278c0b925aac91ea94d8f907d98f07047 (patch) | |
| tree | 1c2b0e57c895511fdc67f8063647cc520ef5eaeb /svtools/source/graphic | |
| parent | 3363f828d63775a11073276dce927b9538b57be6 (diff) | |
Use typed Timer::SetTimeoutHdl Link
Change-Id: Iaaf0c93e5b28c0f7dbe4f02eda8beeae30708100
Diffstat (limited to 'svtools/source/graphic')
| -rw-r--r-- | svtools/source/graphic/grfcache.cxx | 4 | ||||
| -rw-r--r-- | svtools/source/graphic/grfcache.hxx | 2 | ||||
| -rw-r--r-- | svtools/source/graphic/grfmgr.cxx | 4 |
3 files changed, 3 insertions, 7 deletions
diff --git a/svtools/source/graphic/grfcache.cxx b/svtools/source/graphic/grfcache.cxx index 2faf23e4f401..80a39809f039 100644 --- a/svtools/source/graphic/grfcache.cxx +++ b/svtools/source/graphic/grfcache.cxx @@ -1236,7 +1236,7 @@ GraphicCacheEntry* GraphicCache::ImplGetCacheEntry( const GraphicObject& rObj ) return pRet; } -IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer ) +IMPL_LINK_TYPED( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer, void ) { pTimer->Stop(); @@ -1261,8 +1261,6 @@ IMPL_LINK( GraphicCache, ReleaseTimeoutHdl, Timer*, pTimer ) } pTimer->Start(); - - return 0; } /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svtools/source/graphic/grfcache.hxx b/svtools/source/graphic/grfcache.hxx index a1c990c08ea7..6164cb2b0085 100644 --- a/svtools/source/graphic/grfcache.hxx +++ b/svtools/source/graphic/grfcache.hxx @@ -51,7 +51,7 @@ private: GraphicCacheEntry* ImplGetCacheEntry( const GraphicObject& rObj ); - DECL_LINK( ReleaseTimeoutHdl, Timer* pTimer ); + DECL_LINK_TYPED( ReleaseTimeoutHdl, Timer* pTimer, void ); public: diff --git a/svtools/source/graphic/grfmgr.cxx b/svtools/source/graphic/grfmgr.cxx index 29fe3424b7ab..4d60d73ddcaf 100644 --- a/svtools/source/graphic/grfmgr.cxx +++ b/svtools/source/graphic/grfmgr.cxx @@ -1055,7 +1055,7 @@ void GraphicObject::SetSwapState() } } -IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) +IMPL_LINK_NOARG_TYPED(GraphicObject, ImplAutoSwapOutHdl, Timer *, void) { if( !IsSwappedOut() ) { @@ -1084,8 +1084,6 @@ IMPL_LINK_NOARG(GraphicObject, ImplAutoSwapOutHdl) if( mpSwapOutTimer ) mpSwapOutTimer->Start(); - - return 0L; } SvStream& ReadGraphicObject( SvStream& rIStm, GraphicObject& rGraphicObj ) |