summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-10-03 16:42:15 +0100
committerCaolán McNamara <caolanm@redhat.com>2018-10-08 13:38:36 +0200
commitc523d9556a354e1afac3203b6f1c8b75a2f7d2f0 (patch)
treed213ef6489017d66b7b66535059d7b7ba9eb3313
parent7bafe2441480e2b88d999b30b7f117f05e72c3b3 (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/61324 Tested-by: Jenkins Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
-rw-r--r--svtools/source/brwbox/editbrowsebox.cxx22
1 files changed, 20 insertions, 2 deletions
diff --git a/svtools/source/brwbox/editbrowsebox.cxx b/svtools/source/brwbox/editbrowsebox.cxx
index 1a9cb86b80aa..ffb58e042af5 100644
--- a/svtools/source/brwbox/editbrowsebox.cxx
+++ b/svtools/source/brwbox/editbrowsebox.cxx
@@ -761,12 +761,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