[Libreoffice-commits] core.git: Branch 'libreoffice-6-0-7' - svtools/source

[Libreoffice Gerrit user]

 svtools/source/brwbox/editbrowsebox.cxx |   22 ++++++++++++++++++++--
 1 file changed, 20 insertions(+), 2 deletions(-)

New commits:
commit de630044f20b7261a7f8a0b75a3f533653814f3a
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Wed Oct 3 16:42:15 2018 +0100
Commit:     Michael Stahl <Michael.Stahl at cib.de>
CommitDate: Wed Oct 17 10:21:01 2018 +0200

    Resolves: tdf#93372 format table in base is ignored
    
    since...
    
    commit b4bbb5e5d7b31caad2fbcc00382ad27df3c81001
    Date:   Sun May 17 22:56:46 2015 +0900
    
        refactor how font, fg. and bg. are applied in widgets/controls
    
    revert the relevant piece, in this case there are two Windows/Contexts getting
    their settings manipulated, rather than the usual one
    
    Change-Id: I0a228aee6aaf1f58b2235fccf14dc63ffa96dd2d
    Reviewed-on: https://gerrit.libreoffice.org/61317
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455)
    Reviewed-on: https://gerrit.libreoffice.org/61526
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index eb092d16c51f..1b9f0bfdb0f9 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -763,12 +763,30 @@ return;
 
         if (bFont)
         {
-            GetDataWindow().ApplyControlFont(GetDataWindow(), rStyleSettings.GetFieldFont());
+            vcl::Font aFont = rStyleSettings.GetFieldFont();
+            if (IsControlFont())
+            {
+                GetDataWindow().SetControlFont(GetControlFont());
+                aFont.Merge(GetControlFont());
+            }
+            else
+                GetDataWindow().SetControlFont();
+
+            GetDataWindow().SetZoomedPointFont(GetDataWindow(), aFont);
         }
 
         if (bFont || bForeground)
         {
-            GetDataWindow().ApplyControlForeground(GetDataWindow(), rStyleSettings.GetFieldTextColor());
+            Color aTextColor = rStyleSettings.GetFieldTextColor();
+            if (IsControlForeground())
+            {
+                aTextColor = GetControlForeground();
+                GetDataWindow().SetControlForeground(aTextColor);
+            }
+            else
+                GetDataWindow().SetControlForeground();
+
+            GetDataWindow().SetTextColor( aTextColor );
         }
 
         if (!bBackground) // FIXME: Outside of Paint Hierarchy