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

[Caolán McNamara (via logerrit)]

 vcl/source/app/salvtables.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit 4e2306a5e336e2b43759c9712535626d0f2c168f
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Wed Sep 29 15:13:28 2021 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Wed Sep 29 17:41:46 2021 +0200

    Related: tdf#141633 PointFont gets overwritten by ControlFont
    
    Change-Id: I26ffffe7917d109ddc61fd2d2646db0988937c7c
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122827
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/app/salvtables.cxx b/vcl/source/app/salvtables.cxx
index 2d30c82e781b..4a814aab3ee2 100644
--- a/vcl/source/app/salvtables.cxx
+++ b/vcl/source/app/salvtables.cxx
@@ -3296,6 +3296,7 @@ void 
SalInstanceEntry::set_message_type(weld::EntryMessageType eType)
 void SalInstanceEntry::set_font(const vcl::Font& rFont)
 {
     m_xEntry->SetPointFont(*m_xEntry->GetOutDev(), rFont);
+    m_xEntry->SetControlFont(rFont);
     m_xEntry->Invalidate();
 }
 
@@ -6514,6 +6515,7 @@ public:
     {
         Edit& rEntry = m_pEntry->getEntry();
         rEntry.SetPointFont(*rEntry.GetOutDev(), rFont);
+        rEntry.SetControlFont(rFont);
         rEntry.Invalidate();
     }