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 /sd | |
| parent | 24181bfb0b49a011e201ecc111bac3b48ad5a1ff (diff) | |
convert POPUPMENU_ constants to scoped enum
Change-Id: I4cdaf36581d1e1daa39929e621070d18a9996852
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationmanager.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/dlg/navigatr.cxx | 4 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/view/drviews4.cxx | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/sd/source/ui/annotations/annotationmanager.cxx b/sd/source/ui/annotations/annotationmanager.cxx index 1835d444bc3a..36bf3318ac21 100644 --- a/sd/source/ui/annotations/annotationmanager.cxx +++ b/sd/source/ui/annotations/annotationmanager.cxx @@ -997,7 +997,7 @@ void AnnotationManagerImpl::ExecuteAnnotationContextMenu( Reference< XAnnotation } } - nId = pMenu->Execute( pParent, rContextRect, POPUPMENU_EXECUTE_DOWN|POPUPMENU_NOMOUSEUPCLOSE ); + nId = pMenu->Execute( pParent, rContextRect, PopupMenuFlags::ExecuteDown|PopupMenuFlags::NoMouseUpClose ); switch( nId ) { case SID_REPLYTO_POSTIT: diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx index 4b1a8b922259..016f9a10720f 100644 --- a/sd/source/ui/dlg/navigatr.cxx +++ b/sd/source/ui/dlg/navigatr.cxx @@ -361,7 +361,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) pMenu->CheckItem( (sal_uInt16)meDragType ); pMenu->SetSelectHdl( LINK( this, SdNavigatorWin, MenuSelectHdl ) ); - pMenu->Execute( this, maToolbox->GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN ); + pMenu->Execute( this, maToolbox->GetItemRect( nId ), PopupMenuFlags::ExecuteDown ); pBox->EndSelection(); delete pMenu; } @@ -384,7 +384,7 @@ IMPL_LINK_TYPED( SdNavigatorWin, DropdownClickToolBoxHdl, ToolBox*, pBox, void ) pMenu->CheckItem(nShowNamedShapesFilter); pMenu->SetSelectHdl( LINK( this, SdNavigatorWin, ShapeFilterCallback ) ); - pMenu->Execute( this, maToolbox->GetItemRect( nId ), POPUPMENU_EXECUTE_DOWN ); + pMenu->Execute( this, maToolbox->GetItemRect( nId ), PopupMenuFlags::ExecuteDown ); pBox->EndSelection(); delete pMenu; } diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index a60245646130..dd440ad449fc 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -626,7 +626,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent) pMenu->EnableItem(SID_INSERTPAGE_LAYOUT_MENU, false); // Show the menu. - pMenu->Execute(this, Rectangle(aMenuPosition,Size(1,1)), POPUPMENU_EXECUTE_DOWN); + pMenu->Execute(this, Rectangle(aMenuPosition,Size(1,1)), PopupMenuFlags::ExecuteDown); } break; diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index c91ea088e96e..0ac4680fbf5d 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -235,7 +235,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent) ProcessPopupMenu(*pMenu); // Show the menu. - pMenu->Execute(this, Rectangle(aPosition,Size(1,1)), POPUPMENU_EXECUTE_DOWN); + pMenu->Execute(this, Rectangle(aPosition,Size(1,1)), PopupMenuFlags::ExecuteDown); } } break; diff --git a/sd/source/ui/view/drviews4.cxx b/sd/source/ui/view/drviews4.cxx index 8e157e0ed122..e87de5b09b68 100644 --- a/sd/source/ui/view/drviews4.cxx +++ b/sd/source/ui/view/drviews4.cxx @@ -924,7 +924,7 @@ void DrawViewShell::ShowSnapLineContextMenu ( const sal_uInt16 nResult = pMenu->Execute( GetActiveWindow(), Rectangle(rMouseLocation, Size(10,10)), - POPUPMENU_EXECUTE_DOWN); + PopupMenuFlags::ExecuteDown); switch (nResult) { case SID_SET_SNAPITEM: |