diff options
| author | Samuel Mehrbrodt <Samuel.Mehrbrodt@cib.de> | 2019-11-05 09:17:41 +0100 |
|---|---|---|
| committer | Serge Krot (CIB) <Serge.Krot@cib.de> | 2019-11-05 15:06:25 +0100 |
| commit | 730e588b5ef31c72eccef23f359747f8248e5cf4 (patch) | |
| tree | 8bf3146f67aef6ca68c58a7848bbf7a24d54b056 /scripting | |
| parent | 79d31b8dc8d934d9f9c897eced06271e7e08f04c (diff) | |
Fix option to disable macros
so that it indeeds disables any macro execution.
Before, you could still add macros to the toolbar and execute them from there (and probably many more places).
Now, if this option is set, any macro will no longer be executed.
This includes Javascript, Beanshell and Python scripts
Change-Id: Icfa845e836782c8e1b670a67694f79a60ad74fad
Reviewed-on: https://gerrit.libreoffice.org/82052
Reviewed-by: Serge Krot (CIB) <Serge.Krot@cib.de>
Tested-by: Serge Krot (CIB) <Serge.Krot@cib.de>
Diffstat (limited to 'scripting')
| -rw-r--r-- | scripting/Library_protocolhandler.mk | 4 | ||||
| -rw-r--r-- | scripting/source/protocolhandler/scripthandler.cxx | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/scripting/Library_protocolhandler.mk b/scripting/Library_protocolhandler.mk index 3d243f7f849b..b14add0fe7a6 100644 --- a/scripting/Library_protocolhandler.mk +++ b/scripting/Library_protocolhandler.mk @@ -20,6 +20,10 @@ $(eval $(call gb_Library_use_external,protocolhandler,boost_headers)) $(eval $(call gb_Library_use_sdk_api,protocolhandler)) +$(eval $(call gb_Library_use_custom_headers,protocolhandler,\ + officecfg/registry \ +)) + $(eval $(call gb_Library_use_libraries,protocolhandler,\ comphelper \ cppu \ diff --git a/scripting/source/protocolhandler/scripthandler.cxx b/scripting/source/protocolhandler/scripthandler.cxx index 1fbf0c8bbc46..ed960848d072 100644 --- a/scripting/source/protocolhandler/scripthandler.cxx +++ b/scripting/source/protocolhandler/scripthandler.cxx @@ -46,6 +46,7 @@ #include <cppuhelper/exc_hlp.hxx> #include <cppuhelper/supportsservice.hxx> #include <framework/documentundoguard.hxx> +#include <officecfg/Office/Common.hxx> #include <com/sun/star/uno/XComponentContext.hpp> #include <com/sun/star/uri/XUriReference.hpp> @@ -70,7 +71,7 @@ namespace scripting_protocolhandler void SAL_CALL ScriptProtocolHandler::initialize( const css::uno::Sequence < css::uno::Any >& aArguments ) { - if ( m_bInitialised ) + if ( m_bInitialised || officecfg::Office::Common::Security::Scripting::DisableMacrosExecution::get() ) { return ; } |