diff options
| author | Noel Grandin <noel@peralex.com> | 2015-04-10 14:28:43 +0200 |
|---|---|---|
| committer | Noel Grandin <noel@peralex.com> | 2015-04-13 09:34:53 +0200 |
| commit | 5651f2d9f64c213b4106e2d5a433f4c525d41bbf (patch) | |
| tree | 2b82422a0d7299fac8261f57527dad3ee3d99883 /sfx2 | |
| parent | ccfa9fa13db230cc66207bc42d528b773c4cf4f6 (diff) | |
convert HIDDENINFORMATION_ constants into scoped enum
Change-Id: I94136c926fc8fa69ce2ce2b97fa34dc984dbe095
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index cfd7bfc31297..062ac57746c5 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2939,13 +2939,13 @@ bool SfxObjectShell::CanReload_Impl() -sal_uInt16 SfxObjectShell::GetHiddenInformationState( sal_uInt16 nStates ) +HiddenInformation SfxObjectShell::GetHiddenInformationState( HiddenInformation nStates ) { - sal_uInt16 nState = 0; - if ( nStates & HIDDENINFORMATION_DOCUMENTVERSIONS ) + HiddenInformation nState = HiddenInformation::NONE; + if ( nStates & HiddenInformation::DOCUMENTVERSIONS ) { if ( GetMedium()->GetVersionList().getLength() ) - nState |= HIDDENINFORMATION_DOCUMENTVERSIONS; + nState |= HiddenInformation::DOCUMENTVERSIONS; } return nState; @@ -2990,25 +2990,25 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl:: if ( SvtSecurityOptions().IsOptionSet( eOption ) ) { OUString sMessage( SfxResId(STR_HIDDENINFO_CONTAINS).toString() ); - sal_uInt16 nWantedStates = HIDDENINFORMATION_RECORDEDCHANGES | HIDDENINFORMATION_NOTES; + HiddenInformation nWantedStates = HiddenInformation::RECORDEDCHANGES | HiddenInformation::NOTES; if ( eFact != WhenPrinting ) - nWantedStates |= HIDDENINFORMATION_DOCUMENTVERSIONS; - sal_uInt16 nStates = GetHiddenInformationState( nWantedStates ); + nWantedStates |= HiddenInformation::DOCUMENTVERSIONS; + HiddenInformation nStates = GetHiddenInformationState( nWantedStates ); bool bWarning = false; - if ( ( nStates & HIDDENINFORMATION_RECORDEDCHANGES ) == HIDDENINFORMATION_RECORDEDCHANGES ) + if ( nStates & HiddenInformation::RECORDEDCHANGES ) { sMessage += SfxResId(STR_HIDDENINFO_RECORDCHANGES).toString(); sMessage += "\n"; bWarning = true; } - if ( ( nStates & HIDDENINFORMATION_NOTES ) == HIDDENINFORMATION_NOTES ) + if ( nStates & HiddenInformation::NOTES ) { sMessage += SfxResId(STR_HIDDENINFO_NOTES).toString(); sMessage += "\n"; bWarning = true; } - if ( ( nStates & HIDDENINFORMATION_DOCUMENTVERSIONS ) == HIDDENINFORMATION_DOCUMENTVERSIONS ) + if ( nStates & HiddenInformation::DOCUMENTVERSIONS ) { sMessage += SfxResId(STR_HIDDENINFO_DOCVERSIONS).toString(); sMessage += "\n"; |