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 /svl | |
| 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 'svl')
| -rw-r--r-- | svl/source/svdde/ddecli.cxx | 5 | ||||
| -rw-r--r-- | svl/source/svdde/ddesvr.cxx | 25 | ||||
| -rw-r--r-- | svl/unx/source/svdde/ddedummy.cxx | 8 |
3 files changed, 5 insertions, 33 deletions
diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index f771075a333d..ada0d241be30 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -335,15 +335,14 @@ void DdeTransaction::Data( const DdeData* p ) { if ( ::tools::SolarMutex::Acquire() ) { - aData.Call( (void*)p ); + aData.Call( p ); ::tools::SolarMutex::Release(); } } void DdeTransaction::Done( bool bDataValid ) { - const sal_uIntPtr nDataValid(bDataValid); - aDone.Call( reinterpret_cast<void*>(nDataValid) ); + aDone.Call( bDataValid ); } DdeLink::DdeLink( DdeConnection& d, const OUString& aItemName, long n ) diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 9e62e12f8afe..9af669bfbf53 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -678,16 +678,6 @@ void DdeTopic::NotifyClient( const OUString& rItem ) } } -void DdeTopic::Connect( sal_IntPtr nId ) -{ - aConnectLink.Call( (void*)nId ); -} - -void DdeTopic::Disconnect( sal_IntPtr nId ) -{ - aDisconnectLink.Call( (void*)nId ); -} - void DdeTopic::_Disconnect( sal_IntPtr nId ) { std::vector<DdeItem*>::iterator iter; @@ -699,26 +689,17 @@ void DdeTopic::_Disconnect( sal_IntPtr nId ) DdeData* DdeTopic::Get(SotClipboardFormatId nFmt) { - if ( aGetLink.IsSet() ) - return (DdeData*)aGetLink.Call( (void*)nFmt ); - else - return NULL; + return NULL; } bool DdeTopic::Put( const DdeData* r ) { - if ( aPutLink.IsSet() ) - return aPutLink.Call( (void*) r ); - else - return false; + return false; } bool DdeTopic::Execute( const OUString* r ) { - if ( aExecLink.IsSet() ) - return aExecLink.Call( (void*)r ); - else - return false; + return false; } long DdeTopic::GetConvId() diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index 4813dc36b5da..b504b5fe38fd 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -145,14 +145,6 @@ DdeTopic::~DdeTopic() { } -void DdeTopic::Connect( SAL_UNUSED_PARAMETER long ) -{ -} - -void DdeTopic::Disconnect( SAL_UNUSED_PARAMETER long ) -{ -} - void DdeTopic::InsertItem( SAL_UNUSED_PARAMETER DdeItem* ) { } |