diff options
| author | Noel Grandin <noel@peralex.com> | 2015-08-13 13:24:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2015-08-14 07:15:01 +0000 |
| commit | adbc556c91ea4afaf3e952aa0a8329e004add63e (patch) | |
| tree | b5d03e056f129abcddf6a53934db07ec611ac19f /sfx2 | |
| parent | c8f0b37528b69b77dbe8596915e34fd915e34b8d (diff) | |
make Link<> instances typed
and remove some unused code
Change-Id: I934824401b5c528b07ad76f753f78440c4492885
Reviewed-on: https://gerrit.libreoffice.org/17703
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/impldde.cxx | 9 | ||||
| -rw-r--r-- | sfx2/source/appl/impldde.hxx | 4 |
2 files changed, 4 insertions, 9 deletions
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx index 12bd1ccacb52..70ed17d20957 100644 --- a/sfx2/source/appl/impldde.cxx +++ b/sfx2/source/appl/impldde.cxx @@ -326,7 +326,7 @@ bool SvDDEObject::IsDataComplete() const return bWaitForData; } -IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData ) +IMPL_LINK_TYPED( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) { SotClipboardFormatId nFmt = pData->GetFormat(); switch( nFmt ) @@ -358,13 +358,10 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, DdeData*, pData ) } } } - - return 0; } -IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData ) +IMPL_LINK_TYPED( SvDDEObject, ImplDoneDDEData, bool, bValid, void ) { - bool bValid = (bool)reinterpret_cast<sal_uIntPtr>(pData); if( !bValid && ( pRequest || pLink )) { DdeTransaction* pReq = 0; @@ -388,8 +385,6 @@ IMPL_LINK( SvDDEObject, ImplDoneDDEData, void*, pData ) else // End waiting bWaitForData = sal_False; - - return 0; } } diff --git a/sfx2/source/appl/impldde.hxx b/sfx2/source/appl/impldde.hxx index b6c66eadf966..0185c0a88b35 100644 --- a/sfx2/source/appl/impldde.hxx +++ b/sfx2/source/appl/impldde.hxx @@ -45,8 +45,8 @@ class SvDDEObject : public SvLinkSource static bool ImplHasOtherFormat( DdeTransaction& ); - DECL_LINK( ImplGetDDEData, DdeData* ); - DECL_LINK( ImplDoneDDEData, void* ); + DECL_LINK_TYPED( ImplGetDDEData, const DdeData*, void ); + DECL_LINK_TYPED( ImplDoneDDEData, bool, void ); protected: virtual ~SvDDEObject(); |