diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-14 14:33:10 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-15 10:05:02 +0200 |
| commit | 4f4cff08aac32db6fa580423b5fde661c8b0743a (patch) | |
| tree | cf91ac27509e32e724b87387bf07d6c8d35b695b /sw/source/uibase | |
| parent | 24181bfb0b49a011e201ecc111bac3b48ad5a1ff (diff) | |
convert POPUPMENU_ constants to scoped enum
Change-Id: I4cdaf36581d1e1daa39929e621070d18a9996852
Diffstat (limited to 'sw/source/uibase')
| -rw-r--r-- | sw/source/uibase/ribbar/inputwin.cxx | 2 | ||||
| -rw-r--r-- | sw/source/uibase/ribbar/workctrl.cxx | 4 | ||||
| -rw-r--r-- | sw/source/uibase/utlui/navipi.cxx | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sw/source/uibase/ribbar/inputwin.cxx b/sw/source/uibase/ribbar/inputwin.cxx index 77fd2c321dbb..6456d6ecdc9d 100644 --- a/sw/source/uibase/ribbar/inputwin.cxx +++ b/sw/source/uibase/ribbar/inputwin.cxx @@ -348,7 +348,7 @@ IMPL_LINK_NOARG_TYPED(SwInputWindow, DropdownClickHdl, ToolBox *, void) { case FN_FORMULA_CALC : { - aPopMenu.Execute( this, GetItemRect( FN_FORMULA_CALC ), POPUPMENU_NOMOUSEUPCLOSE ); + aPopMenu.Execute( this, GetItemRect( FN_FORMULA_CALC ), PopupMenuFlags::NoMouseUpClose ); break; default: break; diff --git a/sw/source/uibase/ribbar/workctrl.cxx b/sw/source/uibase/ribbar/workctrl.cxx index 6bd6b5bd3da8..96a073a94620 100644 --- a/sw/source/uibase/ribbar/workctrl.cxx +++ b/sw/source/uibase/ribbar/workctrl.cxx @@ -216,7 +216,7 @@ VclPtr<SfxPopupWindow> SwTbxAutoTextCtrl::CreatePopupWindow() pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ), (pToolBox->GetAlign() == WINDOWALIGN_TOP || pToolBox->GetAlign() == WINDOWALIGN_BOTTOM) ? - POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); + PopupMenuFlags::ExecuteDown : PopupMenuFlags::ExecuteRight ); pToolBox->SetItemDown( nId, false ); } @@ -313,7 +313,7 @@ VclPtr<SfxPopupWindow> SwTbxFieldCtrl::CreatePopupWindow() pPopup->Execute( pToolBox, pToolBox->GetItemRect( nId ), (pToolBox->GetAlign() == WINDOWALIGN_TOP || pToolBox->GetAlign() == WINDOWALIGN_BOTTOM) ? - POPUPMENU_EXECUTE_DOWN : POPUPMENU_EXECUTE_RIGHT ); + PopupMenuFlags::ExecuteDown : PopupMenuFlags::ExecuteRight ); pToolBox->SetItemDown( nId, false ); } diff --git a/sw/source/uibase/utlui/navipi.cxx b/sw/source/uibase/utlui/navipi.cxx index eae2d9d0f7b9..85c9c835d1d8 100644 --- a/sw/source/uibase/utlui/navipi.cxx +++ b/sw/source/uibase/utlui/navipi.cxx @@ -378,7 +378,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) pBox->SetItemDown( nCurrItemId, true ); pMenu->Execute( pBox, pBox->GetItemRect(FN_DROP_REGION), - POPUPMENU_EXECUTE_DOWN ); + PopupMenuFlags::ExecuteDown ); pBox->SetItemDown( nCurrItemId, false ); pBox->EndSelection(); pMenu.reset(); @@ -398,7 +398,7 @@ IMPL_LINK_TYPED( SwNavigationPI, ToolBoxDropdownClickHdl, ToolBox*, pBox, void ) pBox->SetItemDown( nCurrItemId, true ); pMenu->Execute( pBox, pBox->GetItemRect(FN_OUTLINE_LEVEL), - POPUPMENU_EXECUTE_DOWN ); + PopupMenuFlags::ExecuteDown ); pBox->SetItemDown( nCurrItemId, false ); pMenu.reset(); pBox->EndSelection(); |