diff options
| author | merttumer <mert.tumer@collabora.com> | 2021-04-26 08:12:11 +0300 |
|---|---|---|
| committer | Mert Tumer <mert.tumer@collabora.com> | 2021-06-04 07:46:39 +0200 |
| commit | 8c26772822e2f768e48be72feb29ec06f00d9cf2 (patch) | |
| tree | 55e1f9c321d8794eb5cd20788695a7a49edbc270 /desktop | |
| parent | 790f7deb17cede31c780b3e296672bbe7577763c (diff) | |
lok: Interaction handler for FilterOptions
This will enable Text Import Dialog to be executed
before the document is loaded
Change-Id: I263e69f0739f4971f4c4eec032ebf22ffbdeebb7
Signed-off-by: merttumer <mert.tumer@collabora.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/114638
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116294
Tested-by: Jenkins
Diffstat (limited to 'desktop')
| -rw-r--r-- | desktop/source/lib/lokinteractionhandler.cxx | 23 | ||||
| -rw-r--r-- | desktop/source/lib/lokinteractionhandler.hxx | 2 |
2 files changed, 25 insertions, 0 deletions
diff --git a/desktop/source/lib/lokinteractionhandler.cxx b/desktop/source/lib/lokinteractionhandler.cxx index eb7d120a5e3e..325e5893184a 100644 --- a/desktop/source/lib/lokinteractionhandler.cxx +++ b/desktop/source/lib/lokinteractionhandler.cxx @@ -40,6 +40,8 @@ #include <com/sun/star/task/DocumentPasswordRequest2.hpp> #include <com/sun/star/task/DocumentMSPasswordRequest2.hpp> +#include <com/sun/star/document/FilterOptionsRequest.hpp> + #include "../../inc/lib/init.hxx" #include <LibreOfficeKit/LibreOfficeKitEnums.h> @@ -350,6 +352,24 @@ bool LOKInteractionHandler::handleMacroConfirmationRequest(const uno::Reference< return false; } +bool LOKInteractionHandler::handleFilterOptionsRequest(const uno::Reference<task::XInteractionRequest>& xRequest) +{ + document::FilterOptionsRequest aFilterOptionsRequest; + uno::Any const request(xRequest->getRequest()); + if (request >>= aFilterOptionsRequest) + { + uno::Reference< task::XInteractionHandler2 > xInteraction( + task::InteractionHandler::createWithParent( + ::comphelper::getProcessComponentContext(), nullptr)); + + if (xInteraction.is()) + xInteraction->handleInteractionRequest(xRequest); + + return true; + } + return false; +} + sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest( const uno::Reference<task::XInteractionRequest>& xRequest) { @@ -365,6 +385,9 @@ sal_Bool SAL_CALL LOKInteractionHandler::handleInteractionRequest( if (handlePasswordRequest(rContinuations, request)) return true; + if (handleFilterOptionsRequest(xRequest)) + return true; + if (handleMacroConfirmationRequest(xRequest)) return true; diff --git a/desktop/source/lib/lokinteractionhandler.hxx b/desktop/source/lib/lokinteractionhandler.hxx index 9c15f85f4bc8..108343ec22e3 100644 --- a/desktop/source/lib/lokinteractionhandler.hxx +++ b/desktop/source/lib/lokinteractionhandler.hxx @@ -76,6 +76,8 @@ private: bool handlePasswordRequest(const css::uno::Sequence<css::uno::Reference<css::task::XInteractionContinuation>> &rContinuations, const css::uno::Any& rRequest); static bool handleMacroConfirmationRequest(const css::uno::Reference<css::task::XInteractionRequest>& xRequest); + static bool handleFilterOptionsRequest(const ::com::sun::star::uno::Reference<::com::sun::star::task::XInteractionRequest>& Request); + public: void SetPassword(char const* pPassword); |