[Libreoffice-commits] core.git: embedserv/source
Stephan Bergmann
sbergman at redhat.com
Fri Oct 14 12:51:44 UTC 2016
embedserv/source/embed/docholder.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 60e264c4fd78478414278c814d51a8fe4e917780
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>
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx
index 091dd25..d4a6a41 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));
More information about the Libreoffice-commits
mailing list