This is an automated email from the ASF dual-hosted git repository. mseidel pushed a commit to branch AOO42X in repository https://gitbox.apache.org/repos/asf/openoffice.git
commit f2389edd5dd1c181727d504c78a8961511a8c8b8 Author: Damjan Jovanovic <[email protected]> AuthorDate: Tue Feb 5 18:51:13 2019 +0000 Win64 fixes for dtrans. Patch by: me git-svn-id: https://svn.apache.org/repos/asf/openoffice/trunk@1853027 13f79535-47bb-0310-9956-ffa450edef68 (cherry picked from commit 39b86c7f3641ba36042caf636ce97e357c40ff77) --- main/dtrans/source/inc/MtaOleClipb.hxx | 6 +++--- main/dtrans/source/win32/mtaole/MtaOleClipb.cxx | 16 ++++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/main/dtrans/source/inc/MtaOleClipb.hxx b/main/dtrans/source/inc/MtaOleClipb.hxx index 8038143bc6..74f844123a 100644 --- a/main/dtrans/source/inc/MtaOleClipb.hxx +++ b/main/dtrans/source/inc/MtaOleClipb.hxx @@ -81,9 +81,9 @@ private: // from a different thread context! //--------------------------------------------------------------- - LRESULT onSetClipboard( IDataObject* pIDataObject ); - LRESULT onGetClipboard( LPSTREAM* ppStream ); - LRESULT onFlushClipboard( ); + HRESULT onSetClipboard( IDataObject* pIDataObject ); + HRESULT onGetClipboard( LPSTREAM* ppStream ); + HRESULT onFlushClipboard( ); sal_Bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback ); // win32 clipboard-viewer support diff --git a/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx b/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx index aeb0965921..f962b680c5 100644 --- a/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx +++ b/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx @@ -540,16 +540,16 @@ sal_Bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfn // //-------------------------------------------------------------------- -LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject ) +HRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject ) { - return static_cast<LRESULT>( OleSetClipboard( pIDataObject ) ); + return OleSetClipboard( pIDataObject ); } //-------------------------------------------------------------------- // //-------------------------------------------------------------------- -LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) +HRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) { OSL_ASSERT(NULL != ppStream); @@ -562,16 +562,16 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream); OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed"); } - return static_cast<LRESULT>(hr); + return hr; } //-------------------------------------------------------------------- // flush the ole-clipboard //-------------------------------------------------------------------- -LRESULT CMtaOleClipboard::onFlushClipboard( ) +HRESULT CMtaOleClipboard::onFlushClipboard( ) { - return static_cast<LRESULT>( OleFlushClipboard( ) ); + return OleFlushClipboard( ); } //-------------------------------------------------------------------- @@ -585,7 +585,7 @@ LRESULT CMtaOleClipboard::onChangeCBChain( HWND hWndRemove, HWND hWndNext ) else if ( IsWindow( m_hwndNextClipViewer ) ) { // forward the message to the next one - DWORD dwResult; + DWORD_PTR dwResult; SendMessageTimeoutA( m_hwndNextClipViewer, WM_CHANGECBCHAIN, @@ -620,7 +620,7 @@ LRESULT CMtaOleClipboard::onDrawClipboard( ) // forward the message to the next viewer in the chain if ( IsWindow( m_hwndNextClipViewer ) ) { - DWORD dwResult; + DWORD_PTR dwResult; SendMessageTimeoutA( m_hwndNextClipViewer, WM_DRAWCLIPBOARD,
