From 53135b2a6ea0222cc9bece9e96ff6c7b833d5490 Mon Sep 17 00:00:00 2001 From: Noel Grandin Date: Tue, 18 Nov 2014 12:59:57 +0200 Subject: the UnoDialog constructor parameters can be simplified Change-Id: I5c790a4b79966c977899a0cdacde8fb41148eb1a Reviewed-on: https://gerrit.libreoffice.org/13092 Reviewed-by: Noel Grandin Tested-by: Noel Grandin --- wizards/com/sun/star/wizards/ui/UnoDialog.java | 4 ++-- wizards/com/sun/star/wizards/ui/UnoDialog2.java | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java index ef6653714372..f23eda97319e 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java @@ -62,7 +62,7 @@ public class UnoDialog implements EventNames return guiEventListener; } - public UnoDialog(XMultiServiceFactory xMSF, String[] PropertyNames, Object[] PropertyValues) + public UnoDialog(XMultiServiceFactory xMSF) { try { @@ -70,7 +70,7 @@ public class UnoDialog implements EventNames ControlList = new HashMap(); xDialogModel = (XInterface) xMSF.createInstance("com.sun.star.awt.UnoControlDialogModel"); XMultiPropertySet xMultiPSetDlg = UnoRuntime.queryInterface(XMultiPropertySet.class, xDialogModel); - xMultiPSetDlg.setPropertyValues(PropertyNames, PropertyValues); + xMultiPSetDlg.setPropertyValues(new String[0], new Object[0]); MSFDialogModel = UnoRuntime.queryInterface(XMultiServiceFactory.class, xDialogModel); xUnoDialog = (XInterface) xMSF.createInstance("com.sun.star.awt.UnoControlDialog"); xControl = UnoRuntime.queryInterface(XControl.class, xUnoDialog); diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java index 9a09ba0f8666..ab41e0e5eded 100644 --- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java +++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java @@ -40,11 +40,7 @@ public class UnoDialog2 extends UnoDialog public UnoDialog2(XMultiServiceFactory xmsf) { - super(xmsf, new String[] - { - }, new Object[] - { - }); + super(xmsf); } public XButton insertButton(String sName, String actionPerformed, Object eventTarget, String[] sPropNames, Object[] oPropValues) -- cgit