diff options
| author | Henry Castro <hcastro@collabora.com> | 2020-12-25 13:40:33 -0400 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2021-04-09 17:31:18 +0100 |
| commit | 402e2ab0bbb6ee1b154bc5087044639201832b00 (patch) | |
| tree | 842ec37f5d6e71fb5d4a0c9f78618ac62cfba227 | |
| parent | lok: show error message dialog for VBA macros (diff) | |
| download | core-402e2ab0bbb6ee1b154bc5087044639201832b00.tar.gz core-402e2ab0bbb6ee1b154bc5087044639201832b00.zip | |
lok: add interaction handler "macro security" confirmation
When a client side request to load document with macros
embedded, it will show the "Macro Security Warning" message dialog.
Change-Id: Id848980a4fd3a5138bc98c43e57044f7d5ce3189
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/108292
Tested-by: Jenkins
Reviewed-by: Henry Castro <hcastro@collabora.com>
| -rw-r--r-- | desktop/source/lib/lokinteractionhandler.cxx | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx index 0933e4c230a7..7561bb968dd4 100644 --- a/desktop/source/lib/lokinteractionhandler.cxx +++ b/desktop/source/lib/lokinteractionhandler.cxx @@ -21,11 +21,14 @@ #include <boost/property_tree/json_parser.hpp> +#include <comphelper/processfactory.hxx> #include <cppuhelper/supportsservice.hxx> #include <com/sun/star/task/XInteractionAbort.hpp> #include <com/sun/star/task/XInteractionApprove.hpp> #include <com/sun/star/task/XInteractionPassword2.hpp> +#include <com/sun/star/task/DocumentMacroConfirmationRequest.hpp> +#include <com/sun/star/task/InteractionHandler.hpp> #include <com/sun/star/ucb/InteractiveNetworkConnectException.hpp> #include <com/sun/star/ucb/InteractiveNetworkOffLineException.hpp> @@ -345,6 +348,19 @@ sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest( if (handlePasswordRequest(rContinuations, request)) return true; + task::DocumentMacroConfirmationRequest aConfirmRequest; + if (request >>= aConfirmRequest) + { + uno::Reference< task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent( + ::comphelper::getProcessComponentContext(), nullptr)); + + if (xInteraction.is()) + xInteraction->handleInteractionRequest(xRequest); + + return true; + } + // TODO: perform more interactions 'for real' like the above selectApproved(rContinuations); |