diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 13:39:25 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-10-05 13:39:25 +0200 |
| commit | f1a8c3119f5c5cef8f3a421dace54237ac8794d3 (patch) | |
| tree | a4cc7b2fa2646553d0de530543f67f6f0df6f74a /sfx2 | |
| parent | 708253a21474cc3797c65d6f053760ab9c3299a3 (diff) | |
Replace DdeData conversion operators with proper functions
Change-Id: I866bdcbf1b6a5cda4472b6655ace866a3d5a8983
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/appl/appdde.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/appl/impldde.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
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 ) |