[Libreoffice-commits] core.git: wizards/com

Julien Nabet serval2412 at yahoo.fr
Fri Jan 2 04:47:52 PST 2015


 wizards/com/sun/star/wizards/ui/WizardDialog.java |    9 ---------
 1 file changed, 9 deletions(-)

New commits:
commit c7531408b3ef4b2d284edf35ed983c23e7585231
Author: Julien Nabet <serval2412 at yahoo.fr>
Date:   Fri Jan 2 13:45:54 2015 +0100

    Resolves fdo#87123: Impossible to create a form with wizard
    
    Quoting Noel:
    "
    The original block of code looked like this before my changes:
    
    MethodInvocation windowHidden = new MethodInvocation("windowHidden", this);
    xWindow.addWindowListener((CommonListener) getGuiEventListener());
    String dialogName = (String) Helper.getUnoPropertyValue(xDialogModel, PropertyNames.PROPERTY_NAME);
    getGuiEventListener().add(dialogName, EVENT_ACTION_PERFORMED, windowHidden);
    
    which is clearly bogus, since "actionPerformed" is not an event on the XWindowListener interface.
    "
    (see https://bugs.freedesktop.org/show_bug.cgi?id=87123#c14)
    
    Change-Id: I4c4923e6cb21989fcd3e346b099a7e7b15526bf2

diff --git a/wizards/com/sun/star/wizards/ui/WizardDialog.java b/wizards/com/sun/star/wizards/ui/WizardDialog.java
index 081b9a3..523673a 100644
--- a/wizards/com/sun/star/wizards/ui/WizardDialog.java
+++ b/wizards/com/sun/star/wizards/ui/WizardDialog.java
@@ -461,15 +461,6 @@ public abstract class WizardDialog extends UnoDialog2 implements VetoableChangeL
                     });
 
             setControlProperty("btnWizardNext", "DefaultButton", Boolean.TRUE);
-            // add a window listener, to know
-            // if the user used "escape" key to
-            // close the dialog.
-            xWindow.addWindowListener(new XWindowListenerAdapter() {
-                @Override
-                public void windowHidden(EventObject event) {
-                    cancelWizard_1();
-                }
-            });
         }
         catch (java.lang.Exception jexception)
         {


More information about the Libreoffice-commits mailing list