Kaydet (Commit) f1a8c311 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Replace DdeData conversion operators with proper functions

Change-Id: I866bdcbf1b6a5cda4472b6655ace866a3d5a8983
üst 708253a2
...@@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv ) ...@@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
IMPL_LINK( SbiDdeControl, Data, const DdeData*, pData, void ) IMPL_LINK( SbiDdeControl, Data, const DdeData*, pData, void )
{ {
aData = OUString::createFromAscii( static_cast<const char*>(static_cast<const void*>(*pData)) ); aData = OUString::createFromAscii( static_cast<const char*>(pData->getData()) );
} }
SbiDdeControl::SbiDdeControl() SbiDdeControl::SbiDdeControl()
......
...@@ -67,8 +67,8 @@ public: ...@@ -67,8 +67,8 @@ public:
DdeData( const DdeData& ); DdeData( const DdeData& );
~DdeData(); ~DdeData();
operator const void*() const; void const * getData() const;
operator long() const; long getSize() const;
SotClipboardFormatId GetFormat() const; SotClipboardFormatId GetFormat() const;
......
...@@ -540,7 +540,7 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat) ...@@ -540,7 +540,7 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat)
bool SfxDdeDocTopic_Impl::Put( const DdeData* pData ) bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
{ {
aSeq = css::uno::Sequence< sal_Int8 >( aSeq = css::uno::Sequence< sal_Int8 >(
(sal_Int8*)(const void*)*pData, (long)*pData ); (sal_Int8*)pData->getData(), pData->getSize() );
bool bRet; bool bRet;
if( aSeq.getLength() ) if( aSeq.getLength() )
{ {
......
...@@ -326,8 +326,8 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void ) ...@@ -326,8 +326,8 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
default: default:
{ {
const sal_Char* p = static_cast<sal_Char const *>(pData->operator const void*()); const sal_Char* p = static_cast<sal_Char const *>(pData->getData());
long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : (long)*pData; long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : pData->getSize();
Sequence< sal_Int8 > aSeq( reinterpret_cast<const sal_Int8*>(p), nLen ); Sequence< sal_Int8 > aSeq( reinterpret_cast<const sal_Int8*>(p), nLen );
if( pGetData ) if( pGetData )
......
...@@ -278,8 +278,8 @@ DdeTransaction::~DdeTransaction() ...@@ -278,8 +278,8 @@ DdeTransaction::~DdeTransaction()
void DdeTransaction::Execute() void DdeTransaction::Execute()
{ {
HSZ hItem = *pName; HSZ hItem = *pName;
void* pData = (void*)(const void *)aDdeData; void* pData = (void*)aDdeData.getData();
DWORD nData = (DWORD)(long)aDdeData; DWORD nData = (DWORD)aDdeData.getSize();
SotClipboardFormatId nIntFmt = aDdeData.pImp->nFmt; SotClipboardFormatId nIntFmt = aDdeData.pImp->nFmt;
UINT nExtFmt = DdeData::GetExternalFormat( nIntFmt ); UINT nExtFmt = DdeData::GetExternalFormat( nIntFmt );
DdeInstData* pInst = ImpGetInstData(); DdeInstData* pInst = ImpGetInstData();
......
...@@ -90,12 +90,12 @@ void DdeData::SetFormat(SotClipboardFormatId nFmt) ...@@ -90,12 +90,12 @@ void DdeData::SetFormat(SotClipboardFormatId nFmt)
pImp->nFmt = nFmt; pImp->nFmt = nFmt;
} }
DdeData::operator const void*() const void const * DdeData::getData() const
{ {
return pImp->pData; return pImp->pData;
} }
DdeData::operator long() const long DdeData::getSize() const
{ {
return pImp->nData; return pImp->nData;
} }
......
...@@ -58,12 +58,12 @@ DdeData& DdeData::operator = ( const DdeData& ) ...@@ -58,12 +58,12 @@ DdeData& DdeData::operator = ( const DdeData& )
return *this; return *this;
} }
DdeData::operator long() const long DdeData::getSize() const
{ {
return 0L; return 0L;
} }
DdeData::operator const void*() const void const * DdeData::getData() const
{ {
return nullptr; return nullptr;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment