From edcb5a3c42fbfc30794c98daffef4bd79fb570e1 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Mon, 31 Aug 2015 11:24:01 +0100 Subject: Disconnect and Connect don't do anything now Change-Id: If18f530f613e7cb9d0c8f0989752f31178c97dcd --- include/svl/svdde.hxx | 2 -- svl/source/svdde/ddesvr.cxx | 11 ----------- svl/unx/source/svdde/ddedummy.cxx | 8 -------- 3 files changed, 21 deletions(-) diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx index f946da2471a6..9889774f3226 100644 --- a/include/svl/svdde.hxx +++ b/include/svl/svdde.hxx @@ -288,8 +288,6 @@ class SVL_DLLPUBLIC DdeTopic SVL_DLLPRIVATE void _Disconnect( sal_IntPtr ); public: - void Connect( sal_IntPtr ); - void Disconnect( sal_IntPtr ); virtual DdeData* Get(SotClipboardFormatId); virtual bool Put( const DdeData* ); virtual bool Execute( const OUString* ); diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 0c9c6a69bfac..e2b7e61d19dd 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -170,7 +170,6 @@ HDDEDATA CALLBACK DdeInternal::SvrCallback( pTopic = FindTopic( *pService, hText1 ); if ( pTopic ) { - pTopic->Connect( (sal_IntPtr) hConv ); pC = new Conversation; pC->hConv = hConv; pC->pTopic = pTopic; @@ -678,21 +677,11 @@ void DdeTopic::NotifyClient( const OUString& rItem ) } } -void DdeTopic::Connect( sal_IntPtr /*nId*/ ) -{ -} - -void DdeTopic::Disconnect( sal_IntPtr /*nId*/ ) -{ -} - void DdeTopic::_Disconnect( sal_IntPtr nId ) { std::vector::iterator iter; for (iter = aItems.begin(); iter != aItems.end(); ++iter) (*iter)->DecMonitor( nId ); - - Disconnect( nId ); } DdeData* DdeTopic::Get(SotClipboardFormatId /*nFmt*/) 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* ) { } -- cgit