From 4b3308a8c24d71c30145c93411fab12c66660b5e Mon Sep 17 00:00:00 2001 From: Stephan Bergmann Date: Tue, 18 Apr 2023 15:06:49 +0200 Subject: Avoid NullPointerException ...when dispose is called without a preceding call to initialize (as would happen with an improved CppunitTest_services) Change-Id: Ic632d736ecb27509b092ef526cf0dfc964023663 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/150576 Tested-by: Jenkins Reviewed-by: Stephan Bergmann --- .../com/sun/star/script/framework/security/SecurityDialog.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'scripting') diff --git a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java index 078f63395384..dcef62d86077 100644 --- a/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java +++ b/scripting/java/Framework/com/sun/star/script/framework/security/SecurityDialog.java @@ -515,10 +515,12 @@ public class SecurityDialog extends WeakBase implements public void dispose() { - XComponent xComponent = - UnoRuntime.queryInterface(XComponent.class, _xDialog); + if (_xDialog != null) { + XComponent xComponent = + UnoRuntime.queryInterface(XComponent.class, _xDialog); - xComponent.dispose(); + xComponent.dispose(); + } } public void addEventListener(com.sun.star.lang.XEventListener xListener) { -- cgit