diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2020-06-26 17:33:17 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2020-06-26 18:52:36 +0200 |
| commit | a6862a26d6cd17f6b4e4f6577bcd778bf952e65b (patch) | |
| tree | 988cdb9f3a9fe6e0b92d7590f18cb988d4e99a05 /framework/inc | |
| parent | 389008b0497793283e652050e32267370326855f (diff) | |
tdf#134106: Get rid of XDesktopInternal again
For internal functionality that is not meant to be called by client code, I
think it is appropriate to hide it either via XUnoTunnel (but which would have
been a tad incovenient, as it would have meant to make framework::Desktop in
framework/inc/services/desktop.hxx available to the code in
desktop/source/app/app.cxx), or via reuse of some existing, sufficently fitting
interface (as is done here with css.task.XJob). This nicely avoids the
backwards compatibilty issue with remote Python scripts, as discussed in
tdf#134106 "Binary URP bridge disposed during call to
ServiceManager.createInstanceWithContext".
Change-Id: Ic9db9401ddf0f6b696344dd1d5c6ad279ea5a832
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97241
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
Diffstat (limited to 'framework/inc')
| -rw-r--r-- | framework/inc/services/desktop.hxx | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/framework/inc/services/desktop.hxx b/framework/inc/services/desktop.hxx index 0cf9cb355fe4..3967650eabde 100644 --- a/framework/inc/services/desktop.hxx +++ b/framework/inc/services/desktop.hxx @@ -30,7 +30,6 @@ #include <com/sun/star/frame/XUntitledNumbers.hpp> #include <com/sun/star/frame/XController.hpp> #include <com/sun/star/frame/XDesktop2.hpp> -#include <com/sun/star/frame/XDesktopInternal.hpp> #include <com/sun/star/frame/XTerminateListener.hpp> #include <com/sun/star/frame/XTask.hpp> #include <com/sun/star/frame/XFramesSupplier.hpp> @@ -43,6 +42,7 @@ #include <com/sun/star/lang/XEventListener.hpp> #include <com/sun/star/lang/XComponent.hpp> #include <com/sun/star/task/XInteractionHandler.hpp> +#include <com/sun/star/task/XJob.hpp> #include <com/sun/star/frame/XDispatchRecorderSupplier.hpp> #include <com/sun/star/uno/XComponentContext.hpp> @@ -90,7 +90,7 @@ enum ELoadState typedef cppu::WeakComponentImplHelper< css::lang::XServiceInfo , css::frame::XDesktop2 , - css::frame::XDesktopInternal, + css::task::XJob, // for internal "shutdown" command css::frame::XTasksSupplier , css::frame::XDispatchResultListener , // => XEventListener css::task::XInteractionHandler , @@ -285,9 +285,11 @@ class Desktop final : private cppu::BaseMutex, /// @throws css::uno::RuntimeException bool terminateQuickstarterToo(); - virtual void SAL_CALL shutdown() override; + css::uno::Any SAL_CALL execute(css::uno::Sequence<css::beans::NamedValue> const & Arguments) + override; private: + void shutdown(); // OPropertySetHelper virtual sal_Bool SAL_CALL convertFastPropertyValue ( css::uno::Any& aConvertedValue , |