diff options
| -rw-r--r-- | embedserv/source/embed/docholder.cxx | 2 | ||||
| -rw-r--r-- | framework/source/uielement/menubarmanager.cxx | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/embedserv/source/embed/docholder.cxx b/embedserv/source/embed/docholder.cxx index e3739867126a..a88b1badc7ca 100644 --- a/embedserv/source/embed/docholder.cxx +++ b/embedserv/source/embed/docholder.cxx @@ -377,7 +377,7 @@ HRESULT DocumentHolder::InPlaceActivate( uno::UNO_QUERY); aAny = xSDMP->getMenuHandle( aProcessIdent,lang::SystemDependent::SYSTEM_WIN32); - sal_Int32 tmp; + sal_Int64 tmp; if( aAny >>= tmp ) m_nMenuHandle = HMENU(tmp); m_xLayoutManager->hideElement( diff --git a/framework/source/uielement/menubarmanager.cxx b/framework/source/uielement/menubarmanager.cxx index 3f44ebeeb7e7..5f2b85a10e31 100644 --- a/framework/source/uielement/menubarmanager.cxx +++ b/framework/source/uielement/menubarmanager.cxx @@ -210,7 +210,8 @@ Any SAL_CALL MenuBarManager::getMenuHandle( const Sequence< sal_Int8 >& /*Proces #ifdef _WIN32 if( SystemType == SystemDependent::SYSTEM_WIN32 ) { - a <<= (long) aSystemMenuData.hMenu; + a <<= sal_Int64( + reinterpret_cast<sal_IntPtr>(aSystemMenuData.hMenu)); } #else (void) SystemType; |