[Libreoffice-commits] core.git: Branch 'libreoffice-4-2-0' - sfx2/source sfx2/uiconfig

[Zolnai Tamás]

 sfx2/source/dialog/backingwindow.cxx |    3 ---
 sfx2/uiconfig/ui/startcenter.ui      |    3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 607bd3de40adf0d296affd3b5fe33cac48c9d4fd
Author: Zolnai Tamás <tamas.zolnai at collabora.com>
Date:   Sat Jan 11 01:57:54 2014 +0100

    fdo#72420 Startcenter: help button point to local/wiki help, ui part
    
    Not handle clicking help button manually but use the defualt gtk-help
    which will point to the corresponding help file depend
    on helpids.
    
    (cherry picked from commit 55fcca64a7d006f8cb10268fd2e1e09b1618a800)
    
    Change-Id: I7ac4b51868d1a5828c810b1ac629d5a56ffb6f50
    Reviewed-on: https://gerrit.libreoffice.org/7394
    Reviewed-by: Andras Timar <andras.timar at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index f7a66fb..ad9b8d8 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -230,7 +230,6 @@ void BackingWindow::initControls()
     setupButton( mpImpressAllButton );
     setupButton( mpMathAllButton );
 
-    mpHelpButton->SetClickHdl(LINK(this, BackingWindow, ExtLinkClickHdl));
     mpExtensionsButton->SetClickHdl(LINK(this, BackingWindow, ExtLinkClickHdl));
 
     // setup nice colors
@@ -360,8 +359,6 @@ IMPL_LINK(BackingWindow, ExtLinkClickHdl, Button*, pButton)
 
     if (pButton == mpExtensionsButton)
         aNode = "AddFeatureURL";
-    else if (pButton == mpHelpButton)
-        aNode = "InfoURL";
 
     if (!aNode.isEmpty())
     {
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 831e1bf..4e0e04b 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -260,13 +260,14 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="help">
-                            <property name="label" translatable="yes">_Help</property>
+                            <property name="label">gtk-help</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="has_tooltip">True</property>
                             <property name="relief">none</property>
                             <property name="use_underline">True</property>
+                            <property name="use_stock">True</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>