[Libreoffice-commits] core.git: 3 commits - cui/source cui/uiconfig dbaccess/source translations

[Caolán McNamara (via logerrit)]

 cui/source/dialogs/hlmailtp.cxx                |    2 +-
 cui/uiconfig/ui/hyperlinkmailpage.ui           |    8 ++++----
 dbaccess/source/ui/control/RelationControl.cxx |    2 +-
 translations                                   |    2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

New commits:
commit f353fa15b547cbeb70e2be1ed2d3d89a84ebad33
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Mon Sep 28 09:48:54 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 28 13:13:56 2020 +0200

    adressbook->addressbook
    
    Change-Id: Ic72f00a704b7cbb5d1f5639c1cf726cf4693b470
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103536
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/cui/source/dialogs/hlmailtp.cxx b/cui/source/dialogs/hlmailtp.cxx
index 4e2e111fcc9b..1cae4b29d2fa 100644
--- a/cui/source/dialogs/hlmailtp.cxx
+++ b/cui/source/dialogs/hlmailtp.cxx
@@ -36,7 +36,7 @@ using namespace ::com::sun::star;
 SvxHyperlinkMailTp::SvxHyperlinkMailTp(weld::Container* pParent, SvxHpLinkDlg* pDlg, const SfxItemSet* pItemSet)
     : SvxHyperlinkTabPageBase(pParent, pDlg, "cui/ui/hyperlinkmailpage.ui", "HyperlinkMailPage", pItemSet)
     , m_xCbbReceiver(new SvxHyperURLBox(xBuilder->weld_combo_box("receiver")))
-    , m_xBtAdrBook(xBuilder->weld_button("adressbook"))
+    , m_xBtAdrBook(xBuilder->weld_button("addressbook"))
     , m_xFtSubject(xBuilder->weld_label("subject_label"))
     , m_xEdSubject(xBuilder->weld_entry("subject"))
 {
diff --git a/cui/uiconfig/ui/hyperlinkmailpage.ui b/cui/uiconfig/ui/hyperlinkmailpage.ui
index 82963b3a4250..fde97f377f9c 100644
--- a/cui/uiconfig/ui/hyperlinkmailpage.ui
+++ b/cui/uiconfig/ui/hyperlinkmailpage.ui
@@ -51,16 +51,16 @@
                   </packing>
                 </child>
                 <child>
-                  <object class="GtkButton" id="adressbook">
+                  <object class="GtkButton" id="addressbook">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
                     <property name="receives_default">True</property>
-                    <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|adressbook|tooltip_text">Data Sources...</property>
+                    <property name="tooltip_text" translatable="yes" context="hyperlinkmailpage|addressbook|tooltip_text">Data Sources...</property>
                     <property name="image">image1</property>
                     <property name="always_show_image">True</property>
                     <child internal-child="accessible">
-                      <object class="AtkObject" id="adressbook-atkobject">
-                        <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|adressbook">Hides or shows the data source browser.</property>
+                      <object class="AtkObject" id="addressbook-atkobject">
+                        <property name="AtkObject::accessible-description" translatable="yes" context="hyperlinkmailpage|extended_tip|addressbook">Hides or shows the data source browser.</property>
                       </object>
                     </child>
                   </object>
commit 70866d4663e7e7414539a5e8664385d8b13ba034
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Sep 27 20:06:17 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Sep 28 13:12:42 2020 +0200

    Related: tdf#137016 check if subcontrol has the focus
    
    Change-Id: I632188bc0512c9d8935bd0898c96e066881ebeb1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/103523
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/dbaccess/source/ui/control/RelationControl.cxx b/dbaccess/source/ui/control/RelationControl.cxx
index d9de91ba494b..69f0a00cae2d 100644
--- a/dbaccess/source/ui/control/RelationControl.cxx
+++ b/dbaccess/source/ui/control/RelationControl.cxx
@@ -184,7 +184,7 @@ namespace dbaui
 
     bool ORelationControl::PreNotify(NotifyEvent& rNEvt)
     {
-        if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() )
+        if (rNEvt.GetType() == MouseNotifyEvent::LOSEFOCUS && !HasChildPathFocus() && !ControlHasFocus())
             PostUserEvent(LINK(this, ORelationControl, AsynchDeactivate), nullptr, true);
         else if (rNEvt.GetType() == MouseNotifyEvent::GETFOCUS)
             PostUserEvent(LINK(this, ORelationControl, AsynchActivate), nullptr, true);
commit 82ae5d148123b0514c119f6b775fa595737cbd7c
Author:     Christian Lohmaier <lohmaier+LibreOffice at googlemail.com>
AuthorDate: Mon Sep 28 13:08:38 2020 +0200
Commit:     Gerrit Code Review <gerrit at gerrit.libreoffice.org>
CommitDate: Mon Sep 28 13:08:38 2020 +0200

    Update git submodules
    
    * Update translations from branch 'master'
      to b7dd30b210d1d080404aed2dc7cf2270a10d1260
      - update translations for master
    
        and force-fix errors using pocheck
    
        Change-Id: Ifb5878eff9d322124054a88241a83402f35e2fa1

diff --git a/translations b/translations
index 14a72851d401..b7dd30b210d1 160000
--- a/translations
+++ b/translations
@@ -1 +1 @@
-Subproject commit 14a72851d401d86cf9fd72a5e139ab87eb0f47d1
+Subproject commit b7dd30b210d1d080404aed2dc7cf2270a10d1260