diff options
| author | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-06-30 23:23:36 +0200 |
|---|---|---|
| committer | Markus Mohrhard <markus.mohrhard@googlemail.com> | 2017-07-02 04:42:09 +0200 |
| commit | 7250bc4721b334714bb0fa1345211c83330f94b2 (patch) | |
| tree | bddb706179b4d7eee297544576f1ee4ccb307043 /include | |
| parent | 34c77d4bf3d2924c4ad26728d4c491b393fa0fc8 (diff) | |
notify the clipboard terminate listener before any other terminate listener
Otherwise we may have destroyed a service that is needed to generate
one of the clipboard formats requested by the system clipboard.
Change-Id: Id05de3ac569e3ed38cd97efc4c48326bc6a8db0b
Reviewed-on: https://gerrit.libreoffice.org/39429
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/svtools/transfer.hxx | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/include/svtools/transfer.hxx b/include/svtools/transfer.hxx index bc3c6eceacab..f499a2a1fce4 100644 --- a/include/svtools/transfer.hxx +++ b/include/svtools/transfer.hxx @@ -29,6 +29,7 @@ #include <sot/exchange.hxx> #include <cppuhelper/implbase.hxx> #include <com/sun/star/frame/XTerminateListener.hpp> +#include <com/sun/star/lang/XServiceInfo.hpp> #include <com/sun/star/lang/XUnoTunnel.hpp> #include <com/sun/star/datatransfer/XTransferable2.hpp> #include <com/sun/star/datatransfer/clipboard/XClipboardOwner.hpp> @@ -127,7 +128,7 @@ class SVT_DLLPUBLIC TransferableHelper : public cppu::WeakImplHelper< css::datat private: // nested class to implement the XTerminateListener interface - class TerminateListener : public cppu::WeakImplHelper< css::frame::XTerminateListener > + class TerminateListener : public cppu::WeakImplHelper< css::frame::XTerminateListener, css::lang::XServiceInfo > { private: @@ -142,6 +143,11 @@ private: virtual void SAL_CALL queryTermination( const css::lang::EventObject& aEvent ) override; virtual void SAL_CALL notifyTermination( const css::lang::EventObject& aEvent ) override; + // XServiceInfo + virtual OUString SAL_CALL getImplementationName() override; + virtual sal_Bool SAL_CALL supportsService( const OUString& sServiceName ) override; + virtual css::uno::Sequence< OUString > SAL_CALL getSupportedServiceNames() override; + public: TerminateListener( TransferableHelper& rDropTargetHelper ); |