openoffice-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dam...@apache.org
Subject svn commit: r1853027 - in /openoffice/trunk/main/dtrans/source: inc/MtaOleClipb.hxx win32/mtaole/MtaOleClipb.cxx
Date Tue, 05 Feb 2019 18:51:14 GMT
Author: damjan
Date: Tue Feb  5 18:51:13 2019
New Revision: 1853027

URL: http://svn.apache.org/viewvc?rev=1853027&view=rev
Log:
Win64 fixes for dtrans.

Patch by: me


Modified:
    openoffice/trunk/main/dtrans/source/inc/MtaOleClipb.hxx
    openoffice/trunk/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx

Modified: openoffice/trunk/main/dtrans/source/inc/MtaOleClipb.hxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/inc/MtaOleClipb.hxx?rev=1853027&r1=1853026&r2=1853027&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/inc/MtaOleClipb.hxx (original)
+++ openoffice/trunk/main/dtrans/source/inc/MtaOleClipb.hxx Tue Feb  5 18:51:13 2019
@@ -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

Modified: openoffice/trunk/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx
URL: http://svn.apache.org/viewvc/openoffice/trunk/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx?rev=1853027&r1=1853026&r2=1853027&view=diff
==============================================================================
--- openoffice/trunk/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx (original)
+++ openoffice/trunk/main/dtrans/source/win32/mtaole/MtaOleClipb.cxx Tue Feb  5 18:51:13 2019
@@ -540,16 +540,16 @@ sal_Bool CMtaOleClipboard::onRegisterCli
 // 
 //--------------------------------------------------------------------
 
-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
 		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::onChangeCBChai
 	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::onDrawClipboar
 	// forward the message to the next viewer in the chain
 	if ( IsWindow( m_hwndNextClipViewer ) )
 	{
-		DWORD dwResult;
+		DWORD_PTR dwResult;
 		SendMessageTimeoutA( 
 			m_hwndNextClipViewer, 
 			WM_DRAWCLIPBOARD, 



Mime
View raw message