Kaydet (Commit) eb5e2dea authored tarafından Damjan Jovanovic's avatar Damjan Jovanovic Kaydeden (comit) Caolán McNamara

Win64 fixes for dtrans.

Patch by: me

(cherry picked from commit 7595a809)

Change-Id: I59a561aad16073fec1567e1873842a2b11dff4df
Reviewed-on: https://gerrit.libreoffice.org/67594
Tested-by: Jenkins
Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 7c304fa6
...@@ -458,12 +458,12 @@ bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncCli ...@@ -458,12 +458,12 @@ bool CMtaOleClipboard::onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncCli
return bRet; return bRet;
} }
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(nullptr != ppStream); OSL_ASSERT(nullptr != ppStream);
...@@ -476,14 +476,14 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream ) ...@@ -476,14 +476,14 @@ LRESULT CMtaOleClipboard::onGetClipboard( LPSTREAM* ppStream )
hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream); hr = MarshalIDataObjectInStream(pIDataObject.get(), ppStream);
OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed"); OSL_ENSURE(SUCCEEDED(hr), "marshalling cliboard data object failed");
} }
return static_cast<LRESULT>(hr); return hr;
} }
// flush the ole-clipboard // flush the ole-clipboard
LRESULT CMtaOleClipboard::onFlushClipboard( ) HRESULT CMtaOleClipboard::onFlushClipboard( )
{ {
return static_cast<LRESULT>( OleFlushClipboard( ) ); return OleFlushClipboard();
} }
// handle clipboard update event // handle clipboard update event
......
...@@ -67,9 +67,9 @@ private: ...@@ -67,9 +67,9 @@ private:
// message handler functions; remember these functions are called // message handler functions; remember these functions are called
// from a different thread context! // from a different thread context!
static LRESULT onSetClipboard( IDataObject* pIDataObject ); static HRESULT onSetClipboard( IDataObject* pIDataObject );
static LRESULT onGetClipboard( LPSTREAM* ppStream ); static HRESULT onGetClipboard( LPSTREAM* ppStream );
static LRESULT onFlushClipboard( ); static HRESULT onFlushClipboard( );
bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback ); bool onRegisterClipViewer( LPFNC_CLIPVIEWER_CALLBACK_t pfncClipViewerCallback );
// win32 clipboard listener support // win32 clipboard listener support
......
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