don't need an explicit help handler, the default will be fine

Change-Id: I61643e507a68e66e1798c2d21a3f9372027fda1a

4 files changed, 12 insertions, 30 deletions

diff --git a/starmath/inc/dialog.hxx b/starmath/inc/dialog.hxx
index 4274266ec90a..5f47fc9659f7 100644
--- a/starmath/inc/dialog.hxx
+++ b/starmath/inc/dialog.hxx
@@ -149,7 +149,6 @@ class SmFontTypeDialog : public ModalDialog
     SmFontPickListBox* m_pSerifFont;
     SmFontPickListBox* m_pSansFont;
     SmFontPickListBox* m_pFixedFont;
-    HelpButton* m_pHelpButton1;
     MenuButton* m_pMenuButton;
     PushButton* m_pDefaultButton;
 
diff --git a/starmath/inc/helpids.h b/starmath/inc/helpids.h
index 437fe42fb6c2..8ee31c1998c6 100644
--- a/starmath/inc/helpids.h
+++ b/starmath/inc/helpids.h
@@ -20,7 +20,6 @@
 #define STARMATH_HELPIDS_H
 
 #define HID_SMA_FONTDIALOG                                "STARMATH_HID_SMA_FONTDIALOG"
-#define HID_SMA_FONTTYPEDIALOG                            "STARMATH_HID_SMA_FONTTYPEDIALOG"
 #define HID_SMA_DISTANCEDIALOG                            "STARMATH_HID_SMA_DISTANCEDIALOG"
 #define HID_SMA_SYMDEFINEDIALOG                           "STARMATH_HID_SMA_SYMDEFINEDIALOG"
 #define HID_SMA_WIN_DOCUMENT                              "STARMATH_HID_SMA_WIN_DOCUMENT"
diff --git a/starmath/source/dialog.cxx b/starmath/source/dialog.cxx
index b42a278bdce4..c445fb3802ac 100644
--- a/starmath/source/dialog.cxx
+++ b/starmath/source/dialog.cxx
@@ -533,17 +533,6 @@ IMPL_LINK_INLINE_START( SmFontTypeDialog, DefaultButtonClickHdl, Button *, EMPTY
 }
 IMPL_LINK_INLINE_END( SmFontTypeDialog, DefaultButtonClickHdl, Button *, pButton )
 
-IMPL_LINK( SmFontTypeDialog, HelpButtonClickHdl, Button *, EMPTYARG /*pButton*/ )
-{
-    // start help system
-    Help* pHelp = Application::GetHelp();
-    if( pHelp )
-    {
-        pHelp->Start( OUString( "HID_SMA_FONTTYPEDIALOG" ), m_pHelpButton1 );
-    }
-    return 0;
-}
-
 SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevice)
     : ModalDialog(pParent, "FontsDialog", "modules/smath/ui/fonttypedialog.ui"),
     pFontListDev    (pFntListDevice)
@@ -555,12 +544,10 @@ SmFontTypeDialog::SmFontTypeDialog(Window * pParent, OutputDevice *pFntListDevic
     get(m_pSerifFont, "serifCB");
     get(m_pSansFont, "sansCB");
     get(m_pFixedFont, "fixedCB");
-    get(m_pHelpButton1, "help");
     get(m_pMenuButton, "modify");
     get(m_pDefaultButton, "default");
 
     m_pDefaultButton->SetClickHdl(LINK(this, SmFontTypeDialog, DefaultButtonClickHdl));
-    m_pHelpButton1->SetClickHdl(LINK(this, SmFontTypeDialog, HelpButtonClickHdl));
 
     m_pMenuButton->GetPopupMenu()->SetSelectHdl(LINK(this, SmFontTypeDialog, MenuSelectHdl));
 }
diff --git a/starmath/uiconfig/smath/ui/fonttypedialog.ui b/starmath/uiconfig/smath/ui/fonttypedialog.ui
index 92b10f0bd6aa..b31f04572e5c 100644
--- a/starmath/uiconfig/smath/ui/fonttypedialog.ui
+++ b/starmath/uiconfig/smath/ui/fonttypedialog.ui
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
+  <!-- interface-requires LibreOffice 1.0 -->
   <object class="GtkDialog" id="FontsDialog">
     <property name="can_focus">False</property>
     <property name="border_width">6</property>
@@ -23,7 +24,6 @@
                 <property name="can_default">True</property>
                 <property name="has_default">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -38,7 +38,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -53,7 +52,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -68,7 +66,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_stock">True</property>
               </object>
               <packing>
@@ -83,7 +80,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -126,8 +122,8 @@
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_rows">4</property>
-                        <property name="n_columns">2</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="label1">
                             <property name="visible">True</property>
@@ -135,6 +131,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Variables</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">variableCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -153,6 +150,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Functions</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">functionCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -171,6 +169,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Numbers</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">numberCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -189,6 +188,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Text</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">textCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -291,7 +291,8 @@
                       <object class="GtkGrid" id="grid2">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="n_columns">2</property>
+                        <property name="row_spacing">6</property>
+                        <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="label5">
                             <property name="visible">True</property>
@@ -299,6 +300,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Serif</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">serifCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -317,6 +319,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">S_ans</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">sansCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -335,6 +338,7 @@
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">F_ixed</property>
                             <property name="use_underline">True</property>
+                            <property name="mnemonic_widget">fixedCB</property>
                             <attributes>
                               <attribute name="weight" value="normal"/>
                             </attributes>
@@ -430,7 +434,6 @@
       <object class="GtkMenuItem" id="menuitem1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Variables</property>
         <property name="use_underline">True</property>
       </object>
@@ -439,7 +442,6 @@
       <object class="GtkMenuItem" id="menuitem2">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Functions</property>
         <property name="use_underline">True</property>
       </object>
@@ -448,7 +450,6 @@
       <object class="GtkMenuItem" id="menuitem3">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Numbers</property>
         <property name="use_underline">True</property>
       </object>
@@ -457,7 +458,6 @@
       <object class="GtkMenuItem" id="menuitem4">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Text</property>
         <property name="use_underline">True</property>
       </object>
@@ -466,7 +466,6 @@
       <object class="GtkMenuItem" id="menuitem5">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">_Serif</property>
         <property name="use_underline">True</property>
       </object>
@@ -475,7 +474,6 @@
       <object class="GtkMenuItem" id="menuitem6">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">S_ans</property>
         <property name="use_underline">True</property>
       </object>
@@ -484,7 +482,6 @@
       <object class="GtkMenuItem" id="menuitem7">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="use_action_appearance">False</property>
         <property name="label" translatable="yes">Fixe_d</property>
         <property name="use_underline">True</property>
       </object>