diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 09:20:18 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2005-11-11 09:20:18 +0000 |
| commit | 129f5a8cddfcea76ffca60a3ecc317edefa84855 (patch) | |
| tree | 18f96c6730afb49d9dc8ef39a86afbc433a3dc7a /sfx2 | |
| parent | 849428fcf700e058aa4d04528acc355dc1467498 (diff) | |
INTEGRATION: CWS xmlsec13 (1.70.36); FILE MERGED
2005/11/01 05:44:00 jl 1.70.36.3: RESYNC: (1.70-1.72); FILE MERGED
2005/10/28 07:30:52 pb 1.70.36.2: fix: #i54495# consider new signature status
2005/10/25 08:09:58 jl 1.70.36.1: #54495# adapt to use DocumentSignatureInformation
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/doc/objmisc.cxx | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/sfx2/source/doc/objmisc.cxx b/sfx2/source/doc/objmisc.cxx index 6c0257fe70e5..c4431732fac1 100644 --- a/sfx2/source/doc/objmisc.cxx +++ b/sfx2/source/doc/objmisc.cxx @@ -4,9 +4,9 @@ * * $RCSfile: objmisc.cxx,v $ * - * $Revision: 1.72 $ + * $Revision: 1.73 $ * - * last change: $Author: hr $ $Date: 2005-09-30 10:25:01 $ + * last change: $Author: rt $ $Date: 2005-11-11 10:20:18 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1943,7 +1943,7 @@ void SfxObjectShell::AdjustMacroMode( const String& rScriptType ) // check whether the document is signed with trusted certificate if ( xSignatures.is() && pImp->nMacroMode != MacroExecMode::FROM_LIST ) { - ::com::sun::star::uno::Sequence< security::DocumentSignaturesInformation > aScriptingSignatureInformations; + ::com::sun::star::uno::Sequence< security::DocumentSignatureInformation > aScriptingSignatureInformations; uno::Reference < embed::XStorage > xStore = GetMedium()->GetLastCommitReadStorage_Impl(); sal_uInt16 nSignatureState = GetScriptingSignatureState(); if ( nSignatureState == SIGNATURESTATE_SIGNATURES_BROKEN ) @@ -1955,8 +1955,11 @@ void SfxObjectShell::AdjustMacroMode( const String& rScriptType ) return; } } - else if ( nSignatureState == SIGNATURESTATE_SIGNATURES_OK && xStore.is() ) - aScriptingSignatureInformations = xSignatures->verifyScriptingContentSignatures( xStore, uno::Reference< io::XInputStream >() ); + else if ( ( nSignatureState == SIGNATURESTATE_SIGNATURES_OK + || nSignatureState == SIGNATURESTATE_SIGNATURES_NOTVALIDATED ) + && xStore.is() ) + aScriptingSignatureInformations = + xSignatures->verifyScriptingContentSignatures( xStore, uno::Reference< io::XInputStream >() ); sal_Int32 nNumOfInfos = aScriptingSignatureInformations.getLength(); |