svtools/source/contnr/treelistbox.cxx | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-)
New commits: commit f9c6022d109062d9b13339463f363892b2439d7d Author: Caolán McNamara <[email protected]> Date: Thu Sep 28 14:34:17 2017 +0100 Resolves: tdf#112656 don't reset to default font if a custom font was set the list has been laid out with the smaller custom font, including calculating the bounding box of the entry, then rendered with the default larger font Change-Id: I2ae569c9857d4e1016cbf55da4c3334c63dcf5f6 Reviewed-on: https://gerrit.libreoffice.org/42910 Reviewed-by: Eike Rathke <[email protected]> Tested-by: Jenkins <[email protected]> Reviewed-by: Tomaž Vajngerl <[email protected]> (cherry picked from commit 3043863d688c5bbd5101ebd5ddd8a9452e05ca50) Reviewed-on: https://gerrit.libreoffice.org/43031 Reviewed-by: Miklos Vajna <[email protected]> diff --git a/svtools/source/contnr/treelistbox.cxx b/svtools/source/contnr/treelistbox.cxx index 3230e19ae405..e308f0708afc 100644 --- a/svtools/source/contnr/treelistbox.cxx +++ b/svtools/source/contnr/treelistbox.cxx @@ -3588,12 +3588,9 @@ void SvTreeListBox::StateChanged( StateChangedType eType ) void SvTreeListBox::ApplySettings(vcl::RenderContext& rRenderContext) { - const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); - vcl::Font aFont; - aFont = rStyleSettings.GetFieldFont(); - aFont.SetColor(rStyleSettings.GetWindowTextColor()); - SetPointFont(rRenderContext, aFont); + SetPointFont(rRenderContext, GetPointFont(*this)); + const StyleSettings& rStyleSettings = rRenderContext.GetSettings().GetStyleSettings(); rRenderContext.SetTextColor(rStyleSettings.GetFieldTextColor()); rRenderContext.SetTextFillColor(); rRenderContext.SetBackground(rStyleSettings.GetFieldColor());
_______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
