From cd79c46b46da0a362fbb313d1e47682a85a27f60 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Tue, 30 Jul 2013 15:11:08 +0100
Subject: [PATCH] drop unused help ids & fix mnemonic widgets

Change-Id: I80c21126e2728ffa18c87a98e500cc941d462de1
---
 filter/source/xsltdialog/xmlfilterhelpids.hrc      | 14 --------------
 filter/source/xsltdialog/xmlfiltertabpagexslt.cxx  |  5 -----
 .../uiconfig/ui/xmlfiltertabpagetransformation.ui  | 10 ++++++----
 3 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/filter/source/xsltdialog/xmlfilterhelpids.hrc b/filter/source/xsltdialog/xmlfilterhelpids.hrc
index b87c23ff0a1b..ff6624a3f254 100644
--- a/filter/source/xsltdialog/xmlfilterhelpids.hrc
+++ b/filter/source/xsltdialog/xmlfilterhelpids.hrc
@@ -19,21 +19,7 @@
 #ifndef _XMLFILTERHELPIDS_HRC_
 #define _XMLFILTERHELPIDS_HRC_
 
-#define HID_XML_SOURCE_FILE_DIALOG                          "FILTER_HID_XML_SOURCE_FILE_DIALOG"
-
 #define HID_XML_FILTER_TABDIALOG                            "FILTER_HID_XML_FILTER_TABDIALOG"
-#define HID_XML_FILTER_NAME                                 "FILTER_HID_XML_FILTER_NAME"
-#define HID_XML_FILTER_INTERFACE_NAME                       "FILTER_HID_XML_FILTER_INTERFACE_NAME"
-#define HID_XML_FILTER_EXTENSION                            "FILTER_HID_XML_FILTER_EXTENSION"
-#define HID_XML_FILTER_DOCTYPE                              "FILTER_HID_XML_FILTER_DOCTYPE"
-#define HID_XML_FILTER_NEEDS_XSLT2			    "FILTER_HID_XML_FILTER_NEEDS_XSLT2"
-#define HID_XML_FILTER_EXPORT_XSLT                          "FILTER_HID_XML_FILTER_EXPORT_XSLT"
-#define HID_XML_FILTER_EXPORT_XSLT_BROWSE                   "FILTER_HID_XML_FILTER_EXPORT_XSLT_BROWSE"
-#define HID_XML_FILTER_IMPORT_XSLT                          "FILTER_HID_XML_FILTER_IMPORT_XSLT"
-#define HID_XML_FILTER_IMPORT_XSLT_BROWSE                   "FILTER_HID_XML_FILTER_IMPORT_XSLT_BROWSE"
-#define HID_XML_FILTER_IMPORT_TEMPLATE                      "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE"
-
-#define HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE               "FILTER_HID_XML_FILTER_IMPORT_TEMPLATE_BROWSE"
 
 #define HID_XML_FILTER_TABPAGE_CTRL                         "FILTER_HID_XML_FILTER_TABPAGE_CTRL"
 
diff --git a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
index 1fd2ce1f00b0..c32fb369880e 100644
--- a/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
+++ b/filter/source/xsltdialog/xmlfiltertabpagexslt.cxx
@@ -60,11 +60,6 @@ XMLFilterTabPageXSLT::XMLFilterTabPageXSLT( Window* pParent) :
     m_pPBExprotXSLT->SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) );
     m_pPBImportXSLT->SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) );
     m_pPBImportTemplate->SetClickHdl( LINK ( this, XMLFilterTabPageXSLT, ClickBrowseHdl_Impl ) );
-
-    m_pEDExportXSLT->SetHelpId( HID_XML_FILTER_EXPORT_XSLT );
-    m_pEDImportXSLT->SetHelpId( HID_XML_FILTER_IMPORT_XSLT );
-    m_pEDImportTemplate->SetHelpId( HID_XML_FILTER_IMPORT_TEMPLATE );
-    m_pCBNeedsXSLT2->SetHelpId( HID_XML_FILTER_NEEDS_XSLT2 );
 }
 
 XMLFilterTabPageXSLT::~XMLFilterTabPageXSLT()
diff --git a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
index 6f2ae197bfa6..c19a25fd711a 100644
--- a/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
+++ b/filter/uiconfig/ui/xmlfiltertabpagetransformation.ui
@@ -54,6 +54,7 @@
             <property name="xalign">0</property>
             <property name="label" translatable="yes">_XSLT for export</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">xsltexport</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -64,7 +65,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browseexport">
-            <property name="label" translatable="yes">brows_e...</property>
+            <property name="label" translatable="yes">Brows_e...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -84,6 +85,7 @@
             <property name="xalign">0</property>
             <property name="label" translatable="yes">XSLT _for import</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">xsltimport</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -94,7 +96,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browseimport">
-            <property name="label" translatable="yes">b_rowse...</property>
+            <property name="label" translatable="yes">B_rowse...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>
@@ -112,9 +114,9 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="xalign">0</property>
-            <property name="yalign">0</property>
             <property name="label" translatable="yes">Template for _import</property>
             <property name="use_underline">True</property>
+            <property name="mnemonic_widget">tempimport</property>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -125,7 +127,7 @@
         </child>
         <child>
           <object class="GtkButton" id="browsetemp">
-            <property name="label" translatable="yes">browse...</property>
+            <property name="label" translatable="yes">Browse...</property>
             <property name="visible">True</property>
             <property name="can_focus">True</property>
             <property name="receives_default">True</property>