[Libreoffice-commits] core.git: svtools/source svtools/uiconfig

[Caolán McNamara]

 svtools/source/dialogs/addresstemplate.cxx   |    1 -
 svtools/uiconfig/ui/addresstemplatedialog.ui |    2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

New commits:
commit f5179bcbac9a0b33546e442a9e176b1791dff170
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Fri Mar 21 15:13:42 2014 +0000

    just give the enclosing frame the required helpid
    
    Change-Id: Ifb0209eaea4f738ac5b5826f924552465cccc272

diff --git a/svtools/source/dialogs/addresstemplate.cxx b/svtools/source/dialogs/addresstemplate.cxx
index ae09869..ce6fcc0 100644
--- a/svtools/source/dialogs/addresstemplate.cxx
+++ b/svtools/source/dialogs/addresstemplate.cxx
@@ -587,7 +587,6 @@ void AssignmentPersistentData::Commit()
                 m_pImpl->pFields[row * 2 + column] = get<ListBox>(OString("box") + OString::number(row * 2 + column));
                 m_pImpl->pFields[row * 2 + column]->SetSelectHdl(LINK(this, AddressBookSourceDialog, OnFieldSelect));
 
-                m_pImpl->pFields[row * 2 + column]->SetHelpId("svt/ui/addresstemplatedialog/assign");
             }
         }
 
diff --git a/svtools/uiconfig/ui/addresstemplatedialog.ui b/svtools/uiconfig/ui/addresstemplatedialog.ui
index 01b4e76..65e708c 100644
--- a/svtools/uiconfig/ui/addresstemplatedialog.ui
+++ b/svtools/uiconfig/ui/addresstemplatedialog.ui
@@ -210,7 +210,7 @@
               </packing>
             </child>
             <child>
-              <object class="GtkFrame" id="frame2">
+              <object class="GtkFrame" id="assign">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="hexpand">True</property>