[Libreoffice-commits] core.git: 2 commits - swext/mediawiki vcl/unx

[Caolán McNamara]

 swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java |   28 --------------
 vcl/unx/gtk/gtksalmenu.cxx                                |    1 
 2 files changed, 1 insertion(+), 28 deletions(-)

New commits:
commit 3a4b68260bc6c1e8bcb694f640c70652b830c621
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 2 11:38:13 2016 +0000

    gtk3: menubar close button shouldn't get keyboard focus
    
    Change-Id: I6ddd512afa1e41d2dec7c92f61d65ed5bbfa9ace

diff --git a/vcl/unx/gtk/gtksalmenu.cxx b/vcl/unx/gtk/gtksalmenu.cxx
index 5634922..ff92eac 100644
--- a/vcl/unx/gtk/gtksalmenu.cxx
+++ b/vcl/unx/gtk/gtksalmenu.cxx
@@ -528,6 +528,7 @@ void GtkSalMenu::ShowCloseButton(bool bShow)
 
     gtk_button_set_relief(GTK_BUTTON(mpCloseButton), GTK_RELIEF_NONE);
     gtk_button_set_focus_on_click(GTK_BUTTON(mpCloseButton), false);
+    gtk_widget_set_can_focus(mpCloseButton, false);
 
     GtkStyleContext *pButtonContext = gtk_widget_get_style_context(GTK_WIDGET(mpCloseButton));
 
commit 57d85c0e8d479fb3994b58265c44ac22fcd3a656
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Mar 2 10:47:32 2016 +0000

    setListenerState does nothing
    
    and thus callStatusListener does nothing
    
    so there seems no reason to have a m_statusListeners
    which is filled by addStatusListener but not emptied by
    removeStatusListener
    
    Change-Id: I7efdf7ccfd123bf7c2aa6add4f8db969a0019089

diff --git a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
index a7d4a48..e36e32e 100644
--- a/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
+++ b/swext/mediawiki/src/com/sun/star/wiki/WikiEditorImpl.java
@@ -56,7 +56,6 @@ public final class WikiEditorImpl extends WeakBase
     private static final String protocolName = "vnd.com.sun.star.wiki:";
 
     private final XComponentContext m_xContext;
-    private final Map<String, com.sun.star.frame.XStatusListener> m_statusListeners = new HashMap<String, com.sun.star.frame.XStatusListener>();
     private XFrame m_xFrame;
     private XModel m_xModel;
     private final Settings m_aSettings;
@@ -177,33 +176,6 @@ public final class WikiEditorImpl extends WeakBase
         com.sun.star.frame.XStatusListener listener,
         com.sun.star.util.URL url )
     {
-        String urlstring = url.Complete;
-        m_statusListeners.put( urlstring, listener );
-        // synchronous callback required!!!
-        callStatusListener( urlstring );
-    }
-
-
-
-    private void callStatusListener( String uristring )
-    {
-        try
-        {
-            new URI( uristring );
-
-            // check whether any blogs are live...
-            setListenerState( "command");
-        } catch ( URISyntaxException ex )
-        {
-            ex.printStackTrace();
-        }
-    }
-
-
-    private void setListenerState( String urlstring)
-    {
-        com.sun.star.util.URL url = new com.sun.star.util.URL();
-        url.Complete = urlstring;
     }
 
     private void sendArticle()