diff options
| author | Noel Grandin <noel@peralex.com> | 2015-05-12 15:30:22 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-05-13 09:25:50 +0200 |
| commit | facc91ab4a3f25b3290408c7083ed4c09dd8d759 (patch) | |
| tree | 65062b866ac520a9f4078886ac04a20e0e492733 /sd | |
| parent | 96096e27457454219c6621b060e89319ceaca23c (diff) | |
convert FLOATWIN_POPUPMODE constants to scoped enum
Change-Id: I744d430ef6a506977eb10b892582c8969ec27524
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/annotations/annotationtag.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/LayoutMenu.cxx | 2 | ||||
| -rw-r--r-- | sd/source/ui/sidebar/MasterPagesSelector.cxx | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/sd/source/ui/annotations/annotationtag.cxx b/sd/source/ui/annotations/annotationtag.cxx index 9a0c861f84ca..606bddbdaf07 100644 --- a/sd/source/ui/annotations/annotationtag.cxx +++ b/sd/source/ui/annotations/annotationtag.cxx @@ -582,7 +582,7 @@ void AnnotationTag::OpenPopup( bool bEdit ) mpAnnotationWindow->setAnnotation(mxAnnotation); sal_uInt16 nArrangeIndex = 0; - Point aPopupPos( FloatingWindow::CalcFloatingPosition( mpAnnotationWindow.get(), aRect, FLOATWIN_POPUPMODE_RIGHT, nArrangeIndex ) ); + Point aPopupPos( FloatingWindow::CalcFloatingPosition( mpAnnotationWindow.get(), aRect, FloatWinPopupFlags::Right, nArrangeIndex ) ); Size aPopupSize( 320, 240 ); mpAnnotationWindow->SetPosSizePixel( aPopupPos, aPopupSize ); diff --git a/sd/source/ui/sidebar/LayoutMenu.cxx b/sd/source/ui/sidebar/LayoutMenu.cxx index 4c2ba8bb638e..a60245646130 100644 --- a/sd/source/ui/sidebar/LayoutMenu.cxx +++ b/sd/source/ui/sidebar/LayoutMenu.cxx @@ -614,7 +614,7 @@ void LayoutMenu::Command (const CommandEvent& rEvent) FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow()); if (pMenuWindow != NULL) pMenuWindow->SetPopupModeFlags( - pMenuWindow->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); + pMenuWindow->GetPopupModeFlags() | FloatWinPopupFlags::NoMouseUpClose); pMenu->SetSelectHdl(LINK(this, LayoutMenu, OnMenuItemSelected)); // Disable the SID_INSERTPAGE_LAYOUT_MENU item when diff --git a/sd/source/ui/sidebar/MasterPagesSelector.cxx b/sd/source/ui/sidebar/MasterPagesSelector.cxx index 2c522c16a4ab..c91ea088e96e 100644 --- a/sd/source/ui/sidebar/MasterPagesSelector.cxx +++ b/sd/source/ui/sidebar/MasterPagesSelector.cxx @@ -229,7 +229,7 @@ void MasterPagesSelector::Command (const CommandEvent& rEvent) FloatingWindow* pMenuWindow = dynamic_cast<FloatingWindow*>(pMenu->GetWindow()); if (pMenuWindow != NULL) pMenuWindow->SetPopupModeFlags( - pMenuWindow->GetPopupModeFlags() | FLOATWIN_POPUPMODE_NOMOUSEUPCLOSE); + pMenuWindow->GetPopupModeFlags() | FloatWinPopupFlags::NoMouseUpClose); pMenu->SetSelectHdl(LINK(this, MasterPagesSelector, OnMenuItemSelected)); ProcessPopupMenu(*pMenu); |