diff options
| author | Johannes Hauf <hauf.johannes@gmail.com> | 2015-12-31 10:58:37 +0100 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2016-01-07 14:13:49 +0000 |
| commit | bccd83ea5434f945c22d0c45dbc2c3d13efdffee (patch) | |
| tree | 22bb90c43394cf3ee281e6c97972d2e207b057b1 /framework | |
| parent | 59ae2d11d5884ffdf77dec95d8cd2566943fd789 (diff) | |
Some cleanup for sal_uIntPtr usage
Change-Id: Ia9779e6477d8848588f3543d09ea6b4477f594a2
Reviewed-on: https://gerrit.libreoffice.org/21022
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Stephan Bergmann <sbergman@redhat.com>
Diffstat (limited to 'framework')
| -rw-r--r-- | framework/source/uielement/newmenucontroller.cxx | 6 | ||||
| -rw-r--r-- | framework/source/uielement/toolbarsmenucontroller.cxx | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/framework/source/uielement/newmenucontroller.cxx b/framework/source/uielement/newmenucontroller.cxx index 3bf73430f0cc..b9f64b67f4ef 100644 --- a/framework/source/uielement/newmenucontroller.cxx +++ b/framework/source/uielement/newmenucontroller.cxx @@ -83,7 +83,7 @@ void NewMenuController::setMenuImages( PopupMenu* pPopupMenu, bool bSetImages ) bool bImageSet( false ); OUString aImageId; - sal_uIntPtr nAttributePtr = pPopupMenu->GetUserValue(sal::static_int_cast<sal_uInt16>(i)); + sal_uLong nAttributePtr = pPopupMenu->GetUserValue(sal::static_int_cast<sal_uInt16>(i)); MenuAttributes* pAttributes = reinterpret_cast<MenuAttributes *>(nAttributePtr); if (pAttributes) aImageId = pAttributes->aImageId; @@ -346,7 +346,7 @@ void NewMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& rPopup if (( nItemId != 0 ) && ( pSubMenu->GetItemType( nItemId ) != MenuItemType::SEPARATOR )) { - sal_uIntPtr nAttributePtr = pSubMenu->GetUserValue(nItemId); + sal_uLong nAttributePtr = pSubMenu->GetUserValue(nItemId); if (nAttributePtr) { MenuAttributes* pAttributes = reinterpret_cast<MenuAttributes *>(nAttributePtr); @@ -411,7 +411,7 @@ void SAL_CALL NewMenuController::itemSelected( const css::awt::MenuEvent& rEvent SolarMutexGuard aSolarMutexGuard; PopupMenu* pVCLPopupMenu = static_cast<PopupMenu *>(pPopupMenu->GetMenu()); aTargetURL.Complete = pVCLPopupMenu->GetItemCommand(rEvent.MenuId); - sal_uIntPtr nAttributePtr = pVCLPopupMenu->GetUserValue(rEvent.MenuId); + sal_uLong nAttributePtr = pVCLPopupMenu->GetUserValue(rEvent.MenuId); MenuAttributes* pAttributes = reinterpret_cast<MenuAttributes *>(nAttributePtr); if (pAttributes) aTargetFrame = pAttributes->aTargetFrame; diff --git a/framework/source/uielement/toolbarsmenucontroller.cxx b/framework/source/uielement/toolbarsmenucontroller.cxx index 0353c89f67ee..a963e9e15ac5 100644 --- a/framework/source/uielement/toolbarsmenucontroller.cxx +++ b/framework/source/uielement/toolbarsmenucontroller.cxx @@ -446,7 +446,7 @@ void ToolbarsMenuController::fillPopupMenu( Reference< css::awt::XPopupMenu >& r PopupMenu* pVCLPopupMenu = pXPopupMenu ? static_cast<PopupMenu *>(pXPopupMenu->GetMenu()) : nullptr; assert(pVCLPopupMenu); if (pVCLPopupMenu) - pVCLPopupMenu->SetUserValue( nIndex, sal_uIntPtr( aSortedTbs[i].bContextSensitive ? 1L : 0L )); + pVCLPopupMenu->SetUserValue( nIndex, sal_uLong( aSortedTbs[i].bContextSensitive ? 1L : 0L )); } // use VCL popup menu pointer to set vital information that are not part of the awt implementation |