bean/com/sun/star/comp/beans/OOoBean.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
New commits:
commit 6e8d5b28c23c6930cb23d33ca182748e7faf54dc
Author: Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Mar 24 08:56:52 2021 +0000
Commit: Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Mar 24 16:20:40 2021 +0100
cid#1473991 Dereference null return value
Change-Id: Id5aa369ac5edac5bb5d0c7adaadc4b6495b63750
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/113023
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caol...@redhat.com>
diff --git a/bean/com/sun/star/comp/beans/OOoBean.java
b/bean/com/sun/star/comp/beans/OOoBean.java
index 3475447368e4..ca9442d58427 100644
--- a/bean/com/sun/star/comp/beans/OOoBean.java
+++ b/bean/com/sun/star/comp/beans/OOoBean.java
@@ -1405,7 +1405,10 @@
xLayoutManager.showElement("private:resource/menubar/menubar");
iConnection.addEventListener( this );
// listen on a terminating OOo
- getOOoDesktop().addTerminateListener( this );
+ try {
+ getOOoDesktop().addTerminateListener( this );
+ }
+ catch ( Throwable aExc ) {}
// start this thread as a daemon
setDaemon( true );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
