diff options
| author | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-12 15:33:40 +0200 |
|---|---|---|
| committer | Noel Grandin <noel.grandin@collabora.co.uk> | 2017-12-13 12:20:07 +0100 |
| commit | 6847deb1f7c68cf0402ccbc61c42ca5d285d3a61 (patch) | |
| tree | 6ec482608dc101cb911d9a93c7cb41149eb4af2d /vcl | |
| parent | 6cbbe3a6c35cde186351315ddb189366bcca1deb (diff) | |
sal_uLong->void* for userdata in Menu
Change-Id: I58fb10136a23c445edfd63a1f86ace3995524704
Reviewed-on: https://gerrit.libreoffice.org/46350
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/menu.cxx | 8 | ||||
| -rw-r--r-- | vcl/source/window/menuitemlist.cxx | 4 | ||||
| -rw-r--r-- | vcl/source/window/menuitemlist.hxx | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/vcl/source/window/menu.cxx b/vcl/source/window/menu.cxx index 28038bb53714..f2f45eadd965 100644 --- a/vcl/source/window/menu.cxx +++ b/vcl/source/window/menu.cxx @@ -678,7 +678,7 @@ MenuItemBits Menu::GetItemBits( sal_uInt16 nItemId ) const return nBits; } -void Menu::SetUserValue(sal_uInt16 nItemId, sal_uLong nValue, MenuUserDataReleaseFunction aFunc) +void Menu::SetUserValue(sal_uInt16 nItemId, void* nUserValue, MenuUserDataReleaseFunction aFunc) { MenuItemData* pData = pItemList->GetData(nItemId); if (pData) @@ -686,14 +686,14 @@ void Menu::SetUserValue(sal_uInt16 nItemId, sal_uLong nValue, MenuUserDataReleas if (pData->aUserValueReleaseFunc) pData->aUserValueReleaseFunc(pData->nUserValue); pData->aUserValueReleaseFunc = aFunc; - pData->nUserValue = nValue; + pData->nUserValue = nUserValue; } } -sal_uLong Menu::GetUserValue( sal_uInt16 nItemId ) const +void* Menu::GetUserValue( sal_uInt16 nItemId ) const { MenuItemData* pData = pItemList->GetData( nItemId ); - return pData ? pData->nUserValue : 0; + return pData ? pData->nUserValue : nullptr; } void Menu::SetPopupMenu( sal_uInt16 nItemId, PopupMenu* pMenu ) diff --git a/vcl/source/window/menuitemlist.cxx b/vcl/source/window/menuitemlist.cxx index 0aeb0cb9def7..6eac7de94e56 100644 --- a/vcl/source/window/menuitemlist.cxx +++ b/vcl/source/window/menuitemlist.cxx @@ -59,7 +59,7 @@ MenuItemData* MenuItemList::Insert( pData->eType = eType; pData->nBits = nBits; pData->pSubMenu = nullptr; - pData->nUserValue = 0; + pData->nUserValue = nullptr; pData->bChecked = false; pData->bEnabled = true; pData->bVisible = true; @@ -91,7 +91,7 @@ void MenuItemList::InsertSeparator(const OString &rIdent, size_t nPos) pData->eType = MenuItemType::SEPARATOR; pData->nBits = MenuItemBits::NONE; pData->pSubMenu = nullptr; - pData->nUserValue = 0; + pData->nUserValue = nullptr; pData->bChecked = false; pData->bEnabled = true; pData->bVisible = true; diff --git a/vcl/source/window/menuitemlist.hxx b/vcl/source/window/menuitemlist.hxx index bd264e41fdfa..742c7728921b 100644 --- a/vcl/source/window/menuitemlist.hxx +++ b/vcl/source/window/menuitemlist.hxx @@ -42,7 +42,7 @@ struct MenuItemData OUString aHelpCommandStr; // Help command string (to reference external help) OString sIdent; OString aHelpId; // Help-Id - sal_uLong nUserValue; // User value + void* nUserValue; // User value MenuUserDataReleaseFunction aUserValueReleaseFunc; // called when MenuItemData is destroyed Image aImage; // Image vcl::KeyCode aAccelKey; // Accelerator-Key @@ -60,7 +60,7 @@ struct MenuItemData , eType(MenuItemType::DONTKNOW) , nBits(MenuItemBits::NONE) , pSubMenu(nullptr) - , nUserValue(0) + , nUserValue(nullptr) , aUserValueReleaseFunc(nullptr) , bChecked(false) , bEnabled(false) @@ -75,7 +75,7 @@ struct MenuItemData , nBits(MenuItemBits::NONE) , pSubMenu(nullptr) , aText(rStr) - , nUserValue(0) + , nUserValue(nullptr) , aUserValueReleaseFunc(nullptr) , aImage(rImage) , bChecked(false) |