diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:31:35 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:31:35 +0000 |
| commit | 06efa521daf11108f23a37587a4e6235d6967ad8 (patch) | |
| tree | fbc4c084d51ca54661b57835e26c7cf61b6845f4 /sfx2/source/appl/appuno.cxx | |
| parent | 24e07f212113c9b6704a87cb0045fa905bdc3188 (diff) | |
INTEGRATION: CWS basmgr03 (1.124.4); FILE MERGED
2007/07/26 08:48:52 fs 1.124.4.1: #i73331# GetMacroMode not needed anymore: AdjustMacroMode now returning whether macros are allowed
Diffstat (limited to 'sfx2/source/appl/appuno.cxx')
| -rw-r--r-- | sfx2/source/appl/appuno.cxx | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/sfx2/source/appl/appuno.cxx b/sfx2/source/appl/appuno.cxx index 3059e54e07f2..ffc9fc745544 100644 --- a/sfx2/source/appl/appuno.cxx +++ b/sfx2/source/appl/appuno.cxx @@ -4,9 +4,9 @@ * * $RCSfile: appuno.cxx,v $ * - * $Revision: 1.124 $ + * $Revision: 1.125 $ * - * last change: $Author: obo $ $Date: 2007-07-17 13:40:42 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:31:35 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -1765,10 +1765,9 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: if ( pSh && pDoc ) { // security check for macros from document basic if an SFX context (pSh) is given - pDoc->AdjustMacroMode( String() ); - if( pDoc->Get_Impl()->nMacroMode == ::com::sun::star::document::MacroExecMode::NEVER_EXECUTE ) + if ( !pDoc->AdjustMacroMode( String() ) ) // check forbids execution - return ERRCODE_IO_ACCESSDENIED;; + return ERRCODE_IO_ACCESSDENIED; } else if ( pSh && pSh->GetMedium() ) { @@ -1778,7 +1777,7 @@ ErrCode SfxMacroLoader::loadMacro( const ::rtl::OUString& rURL, com::sun::star:: if ( pUpdateDocItem && pMacroExecModeItem && pUpdateDocItem->GetValue() == document::UpdateDocMode::NO_UPDATE && pMacroExecModeItem->GetValue() == document::MacroExecMode::NEVER_EXECUTE ) - return ERRCODE_IO_ACCESSDENIED;; + return ERRCODE_IO_ACCESSDENIED; } // find BASIC method |