[Libreoffice-commits] core.git: vcl/inc vcl/source

[Caolán McNamara (via logerrit)]

 vcl/inc/salvtables.hxx        |    2 ++
 vcl/source/app/salvtables.cxx |    5 +++++
 2 files changed, 7 insertions(+)

New commits:
commit 0bbef33b0a67d3394e6f442e8d69f9531b861e07
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Jul 24 15:26:18 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Jul 24 18:10:33 2020 +0200

    use HasChildPathFocus for composite MultiLineEdit
    
    Change-Id: I7b7ca3abbc68d6ba1f63245b1aa6925ae70a0dd1
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/99380
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/vcl/inc/salvtables.hxx b/vcl/inc/salvtables.hxx
index de903a78830f..0b5f52179bdc 100644
--- a/vcl/inc/salvtables.hxx
+++ b/vcl/inc/salvtables.hxx
@@ -1301,6 +1301,8 @@ public:
 
     virtual int vadjustment_get_page_size() const override;
 
+    virtual bool has_focus() const override;
+
     virtual ~SalInstanceTextView() override;
 };
 
diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index ccc31697397c..d84d657f86dc 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -5622,6 +5622,11 @@ int SalInstanceTextView::vadjustment_get_page_size() const
     return rVertScrollBar.GetVisibleSize();
 }
 
+bool SalInstanceTextView::has_focus() const
+{
+    return m_xTextView->HasChildPathFocus();
+}
+
 SalInstanceTextView::~SalInstanceTextView()
 {
     if (!m_xTextView->IsDisposed())