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 /sfx2 | |
| parent | 24181bfb0b49a011e201ecc111bac3b48ad5a1ff (diff) | |
convert POPUPMENU_ constants to scoped enum
Change-Id: I4cdaf36581d1e1daa39929e621070d18a9996852
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/taskpane.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/dialog/templdlg.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/templatedlg.cxx | 6 | ||||
| -rw-r--r-- | sfx2/source/sidebar/SidebarController.cxx | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/sfx2/source/dialog/taskpane.cxx b/sfx2/source/dialog/taskpane.cxx index 1a735738471e..d7f822d028a7 100644 --- a/sfx2/source/dialog/taskpane.cxx +++ b/sfx2/source/dialog/taskpane.cxx @@ -975,7 +975,7 @@ namespace sfx2 // pass toolbox button rect so the menu can stay open on button up Rectangle aMenuRect( i_pToolBox->GetItemRect( m_nViewMenuID ) ); aMenuRect.SetPos( i_pToolBox->GetPosPixel() ); - pMenu->Execute( &m_rDockingWindow, aMenuRect, POPUPMENU_EXECUTE_DOWN ); + pMenu->Execute( &m_rDockingWindow, aMenuRect, PopupMenuFlags::ExecuteDown ); } } diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx index ea8fe4dd369a..43a186a620ce 100644 --- a/sfx2/source/dialog/templdlg.cxx +++ b/sfx2/source/dialog/templdlg.cxx @@ -2502,7 +2502,7 @@ IMPL_LINK_TYPED( SfxTemplateDialog_Impl, ToolBoxRClick, ToolBox *, pBox, void ) pMenu->SetSelectHdl(LINK(this, SfxTemplateDialog_Impl, MenuSelectHdl)); pMenu->Execute( pBox, pBox->GetItemRect(nEntry), - POPUPMENU_EXECUTE_DOWN ); + PopupMenuFlags::ExecuteDown ); pBox->EndSelection(); } catch(uno::Exception&) diff --git a/sfx2/source/doc/templatedlg.cxx b/sfx2/source/doc/templatedlg.cxx index a2f01b66b57d..d86ffc0b09fe 100644 --- a/sfx2/source/doc/templatedlg.cxx +++ b/sfx2/source/doc/templatedlg.cxx @@ -508,7 +508,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox, void) { pBox->SetItemDown( nCurItemId, true ); - mpActionMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), POPUPMENU_EXECUTE_DOWN); + mpActionMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), PopupMenuFlags::ExecuteDown); pBox->SetItemDown( nCurItemId, false ); pBox->EndSelection(); @@ -533,7 +533,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox, void) pMoveMenu->InsertItem(MNI_MOVE_NEW, SfxResId(STR_MOVE_NEW)); - pMoveMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), POPUPMENU_EXECUTE_DOWN); + pMoveMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), PopupMenuFlags::ExecuteDown); delete pMoveMenu; @@ -545,7 +545,7 @@ IMPL_LINK_TYPED(SfxTemplateManagerDlg, TBXDropdownHdl, ToolBox*, pBox, void) { pBox->SetItemDown( nCurItemId, true ); - mpRepositoryMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), POPUPMENU_EXECUTE_DOWN); + mpRepositoryMenu->Execute(pBox, pBox->GetItemRect(nCurItemId), PopupMenuFlags::ExecuteDown); pBox->SetItemDown( nCurItemId, false ); pBox->EndSelection(); diff --git a/sfx2/source/sidebar/SidebarController.cxx b/sfx2/source/sidebar/SidebarController.cxx index b7a32b013790..4115e884e5c5 100644 --- a/sfx2/source/sidebar/SidebarController.cxx +++ b/sfx2/source/sidebar/SidebarController.cxx @@ -816,7 +816,7 @@ void SidebarController::ShowPopupMenu ( // pass toolbox button rect so the menu can stay open on button up Rectangle aBox (rButtonBox); aBox.Move(mpTabBar->GetPosPixel().X(), 0); - pMenu->Execute(mpParentWindow, aBox, POPUPMENU_EXECUTE_DOWN); + pMenu->Execute(mpParentWindow, aBox, PopupMenuFlags::ExecuteDown); } ::boost::shared_ptr<PopupMenu> SidebarController::CreatePopupMenu ( |