summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--basic/source/runtime/ddectrl.cxx2
-rw-r--r--include/svl/svdde.hxx4
-rw-r--r--sfx2/source/appl/appdde.cxx2
-rw-r--r--sfx2/source/appl/impldde.cxx4
-rw-r--r--svl/source/svdde/ddecli.cxx4
-rw-r--r--svl/source/svdde/ddedata.cxx4
-rw-r--r--svl/unx/source/svdde/ddedummy.cxx4
7 files changed, 12 insertions, 12 deletions
diff --git a/basic/source/runtime/ddectrl.cxx b/basic/source/runtime/ddectrl.cxx
index 945e610dc1ed..f8882d062efe 100644
--- a/basic/source/runtime/ddectrl.cxx
+++ b/basic/source/runtime/ddectrl.cxx
@@ -69,7 +69,7 @@ SbError SbiDdeControl::GetLastErr( DdeConnection* pConv )
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()
diff --git a/include/svl/svdde.hxx b/include/svl/svdde.hxx
index b0fd3fb17f96..fca3dfd66bb3 100644
--- a/include/svl/svdde.hxx
+++ b/include/svl/svdde.hxx
@@ -67,8 +67,8 @@ public:
DdeData( const DdeData& );
~DdeData();
- operator const void*() const;
- operator long() const;
+ void const * getData() const;
+ long getSize() const;
SotClipboardFormatId GetFormat() const;
diff --git a/sfx2/source/appl/appdde.cxx b/sfx2/source/appl/appdde.cxx
index ffa7930772ea..5c33b4d8a3b0 100644
--- a/sfx2/source/appl/appdde.cxx
+++ b/sfx2/source/appl/appdde.cxx
@@ -540,7 +540,7 @@ DdeData* SfxDdeDocTopic_Impl::Get(SotClipboardFormatId nFormat)
bool SfxDdeDocTopic_Impl::Put( const DdeData* pData )
{
aSeq = css::uno::Sequence< sal_Int8 >(
- (sal_Int8*)(const void*)*pData, (long)*pData );
+ (sal_Int8*)pData->getData(), pData->getSize() );
bool bRet;
if( aSeq.getLength() )
{
diff --git a/sfx2/source/appl/impldde.cxx b/sfx2/source/appl/impldde.cxx
index 2fe0d7e30e05..aafde1c0b17b 100644
--- a/sfx2/source/appl/impldde.cxx
+++ b/sfx2/source/appl/impldde.cxx
@@ -326,8 +326,8 @@ IMPL_LINK( SvDDEObject, ImplGetDDEData, const DdeData*, pData, void )
default:
{
- const sal_Char* p = static_cast<sal_Char const *>(pData->operator const void*());
- long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : (long)*pData;
+ const sal_Char* p = static_cast<sal_Char const *>(pData->getData());
+ long nLen = SotClipboardFormatId::STRING == nFmt ? (p ? strlen( p ) : 0) : pData->getSize();
Sequence< sal_Int8 > aSeq( reinterpret_cast<const sal_Int8*>(p), nLen );
if( pGetData )
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;
}