diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-10 12:17:41 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-13 09:34:52 +0200 |
| commit | ccfa9fa13db230cc66207bc42d528b773c4cf4f6 (patch) | |
| tree | ec43614086a60bab2139f83e3b50260fff5216ce /sfx2/source/view | |
| parent | b2bae9b940fc34d2eecd7839e3cba1f41d111e87 (diff) | |
convert SFX_LOADED_ to scoped enum
Change-Id: I065a07e1bb5f5a7f85429c919830b6b9605206ea
Diffstat (limited to 'sfx2/source/view')
| -rw-r--r-- | sfx2/source/view/frame.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewfrm.cxx | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/sfx2/source/view/frame.cxx b/sfx2/source/view/frame.cxx index 4b3696887b3e..82c03818579b 100644 --- a/sfx2/source/view/frame.cxx +++ b/sfx2/source/view/frame.cxx @@ -284,7 +284,7 @@ void SfxFrame::CancelTransfers( bool /*bCancelLoadEnv*/ ) { pImp->bInCancelTransfers = true; SfxObjectShell* pObj = GetCurrentDocument(); - if( pObj ) //&& !( pObj->Get_Impl()->nLoadedFlags & SFX_LOADED_ALL )) + if( pObj ) //&& !( pObj->Get_Impl()->nLoadedFlags & SfxLoadedFlags::ALL )) { SfxViewFrame* pFrm; for( pFrm = SfxViewFrame::GetFirst( pObj ); diff --git a/sfx2/source/view/viewfrm.cxx b/sfx2/source/view/viewfrm.cxx index c2d63d9cb88a..509fa7dac853 100644 --- a/sfx2/source/view/viewfrm.cxx +++ b/sfx2/source/view/viewfrm.cxx @@ -331,7 +331,7 @@ void SfxViewFrame::ExecReload_Impl( SfxRequest& rReq ) // Due to Double occupancy in toolboxes (with or without Ctrl), // it is also possible that the slot is enabled, but Ctrl-click // despite this is not! - if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT )) + if( !pSh || !pSh->HasName() || !(pSh->Get_Impl()->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT )) break; SfxMedium* pMed = pSh->GetMedium(); @@ -862,7 +862,7 @@ void SfxViewFrame::StateReload_Impl( SfxItemSet& rSet ) const SfxShell *pFSh; if ( !pSh || !pSh->HasName() || - !( pSh->Get_Impl()->nLoadedFlags & SFX_LOADED_MAINDOCUMENT ) || + !( pSh->Get_Impl()->nLoadedFlags & SfxLoadedFlags::MAINDOCUMENT ) || ( pSh->GetCreateMode() == SfxObjectCreateMode::EMBEDDED && ( !(pVSh = pSh->GetViewShell()) || !(pFSh = pVSh->GetFormShell()) || |