[Libreoffice-commits] core.git: Branch 'libreoffice-5-2' - embedserv/source

[Stephan Bergmann]

 embedserv/source/embed/docholder.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit b46a6fff4644e5c1cc77f8bc4b6edec7479461e1
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri Oct 14 13:13:36 2016 +0200

    64-bit Windows fix: InsertMenu takes a UINT_PTR
    
    Change-Id: Id14c9ac30d52fdeb6b9157df7f57202e94838909
    Reviewed-on: https://gerrit.libreoffice.org/29817
    Reviewed-by: Stephan Bergmann <sbergman at redhat.com>
    Tested-by: Stephan Bergmann <sbergman at redhat.com>
    (cherry picked from commit 60e264c4fd78478414278c814d51a8fe4e917780)
    Reviewed-on: https://gerrit.libreoffice.org/29965
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>

diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 7708e1e..dea93c1 100644
--- a/embedserv/source/embed/docholder.cxx
+++ b/embedserv/source/embed/docholder.cxx
@@ -511,7 +511,7 @@ void CopyToOLEMenu(HMENU hOrig,WORD origPos,HMENU hDest,WORD destPos)
     subMenu = GetSubMenu(hOrig,origPos);
     GetMenuString(hOrig,origPos,buffer,256,MF_BYPOSITION);
     InsertMenu(hDest,destPos,uTemp,
-               (UINT)subMenu,LPCTSTR(buffer));
+               reinterpret_cast<UINT_PTR>(subMenu),LPCTSTR(buffer));
 
     MENUITEMINFOW mi;
     memset(&mi,0,sizeof(mi));