diff options
| author | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:33:46 +0000 |
|---|---|---|
| committer | Rüdiger Timm <rt@openoffice.org> | 2008-06-06 13:33:46 +0000 |
| commit | 8864a17808442eb640f68894b76a2eda93c87578 (patch) | |
| tree | dda0792db2be104913c280a5fdb6ae9e62bfd586 /sfx2/source/doc/docmacromode.cxx | |
| parent | 7a596b010126d2e1ee9d84165b8f0a0e07a3dd09 (diff) | |
INTEGRATION: CWS dba30c (1.4.28); FILE MERGED
2008/05/09 08:23:38 oj 1.4.28.2: RESYNC: (1.4-1.5); FILE MERGED
2008/05/08 12:56:02 fs 1.4.28.1: ##i87741# checkMacrosOnLoading now returning the adjusted macro execution mode (true/false)
Diffstat (limited to 'sfx2/source/doc/docmacromode.cxx')
| -rw-r--r-- | sfx2/source/doc/docmacromode.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sfx2/source/doc/docmacromode.cxx b/sfx2/source/doc/docmacromode.cxx index 1fae62fd9208..e56a65d3f551 100644 --- a/sfx2/source/doc/docmacromode.cxx +++ b/sfx2/source/doc/docmacromode.cxx @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: docmacromode.cxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.6 $ * * This file is part of OpenOffice.org. * @@ -484,25 +484,27 @@ namespace sfx2 } //-------------------------------------------------------------------- - void DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& _rxInteraction ) + sal_Bool DocumentMacroMode::checkMacrosOnLoading( const Reference< XInteractionHandler >& _rxInteraction ) { + sal_Bool bAllow = sal_False; if ( SvtSecurityOptions().IsMacroDisabled() ) { // no macro should be executed at all - disallowMacroExecution(); + bAllow = disallowMacroExecution(); } else { if ( m_pData->rDocumentAccess.documentStorageHasMacros() || hasMacroLibrary() ) { - adjustMacroMode( _rxInteraction ); + bAllow = adjustMacroMode( _rxInteraction ); } else if ( !isMacroExecutionDisallowed() ) { // if macros will be added by the user later, the security check is obsolete - allowMacroExecution(); + bAllow = allowMacroExecution(); } } + return bAllow; } //........................................................................ |