diff options
| author | Noel Grandin <noel@peralex.com> | 2014-10-21 08:39:46 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2014-10-23 12:55:35 +0200 |
| commit | 035fe8a6aa6489740a7c9f4e1768452319a686d3 (patch) | |
| tree | 0d0341d222b24cfa59d4b79c9420a9e116cc6a78 /dbaccess/source/ui/control | |
| parent | bb0039fdca8eff5ca603e333a23c3a7736b32cb2 (diff) | |
fdo#84938: replace MENUITEM constants with enum
Change-Id: I7b0085af3b13bd6e1a50bf1e0e986d1524b52d7b
Diffstat (limited to 'dbaccess/source/ui/control')
| -rw-r--r-- | dbaccess/source/ui/control/dbtreelistbox.cxx | 6 | ||||
| -rw-r--r-- | dbaccess/source/ui/control/toolboxcontroller.cxx | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/dbaccess/source/ui/control/dbtreelistbox.cxx b/dbaccess/source/ui/control/dbtreelistbox.cxx index 213933fc4408..a91b22cee9b5 100644 --- a/dbaccess/source/ui/control/dbtreelistbox.cxx +++ b/dbaccess/source/ui/control/dbtreelistbox.cxx @@ -430,7 +430,7 @@ namespace sal_uInt16 nCount = _pPopup->GetItemCount(); for (sal_uInt16 i=0; i < nCount; ++i) { - if ( _pPopup->GetItemType(i) != MENUITEM_SEPARATOR ) + if ( _pPopup->GetItemType(i) != MenuItemType::SEPARATOR ) { sal_uInt16 nId = _pPopup->GetItemId(i); PopupMenu* pSubPopUp = _pPopup->GetPopupMenu(nId); @@ -462,7 +462,7 @@ namespace for ( sal_uInt16 pos = 0; pos < nCount; ++pos ) { // do not adjust separators - if ( _rMenu.GetItemType( pos ) == MENUITEM_SEPARATOR ) + if ( _rMenu.GetItemType( pos ) == MenuItemType::SEPARATOR ) continue; sal_uInt16 nId = _rMenu.GetItemId(pos); @@ -498,7 +498,7 @@ namespace for ( sal_uInt16 pos = 0; pos < nCount; ++pos ) { // do not adjust separators - if ( _rMenu.GetItemType( pos ) == MENUITEM_SEPARATOR ) + if ( _rMenu.GetItemType( pos ) == MenuItemType::SEPARATOR ) continue; sal_uInt16 nId = _rMenu.GetItemId(pos); diff --git a/dbaccess/source/ui/control/toolboxcontroller.cxx b/dbaccess/source/ui/control/toolboxcontroller.cxx index 11a514628957..5bbd3b0abe5c 100644 --- a/dbaccess/source/ui/control/toolboxcontroller.cxx +++ b/dbaccess/source/ui/control/toolboxcontroller.cxx @@ -59,7 +59,7 @@ namespace dbaui { void lcl_copy(Menu* _pMenu,sal_uInt16 _nMenuId,sal_uInt16 _nMenuPos,ToolBox* _pToolBox,sal_uInt16 _nToolId,const OUString& _sCommand) { - if ( _pMenu->GetItemType(_nMenuPos) != MENUITEM_STRING ) + if ( _pMenu->GetItemType(_nMenuPos) != MenuItemType::STRING ) _pToolBox->SetItemImage(_nToolId, _pMenu->GetItemImage(_nMenuId)); _pToolBox->SetItemCommand( _nToolId, _sCommand); _pToolBox->SetHelpId(_nToolId, _pMenu->GetHelpId(_nMenuId)); @@ -194,7 +194,7 @@ namespace dbaui sal_uInt16 nCount = pMenu->GetItemCount(); for (sal_uInt16 nPos = 0; nPos < nCount; ++nPos) { - if ( pMenu->GetItemType( nPos ) == MENUITEM_SEPARATOR ) + if ( pMenu->GetItemType( nPos ) == MenuItemType::SEPARATOR ) continue; sal_uInt16 nItemId = pMenu->GetItemId(nPos); |