diff options
author | Noel Grandin <noel@peralex.com> | 2016-04-06 11:28:44 +0200 |
---|---|---|
committer | Noel Grandin <noelgrandin@gmail.com> | 2016-04-06 11:46:53 +0000 |
commit | 88e3b846b8a4bd4ce5507d1bc5441ee4167e5326 (patch) | |
tree | 6dbff3db12e6394534ee331644424691bad6325b /svl | |
parent | ce28d83912d14bc81c455af64893842de78a8c8d (diff) |
remove some dead bits of DDE
Change-Id: Ieb1d4e23f1a62b56d14a655a676d9c7d5f33c51c
Reviewed-on: https://gerrit.libreoffice.org/23849
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Tested-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svl')
-rw-r--r-- | svl/source/svdde/ddesvr.cxx | 42 | ||||
-rw-r--r-- | svl/unx/source/svdde/ddedummy.cxx | 30 |
2 files changed, 5 insertions, 67 deletions
diff --git a/svl/source/svdde/ddesvr.cxx b/svl/source/svdde/ddesvr.cxx index 266db826dc8b..43040c93ae6b 100644 --- a/svl/source/svdde/ddesvr.cxx +++ b/svl/source/svdde/ddesvr.cxx @@ -245,9 +245,9 @@ found: else if ( pTopic->aItem == reinterpret_cast<const sal_Unicode*>(SZDDESYS_ITEM_FORMATS) ) aRes = pService->Formats(); else if ( pTopic->aItem == reinterpret_cast<const sal_Unicode*>(SZDDESYS_ITEM_HELP) ) - aRes = pService->GetHelp(); + aRes = OUString(); else - aRes = pService->SysTopicGet( pTopic->aItem ); + aRes = OUString(); if ( !aRes.isEmpty() ) pData = new DdeData( aRes ); @@ -337,8 +337,6 @@ found: case XTYP_ADVSTOP: pItem->DecMonitor( (sal_IntPtr)hConv ); - if( !pItem->pImpData ) - pTopic->StopAdviseLoop(); pInst->hCurConvSvr = 0; return (HDDEDATA)sal_True; @@ -353,7 +351,7 @@ found: aName = (const sal_Unicode *)aExec.pImp->pData; if( pTopic->IsSystemTopic() ) - bRes = pService->SysTopicExecute( &aName ); + bRes = false; else bRes = pTopic->Execute( &aName ); } @@ -403,7 +401,7 @@ DdeTopic* DdeInternal::FindTopic( DdeService& rService, HSZ hTopic ) // Let's query our subclass TCHAR chBuf[250]; DdeQueryString(pInst->hDdeInstSvr,hTopic,chBuf,sizeof(chBuf)/sizeof(TCHAR),CP_WINUNICODE ); - bContinue = rService.MakeTopic( reinterpret_cast<const sal_Unicode*>(chBuf) ); + bContinue = false; // We need to search again } while( bContinue ); @@ -711,11 +709,6 @@ bool DdeTopic::StartAdviseLoop() return false; } -bool DdeTopic::StopAdviseLoop() -{ - return false; -} - DdeItem::DdeItem( const sal_Unicode* p ) { DdeInstData* pInst = ImpGetInstData(); @@ -940,17 +933,7 @@ OUString DdeService::Formats() OUString DdeService::Status() { - return IsBusy() ? OUString("Busy\r\n") : OUString("Ready\r\n"); -} - -bool DdeService::IsBusy() -{ - return false; -} - -OUString DdeService::GetHelp() -{ - return OUString(); + return OUString("Ready\r\n"); } bool DdeTopic::MakeItem( const OUString& ) @@ -958,19 +941,4 @@ bool DdeTopic::MakeItem( const OUString& ) return false; } -bool DdeService::MakeTopic( const OUString& ) -{ - return false; -} - -OUString DdeService::SysTopicGet( const OUString& ) -{ - return OUString(); -} - -bool DdeService::SysTopicExecute( const OUString* ) -{ - return false; -} - /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index fb9446115137..fc158a3035e9 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -173,11 +173,6 @@ bool DdeTopic::StartAdviseLoop() return false; } -bool DdeTopic::StopAdviseLoop() -{ - return false; -} - bool DdeTopic::Execute( SAL_UNUSED_PARAMETER const OUString* ) { return false; @@ -220,30 +215,10 @@ OUString DdeService::Status() return OUString(); } -OUString DdeService::SysTopicGet(const OUString& rString) -{ - return rString; -} - -bool DdeService::SysTopicExecute(SAL_UNUSED_PARAMETER const OUString*) -{ - return false; -} - DdeService::~DdeService() { } -bool DdeService::IsBusy() -{ - return false; -} - -OUString DdeService::GetHelp() -{ - return OUString(); -} - void DdeService::AddFormat(SAL_UNUSED_PARAMETER SotClipboardFormatId) { } @@ -256,11 +231,6 @@ void DdeService::RemoveTopic( SAL_UNUSED_PARAMETER const DdeTopic& ) { } -bool DdeService::MakeTopic( SAL_UNUSED_PARAMETER const OUString& ) -{ - return false; -} - const OUString DdeService::GetName() const { return OUString(); |