diff options
| -rw-r--r-- | include/sfx2/objsh.hxx | 2 | ||||
| -rw-r--r-- | sfx2/source/doc/objserv.cxx | 4 | ||||
| -rw-r--r-- | sfx2/source/doc/objstor.cxx | 10 | ||||
| -rw-r--r-- | sfx2/source/view/viewprn.cxx | 2 | ||||
| -rw-r--r-- | sfx2/source/view/viewsh.cxx | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/include/sfx2/objsh.hxx b/include/sfx2/objsh.hxx index 3da1ad309888..49fea829593b 100644 --- a/include/sfx2/objsh.hxx +++ b/include/sfx2/objsh.hxx @@ -159,7 +159,7 @@ namespace o3tl template<> struct typed_flags<HiddenInformation> : is_typed_flags<HiddenInformation, 0x07> {}; } -enum HiddenWarningFact +enum class HiddenWarningFact { WhenSaving = 0, WhenPrinting, diff --git a/sfx2/source/doc/objserv.cxx b/sfx2/source/doc/objserv.cxx index 8c4db55720cb..119e52f9e6f6 100644 --- a/sfx2/source/doc/objserv.cxx +++ b/sfx2/source/doc/objserv.cxx @@ -405,7 +405,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) if( SID_SIGNATURE == nId || SID_MACRO_SIGNATURE == nId ) { - if ( QueryHiddenInformation( WhenSigning, NULL ) == RET_YES ) + if ( QueryHiddenInformation( HiddenWarningFact::WhenSigning, NULL ) == RET_YES ) ( SID_SIGNATURE == nId ) ? SignDocumentContent() : SignScriptingContent(); return; } @@ -653,7 +653,7 @@ void SfxObjectShell::ExecFile_Impl(SfxRequest &rReq) SfxStoringHelper aHelper; - if ( QueryHiddenInformation( bIsPDFExport ? WhenCreatingPDF : WhenSaving, NULL ) == RET_YES ) + if ( QueryHiddenInformation( bIsPDFExport ? HiddenWarningFact::WhenCreatingPDF : HiddenWarningFact::WhenSaving, NULL ) == RET_YES ) { aHelper.GUIStoreModel( GetModel(), OUString::createFromAscii( pSlot->GetUnoName() ), diff --git a/sfx2/source/doc/objstor.cxx b/sfx2/source/doc/objstor.cxx index 062ac57746c5..b1ed9b3d42c7 100644 --- a/sfx2/source/doc/objstor.cxx +++ b/sfx2/source/doc/objstor.cxx @@ -2959,25 +2959,25 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl:: switch ( eFact ) { - case WhenSaving : + case HiddenWarningFact::WhenSaving : { nResId = STR_HIDDENINFO_CONTINUE_SAVING; eOption = SvtSecurityOptions::E_DOCWARN_SAVEORSEND; break; } - case WhenPrinting : + case HiddenWarningFact::WhenPrinting : { nResId = STR_HIDDENINFO_CONTINUE_PRINTING; eOption = SvtSecurityOptions::E_DOCWARN_PRINT; break; } - case WhenSigning : + case HiddenWarningFact::WhenSigning : { nResId = STR_HIDDENINFO_CONTINUE_SIGNING; eOption = SvtSecurityOptions::E_DOCWARN_SIGNING; break; } - case WhenCreatingPDF : + case HiddenWarningFact::WhenCreatingPDF : { nResId = STR_HIDDENINFO_CONTINUE_CREATEPDF; eOption = SvtSecurityOptions::E_DOCWARN_CREATEPDF; @@ -2991,7 +2991,7 @@ sal_Int16 SfxObjectShell::QueryHiddenInformation( HiddenWarningFact eFact, vcl:: { OUString sMessage( SfxResId(STR_HIDDENINFO_CONTAINS).toString() ); HiddenInformation nWantedStates = HiddenInformation::RECORDEDCHANGES | HiddenInformation::NOTES; - if ( eFact != WhenPrinting ) + if ( eFact != HiddenWarningFact::WhenPrinting ) nWantedStates |= HiddenInformation::DOCUMENTVERSIONS; HiddenInformation nStates = GetHiddenInformationState( nWantedStates ); bool bWarning = false; diff --git a/sfx2/source/view/viewprn.cxx b/sfx2/source/view/viewprn.cxx index 34716d67aabe..16444595d913 100644 --- a/sfx2/source/view/viewprn.cxx +++ b/sfx2/source/view/viewprn.cxx @@ -675,7 +675,7 @@ void SfxViewShell::ExecPrint_Impl( SfxRequest &rReq ) return; } - if ( !bSilent && pDoc->QueryHiddenInformation( WhenPrinting, NULL ) != RET_YES ) + if ( !bSilent && pDoc->QueryHiddenInformation( HiddenWarningFact::WhenPrinting, NULL ) != RET_YES ) return; // should we print only the selection or the whole document diff --git a/sfx2/source/view/viewsh.cxx b/sfx2/source/view/viewsh.cxx index abfbbbce1591..af454dd5ab66 100644 --- a/sfx2/source/view/viewsh.cxx +++ b/sfx2/source/view/viewsh.cxx @@ -548,7 +548,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) { SfxObjectShell* pDoc = GetObjectShell(); if ( pDoc && pDoc->QueryHiddenInformation( - WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) + HiddenWarningFact::WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) break; @@ -609,7 +609,7 @@ void SfxViewShell::ExecMisc_Impl( SfxRequest &rReq ) SfxBluetoothModel aModel; SfxObjectShell* pDoc = GetObjectShell(); if ( pDoc && pDoc->QueryHiddenInformation( - WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) + HiddenWarningFact::WhenSaving, &GetViewFrame()->GetWindow() ) != RET_YES ) break; uno::Reference < frame::XFrame > xFrame( pFrame->GetFrame().GetFrameInterface() ); SfxMailModel::SendMailResult eResult = aModel.SaveAndSend( xFrame, OUString() ); |