diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-10-03 16:42:15 +0100 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-10-20 22:49:16 +0200 |
| commit | d38b6ccd56aa876eec467a5af298da402249f7cd (patch) | |
| tree | 8814207eb1041159fa1fd051e9b81142c8ae08b7 /svtools | |
| parent | 54b4174268ce3faf1c7e21b1f4933c383d6299f0 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 0be3a5eea3089c2b63cc821ffb282fd4ab8ec455)
Reviewed-on: https://gerrit.libreoffice.org/61525
(cherry picked from commit 3e69c24b4f4a8d4bbf1e2e76177e503f1d6d5840)
Diffstat (limited to 'svtools')
| -rw-r--r-- | svtools/source/brwbox/editbrowsebox.cxx | 22 |
1 files changed, 20 insertions, 2 deletions
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 |