diff options
author | Noel Grandin <noel@peralex.com> | 2015-03-23 12:44:45 +0200 |
---|---|---|
committer | Noel Grandin <noel@peralex.com> | 2015-03-24 09:36:56 +0200 |
commit | ffcfcd76d12a54e8a65a2b8d0ba7432d4c57f6ea (patch) | |
tree | 907e2824a4cb8423bef30382753bf78a987e2438 /svx | |
parent | eba9e9f88cf518a289e69e676098319177409e60 (diff) |
convert SfxChildAlignment to enum class
Change-Id: I9013bc6dace79421b0a9ad0401a4fb59365d4dcf
Diffstat (limited to 'svx')
-rw-r--r-- | svx/source/dialog/SpellDialogChildWindow.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_bmpmask.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/_contdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/fontwork.cxx | 26 | ||||
-rw-r--r-- | svx/source/dialog/hyperdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/imapdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/rubydialog.cxx | 2 | ||||
-rw-r--r-- | svx/source/dialog/srchdlg.cxx | 2 | ||||
-rw-r--r-- | svx/source/engine3d/float3d.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/datanavi.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/filtnav.cxx | 10 | ||||
-rw-r--r-- | svx/source/form/fmPropBrw.cxx | 2 | ||||
-rw-r--r-- | svx/source/form/fmexpl.cxx | 6 | ||||
-rw-r--r-- | svx/source/form/tabwin.cxx | 2 | ||||
-rw-r--r-- | svx/source/tbxctrls/SvxColorChildWindow.cxx | 2 |
15 files changed, 37 insertions, 37 deletions
diff --git a/svx/source/dialog/SpellDialogChildWindow.cxx b/svx/source/dialog/SpellDialogChildWindow.cxx index 01d34f4660fe..04df8dddad1f 100644 --- a/svx/source/dialog/SpellDialogChildWindow.cxx +++ b/svx/source/dialog/SpellDialogChildWindow.cxx @@ -39,7 +39,7 @@ SpellDialogChildWindow::SpellDialogChildWindow ( pBindings, this ); pWindow = m_pAbstractSpellDialog->GetWindow(); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; SetHideNotDelete(true); } diff --git a/svx/source/dialog/_bmpmask.cxx b/svx/source/dialog/_bmpmask.cxx index 4c00773cb36c..215869e6d376 100644 --- a/svx/source/dialog/_bmpmask.cxx +++ b/svx/source/dialog/_bmpmask.cxx @@ -367,7 +367,7 @@ SvxBmpMaskChildWindow::SvxBmpMaskChildWindow(vcl::Window* pParent_, sal_uInt16 n pWindow = pDlg; - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/_contdlg.cxx b/svx/source/dialog/_contdlg.cxx index 3e18ece55711..c94ed569173f 100644 --- a/svx/source/dialog/_contdlg.cxx +++ b/svx/source/dialog/_contdlg.cxx @@ -73,7 +73,7 @@ SvxContourDlgChildWindow::SvxContourDlgChildWindow( vcl::Window* _pParent, sal_u if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN ) pDlg->RollUp(); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/fontwork.cxx b/svx/source/dialog/fontwork.cxx index 2f4df736ca92..27a067725c45 100644 --- a/svx/source/dialog/fontwork.cxx +++ b/svx/source/dialog/fontwork.cxx @@ -166,7 +166,7 @@ SvxFontWorkChildWindow::SvxFontWorkChildWindow SvxFontWorkDialog* pDlg = new SvxFontWorkDialog(pBindings, this, _pParent); pWindow = pDlg; - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pDlg->Initialize( pInfo ); } @@ -299,23 +299,23 @@ SfxChildAlignment SvxFontWorkDialog::CheckAlignment( SfxChildAlignment eActAlign switch ( eAlign ) { - case SFX_ALIGN_TOP: - case SFX_ALIGN_HIGHESTTOP: - case SFX_ALIGN_LOWESTTOP: - case SFX_ALIGN_BOTTOM: - case SFX_ALIGN_LOWESTBOTTOM: - case SFX_ALIGN_HIGHESTBOTTOM: + case SfxChildAlignment::TOP: + case SfxChildAlignment::HIGHESTTOP: + case SfxChildAlignment::LOWESTTOP: + case SfxChildAlignment::BOTTOM: + case SfxChildAlignment::LOWESTBOTTOM: + case SfxChildAlignment::HIGHESTBOTTOM: { eAlignment = eActAlign; } break; - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_FIRSTLEFT: - case SFX_ALIGN_LASTLEFT: - case SFX_ALIGN_FIRSTRIGHT: - case SFX_ALIGN_LASTRIGHT: + case SfxChildAlignment::LEFT: + case SfxChildAlignment::RIGHT: + case SfxChildAlignment::FIRSTLEFT: + case SfxChildAlignment::LASTLEFT: + case SfxChildAlignment::FIRSTRIGHT: + case SfxChildAlignment::LASTRIGHT: { eAlignment = eAlign; } diff --git a/svx/source/dialog/hyperdlg.cxx b/svx/source/dialog/hyperdlg.cxx index 40464de3795b..c175121c1a57 100644 --- a/svx/source/dialog/hyperdlg.cxx +++ b/svx/source/dialog/hyperdlg.cxx @@ -64,7 +64,7 @@ SvxHlinkDlgWrapper::SvxHlinkDlgWrapper( vcl::Window* _pParent, sal_uInt16 nId, pWindow->SetPosPixel( pInfo->aPos ); } - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; SetHideNotDelete( true ); } diff --git a/svx/source/dialog/imapdlg.cxx b/svx/source/dialog/imapdlg.cxx index 7f60dd83a533..3a790abc2caa 100644 --- a/svx/source/dialog/imapdlg.cxx +++ b/svx/source/dialog/imapdlg.cxx @@ -101,7 +101,7 @@ SvxIMapDlgChildWindow::SvxIMapDlgChildWindow( vcl::Window* _pParent, sal_uInt16 if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN ) pDlg->RollUp(); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/rubydialog.cxx b/svx/source/dialog/rubydialog.cxx index 3ab3ff41a4c6..8d460e0042b4 100644 --- a/svx/source/dialog/rubydialog.cxx +++ b/svx/source/dialog/rubydialog.cxx @@ -70,7 +70,7 @@ SvxRubyChildWindow::SvxRubyChildWindow( vcl::Window* _pParent, sal_uInt16 nId, if ( pInfo->nFlags & SfxChildWindowFlags::ZOOMIN ) pDlg->RollUp(); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pDlg->Initialize( pInfo ); } diff --git a/svx/source/dialog/srchdlg.cxx b/svx/source/dialog/srchdlg.cxx index 8e4d3c6b47e2..17304463c412 100644 --- a/svx/source/dialog/srchdlg.cxx +++ b/svx/source/dialog/srchdlg.cxx @@ -2228,7 +2228,7 @@ SvxSearchDialogWrapper::SvxSearchDialogWrapper( vcl::Window* _pParent, sal_uInt1 pBindings->Update( SID_SEARCH_OPTIONS ); pBindings->Update( SID_SEARCH_SEARCHSET ); pBindings->Update( SID_SEARCH_REPLACESET ); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; dialog->bConstruct = false; } diff --git a/svx/source/engine3d/float3d.cxx b/svx/source/engine3d/float3d.cxx index f654679864c9..6a9bd08ab0d8 100644 --- a/svx/source/engine3d/float3d.cxx +++ b/svx/source/engine3d/float3d.cxx @@ -2904,7 +2904,7 @@ Svx3DChildWindow::Svx3DChildWindow( vcl::Window* _pParent, Svx3DWin* pWin = new Svx3DWin( pBindings, this, _pParent ); pWindow = pWin; - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; pWin->Initialize( pInfo ); } diff --git a/svx/source/form/datanavi.cxx b/svx/source/form/datanavi.cxx index 74f7c37d9d2c..da52985db230 100644 --- a/svx/source/form/datanavi.cxx +++ b/svx/source/form/datanavi.cxx @@ -2169,7 +2169,7 @@ namespace svxform Size DataNavigator::CalcDockingSize( SfxChildAlignment eAlign ) { - if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) + if ( ( eAlign == SfxChildAlignment::TOP ) || ( eAlign == SfxChildAlignment::BOTTOM ) ) return Size(); return SfxDockingWindow::CalcDockingSize( eAlign ); @@ -2180,9 +2180,9 @@ namespace svxform { switch ( eAlign ) { - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_NOALIGNMENT: + case SfxChildAlignment::LEFT: + case SfxChildAlignment::RIGHT: + case SfxChildAlignment::NOALIGNMENT: return eAlign; default: break; @@ -2222,7 +2222,7 @@ namespace svxform { pWindow = new DataNavigator( _pBindings, this, _pParent ); - eChildAlignment = SFX_ALIGN_RIGHT; + eChildAlignment = SfxChildAlignment::RIGHT; pWindow->SetSizePixel( Size( 250, 400 ) ); static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/form/filtnav.cxx b/svx/source/form/filtnav.cxx index bd421b778abd..5d4d7a6ffebd 100644 --- a/svx/source/form/filtnav.cxx +++ b/svx/source/form/filtnav.cxx @@ -1930,7 +1930,7 @@ void FmFilterNavigatorWin::FillInfo( SfxChildWinInfo& rInfo ) const Size FmFilterNavigatorWin::CalcDockingSize( SfxChildAlignment eAlign ) { - if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) + if ( ( eAlign == SfxChildAlignment::TOP ) || ( eAlign == SfxChildAlignment::BOTTOM ) ) return Size(); return SfxDockingWindow::CalcDockingSize( eAlign ); @@ -1941,9 +1941,9 @@ SfxChildAlignment FmFilterNavigatorWin::CheckAlignment( SfxChildAlignment eActAl { switch (eAlign) { - case SFX_ALIGN_LEFT: - case SFX_ALIGN_RIGHT: - case SFX_ALIGN_NOALIGNMENT: + case SfxChildAlignment::LEFT: + case SfxChildAlignment::RIGHT: + case SfxChildAlignment::NOALIGNMENT: return eAlign; default: break; @@ -1983,7 +1983,7 @@ FmFilterNavigatorWinMgr::FmFilterNavigatorWinMgr( vcl::Window *_pParent, sal_uIn :SfxChildWindow( _pParent, _nId ) { pWindow = new FmFilterNavigatorWin( _pBindings, this, _pParent ); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/form/fmPropBrw.cxx b/svx/source/form/fmPropBrw.cxx index d28b67dabf7a..57def61a0037 100644 --- a/svx/source/form/fmPropBrw.cxx +++ b/svx/source/form/fmPropBrw.cxx @@ -84,7 +84,7 @@ FmPropBrwMgr::FmPropBrwMgr( vcl::Window* _pParent, sal_uInt16 _nId, :SfxChildWindow(_pParent, _nId) { pWindow = new FmPropBrw( ::comphelper::getProcessComponentContext(), _pBindings, this, _pParent, _pInfo ); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxFloatingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/form/fmexpl.cxx b/svx/source/form/fmexpl.cxx index b708dfa6ae9b..4a7a53bd89a9 100644 --- a/svx/source/form/fmexpl.cxx +++ b/svx/source/form/fmexpl.cxx @@ -564,7 +564,7 @@ namespace svxform Size NavigatorFrame::CalcDockingSize( SfxChildAlignment eAlign ) { - if ( ( eAlign == SFX_ALIGN_TOP ) || ( eAlign == SFX_ALIGN_BOTTOM ) ) + if ( ( eAlign == SfxChildAlignment::TOP ) || ( eAlign == SfxChildAlignment::BOTTOM ) ) return Size(); return SfxDockingWindow::CalcDockingSize( eAlign ); @@ -573,7 +573,7 @@ namespace svxform SfxChildAlignment NavigatorFrame::CheckAlignment( SfxChildAlignment _eActAlign, SfxChildAlignment _eAlign ) { - if ( ( _eAlign == SFX_ALIGN_LEFT ) || ( _eAlign == SFX_ALIGN_RIGHT ) || ( _eAlign == SFX_ALIGN_NOALIGNMENT ) ) + if ( ( _eAlign == SfxChildAlignment::LEFT ) || ( _eAlign == SfxChildAlignment::RIGHT ) || ( _eAlign == SfxChildAlignment::NOALIGNMENT ) ) return _eAlign; return _eActAlign; } @@ -608,7 +608,7 @@ namespace svxform :SfxChildWindow( _pParent, _nId ) { pWindow = new NavigatorFrame( _pBindings, this, _pParent ); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxDockingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/form/tabwin.cxx b/svx/source/form/tabwin.cxx index da4ad2d6ada4..6328a455c68c 100644 --- a/svx/source/form/tabwin.cxx +++ b/svx/source/form/tabwin.cxx @@ -414,7 +414,7 @@ FmFieldWinMgr::FmFieldWinMgr(vcl::Window* _pParent, sal_uInt16 _nId, { pWindow = new FmFieldWin(_pBindings, this, _pParent); SetHideNotDelete(true); - eChildAlignment = SFX_ALIGN_NOALIGNMENT; + eChildAlignment = SfxChildAlignment::NOALIGNMENT; static_cast<SfxFloatingWindow*>(pWindow)->Initialize( _pInfo ); } diff --git a/svx/source/tbxctrls/SvxColorChildWindow.cxx b/svx/source/tbxctrls/SvxColorChildWindow.cxx index 0e93a1f6ea1f..a541eb2bdf83 100644 --- a/svx/source/tbxctrls/SvxColorChildWindow.cxx +++ b/svx/source/tbxctrls/SvxColorChildWindow.cxx @@ -37,7 +37,7 @@ SvxColorChildWindow::SvxColorChildWindow( vcl::Window* _pParent, _pParent ); pWindow = pWin; - eChildAlignment = SFX_ALIGN_BOTTOM; + eChildAlignment = SfxChildAlignment::BOTTOM; pWin->Initialize( pInfo ); } |