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

[Caolán McNamara]

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

New commits:
commit 887613047e0a20818a33a6cdce2c0803afce64a4
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Jan 14 09:55:15 2015 +0000

    Resolves: fdo#87353 Start Center 'Help' button not functioning any more
    
    Change-Id: I81607ea1951c4a71c003e639b3ebe871a6943374
    (cherry picked from commit f2efbca82d70451b0e8582bb699f33d709152e24)
    Reviewed-on: https://gerrit.libreoffice.org/13901
    Reviewed-by: Adolfo Jayme Barrientos <fitojb at ubuntu.com>
    Tested-by: Michael Stahl <mstahl at redhat.com>
    Reviewed-by: Michael Stahl <mstahl at redhat.com>

diff --git a/sfx2/source/dialog/backingwindow.cxx b/sfx2/source/dialog/backingwindow.cxx
index 02bbb08..f689b58 100644
--- a/sfx2/source/dialog/backingwindow.cxx
+++ b/sfx2/source/dialog/backingwindow.cxx
@@ -114,6 +114,8 @@ BackingWindow::BackingWindow( vcl::Window* i_pParent ) :
     get(mpMathAllButton, "math_all");
 
     get(mpHelpButton, "help");
+    //set an alternative help label that doesn't hotkey the H of the Help menu
+    mpHelpButton->SetText(get<Window>("althelplabel")->GetText());
     get(mpExtensionsButton, "extensions");
 
     //Containers are invisible to cursor traversal
diff --git a/sfx2/uiconfig/ui/startcenter.ui b/sfx2/uiconfig/ui/startcenter.ui
index 3cb7425..7977c33 100644
--- a/sfx2/uiconfig/ui/startcenter.ui
+++ b/sfx2/uiconfig/ui/startcenter.ui
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- Generated with glade 3.16.1 -->
 <interface>
-  <!-- interface-requires LibreOffice 1.0 -->
   <requires lib="gtk+" version="3.0"/>
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkImage" id="calc_all_image">
     <property name="visible">True</property>
     <property name="can_focus">False</property>
@@ -332,6 +332,19 @@
                     <property name="position">11</property>
                   </packing>
                 </child>
+                <child>
+                  <object class="GtkLabel" id="althelplabel">
+                    <property name="can_focus">False</property>
+                    <property name="no_show_all">True</property>
+                    <property name="label" translatable="yes">He_lp</property>
+                    <property name="use_underline">True</property>
+                  </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">12</property>
+                  </packing>
+                </child>
               </object>
               <packing>
                 <property name="expand">False</property>
@@ -365,13 +378,14 @@
                         <property name="orientation">vertical</property>
                         <child>
                           <object class="GtkButton" id="help">
-                            <property name="label" translatable="yes">He_lp</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>