diff options
| author | Tor Lillqvist <tml@collabora.com> | 2018-03-05 21:52:05 +0200 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2018-05-31 21:38:37 +0300 |
| commit | 5e1ce67cc5b86ef59aa8767cbe99f9fe95aea51a (patch) | |
| tree | 2a9ffe260d609cc9314b2b0aa5c3d5cb195c03ea /basic | |
| parent | 4979792e6cdef9e19848e5f676acb60c3d1926d2 (diff) | |
Factor out AsyncQuitHandler to be usable elsewhere, too
Or do we already have the corresponding functionality somewhere, and
SbModule::Run() could be changed to use that instead?
Change-Id: I6f45d4a023f9f9d9a24ab6934117a712ccbe75e2
Reviewed-on: https://gerrit.libreoffice.org/55048
Reviewed-by: Tor Lillqvist <tml@collabora.com>
Tested-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit cac718bfe606c363fa4538db8c6d21f28f139f58)
Diffstat (limited to 'basic')
| -rw-r--r-- | basic/source/classes/sbxmod.cxx | 27 |
1 files changed, 1 insertions, 26 deletions
diff --git a/basic/source/classes/sbxmod.cxx b/basic/source/classes/sbxmod.cxx index f68d541d69a9..aa1b4684e920 100644 --- a/basic/source/classes/sbxmod.cxx +++ b/basic/source/classes/sbxmod.cxx @@ -55,6 +55,7 @@ #include <com/sun/star/lang/XMultiServiceFactory.hpp> #include <comphelper/processfactory.hxx> +#include <comphelper/asyncquithandler.hxx> #include <map> #include <com/sun/star/reflection/ProxyFactory.hpp> #include <com/sun/star/uno/XAggregation.hpp> @@ -416,32 +417,6 @@ bool getDefaultVBAMode( StarBASIC* pb ) return xVBACompat.is() && xVBACompat->getVBACompatibilityMode(); } -class AsyncQuitHandler -{ - AsyncQuitHandler() {} - -public: - AsyncQuitHandler(const AsyncQuitHandler&) = delete; - const AsyncQuitHandler& operator=(const AsyncQuitHandler&) = delete; - static AsyncQuitHandler& instance() - { - static AsyncQuitHandler dInst; - return dInst; - } - - static void QuitApplication() - { - uno::Reference< frame::XDesktop2 > xDeskTop = frame::Desktop::create( comphelper::getProcessComponentContext() ); - xDeskTop->terminate(); - } - DECL_STATIC_LINK( AsyncQuitHandler, OnAsyncQuit, void*, void ); -}; - -IMPL_STATIC_LINK_NOARG( AsyncQuitHandler, OnAsyncQuit, void*, void ) -{ - QuitApplication(); -} - // A Basic module has set EXTSEARCH, so that the elements, that the module contains, // could be found from other module. |