From eb5e2dea18835df78872a8b0e3446e604f749645 Mon Sep 17 00:00:00 2001 From: Damjan Jovanovic Date: Tue, 5 Feb 2019 18:51:13 +0000 Subject: Win64 fixes for dtrans. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Patch by: me (cherry picked from commit 7595a809d2a4aea9299633546ca95f709133dee8) Change-Id: I59a561aad16073fec1567e1873842a2b11dff4df Reviewed-on: https://gerrit.libreoffice.org/67594 Tested-by: Jenkins Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- dtrans/source/win32/clipb/MtaOleClipb.cxx | 12 ++++++------ dtrans/source/win32/clipb/MtaOleClipb.hxx | 6 +++--- 2 files changed, 9 insertions(+), 9 deletions(-) (limited to 'dtrans') diff --git a/dtrans/source/win32/clipb/MtaOleClipb.cxx b/dtrans/source/win32/clipb/MtaOleClipb.cxx index 2c579e38e741..8b1b07ec7ecd 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.cxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.cxx @@ -458,12 +458,12 @@ bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncCli return bRet; } -LRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject ) +HRESULT CMtaOleClipboard::onSetClipboard( IDataObject* pIDataObject ) { - return static_cast( OleSetClipboard( pIDataObject ) ); + return OleSetClipboard( pIDataObject ); } -LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) +HRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) { OSL_ASSERT(nullptr != ppStream); @@ -476,14 +476,14 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream); OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed"); } - return static_cast(hr); + return hr; } // flush the ole-clipboard -LRESULT CMtaOleClipboard::onFlushClipboard( ) +HRESULT CMtaOleClipboard::onFlushClipboard( ) { - return static_cast( OleFlushClipboard( ) ); + return OleFlushClipboard(); } // handle clipboard update event diff --git a/dtrans/source/win32/clipb/MtaOleClipb.hxx b/dtrans/source/win32/clipb/MtaOleClipb.hxx index f25019d0784c..58583ce6c7e5 100644 --- a/dtrans/source/win32/clipb/MtaOleClipb.hxx +++ b/dtrans/source/win32/clipb/MtaOleClipb.hxx @@ -67,9 +67,9 @@ private: // message handler functions; remember these functions are called // from a different thread context! - static LRESULT onSetClipboard( IDataObject* pIDataObject ); - static LRESULT onGetClipboard( LPSTREAM* ppStream ); - static LRESULT onFlushClipboard( ); + static HRESULT onSetClipboard( IDataObject* pIDataObject ); + static HRESULT onGetClipboard( LPSTREAM* ppStream ); + static HRESULT onFlushClipboard( ); bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback ); // win32 clipboard listener support -- cgit