diff options
| author | Noel Grandin <noel@peralex.com> | 2016-05-13 14:12:55 +0200 |
|---|---|---|
| committer | Noel Grandin <noelgrandin@gmail.com> | 2016-05-16 08:57:52 +0000 |
| commit | a05281b30edc0cf9efecf90a7b6240b90f9c8267 (patch) | |
| tree | 11ab439b43ee9d1c112bd81849271da280312581 /svx/source/form | |
| parent | 1e063e8b7ea070a5b6990b3d6740ecae05aea66d (diff) | |
convert FORMS to scoped enum
Change-Id: Iaf443c6789b4497a336c2f49a1d5e3c2abe4df32
Reviewed-on: https://gerrit.libreoffice.org/24960
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>
Diffstat (limited to 'svx/source/form')
| -rw-r--r-- | svx/source/form/fmshimp.cxx | 12 | ||||
| -rw-r--r-- | svx/source/form/fmview.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
diff --git a/svx/source/form/fmshimp.cxx b/svx/source/form/fmshimp.cxx index b61f9d0eb6dd..67b5d999693d 100644 --- a/svx/source/form/fmshimp.cxx +++ b/svx/source/form/fmshimp.cxx @@ -3638,7 +3638,7 @@ void FmXFormShell::viewActivated( FmFormView& _rCurrentView, bool _bSyncAction / if ( pPage ) { if ( !pPage->GetImpl().hasEverBeenActivated() ) - loadForms( pPage, FORMS_LOAD | ( _bSyncAction ? FORMS_SYNC : FORMS_ASYNC ) ); + loadForms( pPage, LoadFormsFlags::Load | ( _bSyncAction ? LoadFormsFlags::Sync : LoadFormsFlags::Async ) ); pPage->GetImpl().setHasBeenActivated( ); } @@ -3767,7 +3767,7 @@ IMPL_LINK_NOARG_TYPED( FmXFormShell, OnLoadForms, void*, void ) FmLoadAction aAction = m_aLoadingPages.front(); m_aLoadingPages.pop(); - loadForms( aAction.pPage, aAction.nFlags & ~FORMS_ASYNC ); + loadForms( aAction.pPage, aAction.nFlags & ~LoadFormsFlags::Async ); } @@ -3809,12 +3809,12 @@ namespace } -void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour /* FORMS_LOAD | FORMS_SYNC */ ) +void FmXFormShell::loadForms( FmFormPage* _pPage, const LoadFormsFlags _nBehaviour /* LoadFormsFlags::Load | LoadFormsFlags::Sync */ ) { - DBG_ASSERT( ( _nBehaviour & ( FORMS_ASYNC | FORMS_UNLOAD ) ) != ( FORMS_ASYNC | FORMS_UNLOAD ), + DBG_ASSERT( ( _nBehaviour & ( LoadFormsFlags::Async | LoadFormsFlags::Unload ) ) != ( LoadFormsFlags::Async | LoadFormsFlags::Unload ), "FmXFormShell::loadForms: async loading not supported - this will heavily fail!" ); - if ( _nBehaviour & FORMS_ASYNC ) + if ( _nBehaviour & LoadFormsFlags::Async ) { m_aLoadingPages.push( FmLoadAction( _pPage, @@ -3848,7 +3848,7 @@ void FmXFormShell::loadForms( FmFormPage* _pPage, const sal_uInt16 _nBehaviour / // a database form must be loaded for try { - if ( 0 == ( _nBehaviour & FORMS_UNLOAD ) ) + if ( !( _nBehaviour & LoadFormsFlags::Unload ) ) { if ( lcl_isLoadable( xForm ) && !xForm->isLoaded() ) xForm->load(); diff --git a/svx/source/form/fmview.cxx b/svx/source/form/fmview.cxx index ae7047872aa1..7762f8bed226 100644 --- a/svx/source/form/fmview.cxx +++ b/svx/source/form/fmview.cxx @@ -253,7 +253,7 @@ void FmFormView::ChangeDesignMode(bool bDesign) if ( pCurPage ) { if ( pFormShell && pFormShell->GetImpl() ) - pFormShell->GetImpl()->loadForms( pCurPage, ( bDesign ? FORMS_UNLOAD : FORMS_LOAD ) ); + pFormShell->GetImpl()->loadForms( pCurPage, ( bDesign ? LoadFormsFlags::Unload : LoadFormsFlags::Load ) ); } // --- 5. base class functionality |