From f1a8c3119f5c5cef8f3a421dace54237ac8794d3 Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Wed, 5 Oct 2016 13:39:25 +0200 Subject: Replace DdeData conversion operators with proper functions Change-Id: I866bdcbf1b6a5cda4472b6655ace866a3d5a8983 --- svl/source/svdde/ddecli.cxx | 4 ++-- svl/source/svdde/ddedata.cxx | 4 ++-- svl/unx/source/svdde/ddedummy.cxx | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) (limited to 'svl') diff --git a/svl/source/svdde/ddecli.cxx b/svl/source/svdde/ddecli.cxx index 29010286c9a6..b46d80cd3875 100644 --- a/svl/source/svdde/ddecli.cxx +++ b/svl/source/svdde/ddecli.cxx @@ -278,8 +278,8 @@ DdeTransaction::~DdeTransaction() void DdeTransaction::Execute() { HSZ hItem = *pName; - void* pData = (void*)(const void *)aDdeData; - DWORD nData = (DWORD)(long)aDdeData; + void* pData = (void*)aDdeData.getData(); + DWORD nData = (DWORD)aDdeData.getSize(); SotClipboardFormatId nIntFmt = aDdeData.pImp->nFmt; UINT nExtFmt = DdeData::GetExternalFormat( nIntFmt ); DdeInstData* pInst = ImpGetInstData(); diff --git a/svl/source/svdde/ddedata.cxx b/svl/source/svdde/ddedata.cxx index ce0773391ba8..71d41b86db11 100644 --- a/svl/source/svdde/ddedata.cxx +++ b/svl/source/svdde/ddedata.cxx @@ -90,12 +90,12 @@ void DdeData::SetFormat(SotClipboardFormatId nFmt) pImp->nFmt = nFmt; } -DdeData::operator const void*() const +void const * DdeData::getData() const { return pImp->pData; } -DdeData::operator long() const +long DdeData::getSize() const { return pImp->nData; } diff --git a/svl/unx/source/svdde/ddedummy.cxx b/svl/unx/source/svdde/ddedummy.cxx index fc158a3035e9..8714e9201be8 100644 --- a/svl/unx/source/svdde/ddedummy.cxx +++ b/svl/unx/source/svdde/ddedummy.cxx @@ -58,12 +58,12 @@ DdeData& DdeData::operator = ( const DdeData& ) return *this; } -DdeData::operator long() const +long DdeData::getSize() const { return 0L; } -DdeData::operator const void*() const +void const * DdeData::getData() const { return nullptr; } -- cgit