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

Noel Grandin noel at peralex.com
Mon Nov 24 03:56:44 PST 2014


 wizards/com/sun/star/wizards/ui/UnoDialog.java  |    2 +-
 wizards/com/sun/star/wizards/ui/UnoDialog2.java |   10 ----------
 2 files changed, 1 insertion(+), 11 deletions(-)

New commits:
commit f136502dd357c2faa5fde494f89ca833c733c9a4
Author: Noel Grandin <noel at peralex.com>
Date:   Tue Nov 18 12:58:10 2014 +0200

    createListener() is never overriden
    
    Change-Id: I95c095eb7a6f315019fb851fb20e65314eaebf55
    Reviewed-on: https://gerrit.libreoffice.org/13091
    Reviewed-by: Noel Grandin <noelgrandin at gmail.com>
    Tested-by: Noel Grandin <noelgrandin at gmail.com>

diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog.java b/wizards/com/sun/star/wizards/ui/UnoDialog.java
index 6ba5822..ef66537 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog.java
@@ -55,7 +55,7 @@ public class UnoDialog implements EventNames
     public Resource m_oResource;
     public XWindowPeer xWindowPeer = null;
     private PeerConfig m_oPeerConfig;
-    protected AbstractListener guiEventListener;
+    protected final AbstractListener guiEventListener = new CommonListener();
 
     public AbstractListener getGuiEventListener()
     {
diff --git a/wizards/com/sun/star/wizards/ui/UnoDialog2.java b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
index eaf929f..9a09ba0 100644
--- a/wizards/com/sun/star/wizards/ui/UnoDialog2.java
+++ b/wizards/com/sun/star/wizards/ui/UnoDialog2.java
@@ -38,15 +38,6 @@ import com.sun.star.wizards.ui.event.*;
 public class UnoDialog2 extends UnoDialog
 {
 
-    /**
-     * Override this method to return another listener.
-     * @return
-     */
-    protected AbstractListener createListener()
-    {
-        return new CommonListener();
-    }
-
     public UnoDialog2(XMultiServiceFactory xmsf)
     {
         super(xmsf, new String[]
@@ -54,7 +45,6 @@ public class UnoDialog2 extends UnoDialog
                 }, new Object[]
                 {
                 });
-        guiEventListener = createListener();
     }
 
     public XButton insertButton(String sName, String actionPerformed, Object eventTarget, String[] sPropNames, Object[] oPropValues)


More information about the Libreoffice-commits mailing list