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 /svx/source | |
parent | 96096e27457454219c6621b060e89319ceaca23c (diff) |
convert FLOATWIN_POPUPMODE constants to scoped enum
Change-Id: I744d430ef6a506977eb10b892582c8969ec27524
Diffstat (limited to 'svx/source')
-rw-r--r-- | svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx | 2 | ||||
-rw-r--r-- | svx/source/sidebar/tools/Popup.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/layctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/lboxctrl.cxx | 4 | ||||
-rw-r--r-- | svx/source/tbxctrls/linectrl.cxx | 6 | ||||
-rw-r--r-- | svx/source/tbxctrls/tbcontrl.cxx | 14 |
6 files changed, 17 insertions, 17 deletions
diff --git a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx index 4041ef6a887a..ae3eb8458f29 100644 --- a/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx +++ b/svx/source/sidebar/paragraph/ParaLineSpacingPopup.cxx @@ -46,7 +46,7 @@ VclPtr<SfxPopupWindow> ParaLineSpacingPopup::CreatePopupWindow() { VclPtr<ParaLineSpacingControl> pControl = VclPtr<ParaLineSpacingControl>::Create(GetSlotId()); - pControl->StartPopupMode(&GetToolBox(), FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE); + pControl->StartPopupMode(&GetToolBox(), FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoAppFocusClose); SetPopupWindow(pControl); diff --git a/svx/source/sidebar/tools/Popup.cxx b/svx/source/sidebar/tools/Popup.cxx index 221af081cfb5..193bf85f783f 100644 --- a/svx/source/sidebar/tools/Popup.cxx +++ b/svx/source/sidebar/tools/Popup.cxx @@ -68,10 +68,10 @@ void Popup::Show (ToolBox& rToolBox) mxContainer->StartPopupMode( aRect, - FLOATWIN_POPUPMODE_NOFOCUSCLOSE|FLOATWIN_POPUPMODE_DOWN); + FloatWinPopupFlags::NoFocusClose|FloatWinPopupFlags::Down); mxContainer->SetPopupModeFlags( mxContainer->GetPopupModeFlags() - | FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE); + | FloatWinPopupFlags::NoAppFocusClose); mxControl->GetFocus(); } diff --git a/svx/source/tbxctrls/layctrl.cxx b/svx/source/tbxctrls/layctrl.cxx index a36af3acf5b7..cf474801f3a5 100644 --- a/svx/source/tbxctrls/layctrl.cxx +++ b/svx/source/tbxctrls/layctrl.cxx @@ -745,7 +745,7 @@ VclPtr<SfxPopupWindow> SvxTableToolBoxControl::CreatePopupWindow() { ToolBox& rTbx = GetToolBox(); VclPtr<TableWindow> pWin = VclPtr<TableWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), rTbx, m_xFrame ); - pWin->StartPopupMode( &rTbx, FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); + pWin->StartPopupMode( &rTbx, FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoKeyClose ); SetPopupWindow( pWin ); return pWin; } @@ -800,7 +800,7 @@ VclPtr<SfxPopupWindow> SvxColumnsToolBoxControl::CreatePopupWindow() { pWin = VclPtr<ColumnsWindow>::Create( GetSlotId(), m_aCommandURL, GetToolBox().GetItemText( GetId() ), GetToolBox(), m_xFrame ); pWin->StartPopupMode( &GetToolBox(), - FLOATWIN_POPUPMODE_GRABFOCUS|FLOATWIN_POPUPMODE_NOKEYCLOSE ); + FloatWinPopupFlags::GrabFocus|FloatWinPopupFlags::NoKeyClose ); SetPopupWindow( pWin ); } return pWin; diff --git a/svx/source/tbxctrls/lboxctrl.cxx b/svx/source/tbxctrls/lboxctrl.cxx index a517946bff0e..d83a587d90cd 100644 --- a/svx/source/tbxctrls/lboxctrl.cxx +++ b/svx/source/tbxctrls/lboxctrl.cxx @@ -178,7 +178,7 @@ void SvxListBoxControl::StateChanged( IMPL_LINK_NOARG(SvxListBoxControl, PopupModeEndHdl) { - if( pPopupWin && 0 == pPopupWin->GetPopupModeFlags() && + if( pPopupWin && FloatWinPopupFlags::NONE == pPopupWin->GetPopupModeFlags() && pPopupWin->IsUserSelected() ) { sal_uInt16 nCount = pPopupWin->GetListBox().GetSelectEntryCount(); @@ -308,7 +308,7 @@ VclPtr<SfxPopupWindow> SvxUndoRedoControl::CreatePopupWindow() // move focus in floating window without // closing it (GrabFocus() would close it!) - pPopupWin->StartPopupMode( &rBox, FLOATWIN_POPUPMODE_GRABFOCUS ); + pPopupWin->StartPopupMode( &rBox, FloatWinPopupFlags::GrabFocus ); //pPopupWin->GetListBox().GrabFocus(); return pPopupWin; diff --git a/svx/source/tbxctrls/linectrl.cxx b/svx/source/tbxctrls/linectrl.cxx index 5f303bc76b98..101490079bda 100644 --- a/svx/source/tbxctrls/linectrl.cxx +++ b/svx/source/tbxctrls/linectrl.cxx @@ -634,9 +634,9 @@ VclPtr<SfxPopupWindow> SvxLineEndToolBoxControl::CreatePopupWindow() SvxLineEndWindow* pLineEndWin = VclPtr<SvxLineEndWindow>::Create( GetId(), m_xFrame, &GetToolBox(), SVX_RESSTR( RID_SVXSTR_LINEEND ) ); pLineEndWin->StartPopupMode( &GetToolBox(), - FLOATWIN_POPUPMODE_GRABFOCUS | - FLOATWIN_POPUPMODE_ALLOWTEAROFF | - FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); + FloatWinPopupFlags::GrabFocus | + FloatWinPopupFlags::AllowTearOff | + FloatWinPopupFlags::NoAppFocusClose ); pLineEndWin->StartSelection(); SetPopupWindow( pLineEndWin ); return pLineEndWin; diff --git a/svx/source/tbxctrls/tbcontrl.cxx b/svx/source/tbxctrls/tbcontrl.cxx index ab09ae83df4e..2e962cc93946 100644 --- a/svx/source/tbxctrls/tbcontrl.cxx +++ b/svx/source/tbxctrls/tbcontrl.cxx @@ -2634,7 +2634,7 @@ VclPtr<SfxPopupWindow> SvxColorToolBoxControl::CreatePopupWindow() } pColorWin->StartPopupMode( &GetToolBox(), - FLOATWIN_POPUPMODE_ALLOWTEAROFF|FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); + FloatWinPopupFlags::AllowTearOff|FloatWinPopupFlags::NoAppFocusClose ); pColorWin->StartSelection(); SetPopupWindow( pColorWin ); if ( !bSidebarType ) @@ -2778,9 +2778,9 @@ VclPtr<SfxPopupWindow> SvxFrameToolBoxControl::CreatePopupWindow() GetSlotId(), m_xFrame, &GetToolBox() ); pFrameWin->StartPopupMode( &GetToolBox(), - FLOATWIN_POPUPMODE_GRABFOCUS | - FLOATWIN_POPUPMODE_ALLOWTEAROFF | - FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); + FloatWinPopupFlags::GrabFocus | + FloatWinPopupFlags::AllowTearOff | + FloatWinPopupFlags::NoAppFocusClose ); pFrameWin->StartSelection(); SetPopupWindow( pFrameWin ); @@ -2818,9 +2818,9 @@ VclPtr<SfxPopupWindow> SvxFrameLineStyleToolBoxControl::CreatePopupWindow() { VclPtr<SvxLineWindow_Impl> pLineWin = VclPtr<SvxLineWindow_Impl>::Create( GetSlotId(), m_xFrame, &GetToolBox() ); pLineWin->StartPopupMode( &GetToolBox(), - FLOATWIN_POPUPMODE_GRABFOCUS | - FLOATWIN_POPUPMODE_ALLOWTEAROFF | - FLOATWIN_POPUPMODE_NOAPPFOCUSCLOSE ); + FloatWinPopupFlags::GrabFocus | + FloatWinPopupFlags::AllowTearOff | + FloatWinPopupFlags::NoAppFocusClose ); SetPopupWindow( pLineWin ); return pLineWin; |