diff options
Diffstat (limited to 'sfx2/source/doc/objmisc.cxx')
-rw-r--r-- | sfx2/source/doc/objmisc.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 81fcb4027535..5148ed0c62b6 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -942,7 +942,8 @@ void SfxObjectShell::CheckSecurityOnLoading_Impl() CheckEncryption_Impl( xInteraction ); // check macro security - pImpl->aMacroMode.checkMacrosOnLoading( xInteraction ); + const bool bHasValidContentSignature = HasValidSignatures(); + pImpl->aMacroMode.checkMacrosOnLoading( xInteraction, bHasValidContentSignature ); } @@ -1598,7 +1599,7 @@ bool SfxObjectShell::AdjustMacroMode() CheckEncryption_Impl( xInteraction ); - return pImpl->aMacroMode.adjustMacroMode( xInteraction ); + return pImpl->aMacroMode.adjustMacroMode( xInteraction, true /*TODO*/ ); } vcl::Window* SfxObjectShell::GetDialogParent( SfxMedium const * pLoadingMedium ) |