diff options
| author | Mikhail Voitenko <mav@openoffice.org> | 2002-06-21 07:42:01 +0000 |
|---|---|---|
| committer | Mikhail Voitenko <mav@openoffice.org> | 2002-06-21 07:42:01 +0000 |
| commit | 2766163001e17f5bb7b18a253f00189a0d757538 (patch) | |
| tree | 1f6737f9e0d491f3934033e4bfe024a1566412d1 /framework/source/services/desktop.cxx | |
| parent | cf84bacb9930878b8653c26ed669deef9db54b68 (diff) | |
#97752# add MacroExecutionMode to MediaDescriptor
Diffstat (limited to 'framework/source/services/desktop.cxx')
| -rw-r--r-- | framework/source/services/desktop.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/framework/source/services/desktop.cxx b/framework/source/services/desktop.cxx index 94a66dae76cd..a07ffc002567 100644 --- a/framework/source/services/desktop.cxx +++ b/framework/source/services/desktop.cxx @@ -2,9 +2,9 @@ * * $RCSfile: desktop.cxx,v $ * - * $Revision: 1.39 $ + * $Revision: 1.40 $ * - * last change: $Author: as $ $Date: 2002-05-24 11:33:30 $ + * last change: $Author: mav $ $Date: 2002-06-21 08:42:01 $ * * The Contents of this file are made available subject to the terms of * either of the following licenses @@ -189,6 +189,10 @@ #include <com/sun/star/util/XCloseable.hpp> #endif +#ifndef _COM_SUN_STAR_DOCUMENT_MACROEXECMODE_HPP_ +#include <com/sun/star/document/MacroExecMode.hpp> +#endif + //_________________________________________________________________________________________________________________ // includes of other projects //_________________________________________________________________________________________________________________ @@ -916,6 +920,9 @@ css::uno::Reference< css::lang::XComponent > SAL_CALL Desktop::loadComponentFrom aAnalyzer.setArgument( E_INTERACTIONHANDLER, static_cast< css::task::XInteractionHandler* >(this) ); } + if( !aAnalyzer.existArgument( E_MACROEXECUTIONMODE ) ) + aAnalyzer.setArgument( E_MACROEXECUTIONMODE, css::document::MacroExecMode::NEVER_EXECUTE ); + // Reset loader state to default, because we must yield for a valid result! See next WHILE condition. // And we must do it before we call dispatch! /* SAFE AREA ------------------------------------------------------------------------------------------- */ |