diff options
| author | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:02:30 +0000 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2007-10-09 14:02:30 +0000 |
| commit | 2eb85ab0d0bedcf61c0c71cf3a45f20ee6d14118 (patch) | |
| tree | 59c7c49127d3a4651bead87fd78a36f918e09597 /scripting/source | |
| parent | b80778e52418bf4bb7be0e655ba947a0f9cb9542 (diff) | |
INTEGRATION: CWS basmgr03 (1.26.44); FILE MERGED
2007/07/26 08:53:27 fs 1.26.44.1: #i73331# GetMacroMode not needed anymore: AdjustMacroMode now returning whether macros are allowed
Diffstat (limited to 'scripting/source')
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index acc3001c09d6..9d17d52a77ba 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -4,9 +4,9 @@ * * $RCSfile: scripthandler.cxx,v $ * - * $Revision: 1.26 $ + * $Revision: 1.27 $ * - * last change: $Author: obo $ $Date: 2006-09-16 12:27:17 $ + * last change: $Author: kz $ $Date: 2007-10-09 15:02:30 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -187,10 +187,7 @@ void SAL_CALL ScriptProtocolHandler::dispatchWithNotification( // Security check if ( pDocShell && aURL.Complete.indexOf( ::rtl::OUString::createFromAscii("document") )!=-1 ) { - pDocShell->AdjustMacroMode( String() ); - - if ( pDocShell->GetMacroMode() == - ::com::sun::star::document::MacroExecMode::NEVER_EXECUTE ) + if ( !pDocShell->AdjustMacroMode( String() ) ) { return; } |