[Libreoffice-commits] core.git: Branch 'aoo/trunk' - bean/native

[Libreoffice Gerrit user]

 bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 1775410dd8eb06c0b253f5e82118e84d768db5d3
Author:     Damjan Jovanovic <damjan at apache.org>
AuthorDate: Mon Jan 21 05:44:56 2019 +0000
Commit:     Damjan Jovanovic <damjan at apache.org>
CommitDate: Mon Jan 21 05:44:56 2019 +0000

    Some Win64 fixes for main/bean.
    
    Patch by: me

diff --git a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
index 9b698d998ffc..b4f859136ae0 100644
--- a/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
+++ b/bean/native/win32/com_sun_star_comp_beans_LocalOfficeWindow.c
@@ -103,7 +103,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
     JAWT_Win32DrawingSurfaceInfo* dsi_win;
     HDC hdc;
     HWND hWnd;
-    LONG hFuncPtr;
+    LONG_PTR hFuncPtr;
 
     /* Get the AWT */
     awt.version = JAWT_VERSION_1_3;
@@ -146,7 +146,7 @@ JNIEXPORT jlong JNICALL Java_com_sun_star_comp_beans_LocalOfficeWindow_getNative
      */
     if (GetProp( hWnd, OLD_PROC_KEY )==0)
     {
-        hFuncPtr = SetWindowLong( hWnd, GWL_WNDPROC, (DWORD)OpenOfficeWndProc );
+        hFuncPtr = SetWindowLongPtr( hWnd, GWLP_WNDPROC, (ULONG_PTR)OpenOfficeWndProc );
         SetProp( hWnd, OLD_PROC_KEY, (HANDLE)hFuncPtr );
     }