diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-10 09:47:28 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-10 09:48:07 +0200 |
| commit | 2391931e2137493e51ba7e828798d86b217dfe03 (patch) | |
| tree | 2568edb845d42d65abccbdc40f6ed174b6cb7008 /sfx2/source/doc | |
| parent | afc728fe76fbf1afea725afd6ff5e9af92e10b08 (diff) | |
convert SFXOBJECTSHELL_ constants to scoped enum
Change-Id: I5a159be0c342b778730cedb0fe35843c2c368c97
Diffstat (limited to 'sfx2/source/doc')
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objxtor.cxx | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 3b598e737a3a..7d751182b365 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -1041,7 +1041,7 @@ void SfxObjectShell::PostActivateEvent_Impl( SfxViewFrame* pFrame ) void SfxObjectShell::SetActivateEvent_Impl(sal_uInt16 nId ) { - if ( GetFactory().GetFlags() & SFXOBJECTSHELL_HASOPENDOC ) + if ( GetFactory().GetFlags() & SfxObjectShellFlags::HASOPENDOC ) pImp->nEventId = nId; } @@ -1596,7 +1596,7 @@ ErrCode SfxObjectShell::CallXScript( const OUString& rScriptURL, SfxObjectShellFlags SfxObjectShell::GetFlags() const { - if( pImp->eFlags == SFXOBJECTSHELL_UNDEFINED ) + if( pImp->eFlags == SfxObjectShellFlags::UNDEFINED ) pImp->eFlags = GetFactory().GetFlags(); return pImp->eFlags; } diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 03b4e3a10bc7..1a10c396a38a 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -1024,7 +1024,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) break; case SID_DOCINFO: - if ( 0 != ( pImp->eFlags & SFXOBJECTSHELL_NODOCINFO ) ) + if ( pImp->eFlags & SfxObjectShellFlags::NODOCINFO ) rSet.DisableItem( nWhich ); break; @@ -1041,7 +1041,7 @@ void SfxObjectShell::GetState_Impl(SfxItemSet &rSet) pDoc = pFrame->GetTopViewFrame()->GetObjectShell(); } - if ( pDoc->GetFlags() & SFXOBJECTSHELL_DONTCLOSE ) + if ( pDoc->GetFlags() & SfxObjectShellFlags::DONTCLOSE ) rSet.DisableItem(nWhich); else rSet.Put(SfxStringItem(nWhich, SfxResId(STR_CLOSEDOC).toString())); diff --git a/sfx2/source/doc/objxtor.cxx b/sfx2/source/doc/objxtor.cxx index 2cc18f17f0cc..67504bcef382 100644 --- a/sfx2/source/doc/objxtor.cxx +++ b/sfx2/source/doc/objxtor.cxx @@ -253,7 +253,7 @@ SfxObjectShell_Impl::SfxObjectShell_Impl( SfxObjectShell& _rDocShell ) ,bReloadAvailable( false ) ,nAutoLoadLocks( 0 ) ,pModule( 0 ) - ,eFlags( SFXOBJECTSHELL_UNDEFINED ) + ,eFlags( SfxObjectShellFlags::UNDEFINED ) ,bReadOnlyUI( false ) ,nStyleFilter( 0 ) ,bDisposing( false ) |