[Libreoffice-commits] core.git: dtrans/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Sun Feb 10 20:59:50 UTC 2019
dtrans/source/win32/clipb/MtaOleClipb.cxx | 12 ++++++------
dtrans/source/win32/clipb/MtaOleClipb.hxx | 6 +++---
2 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit eb5e2dea18835df78872a8b0e3446e604f749645
Author: Damjan Jovanovic <damjan at apache.org>
AuthorDate: Tue Feb 5 18:51:13 2019 +0000
Commit: Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Feb 10 21:59:28 2019 +0100
Win64 fixes for dtrans.
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 <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
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<LRESULT>( 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<LRESULT>(hr);
+ return hr;
}
// flush the ole-clipboard
-LRESULT CMtaOleClipboard::onFlushClipboard( )
+HRESULT CMtaOleClipboard::onFlushClipboard( )
{
- return static_cast<LRESULT>( 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
More information about the Libreoffice-commits
mailing list