mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

tdf#157240: also set font color together with font

Browse Source 
Commit b008831a55 (tdf#152990 set the font
after the MapMode is (potentially) set, 2023-01-14) had moved setting of
font forward, but left setting the font color behind. This fixed that.

Change-Id: I73fadc7c139da3b6f84b7fc875c585d02fc1c719
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/166654
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
This commit is contained in:
Mike Kaganski
2024-04-26 01:00:21 +05:00
parent e73e117c13
commit 1112a2bea0
1 changed files with 1 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
drawinglayer/source/processor2d/vclprocessor2d.cxx
View File

@@ -326,8 +326,6 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
mpOutputDevice->SetLayoutMode(nRTLLayoutMode); mpOutputDevice->SetLayoutMode(nRTLLayoutMode);
} }
mpOutputDevice->SetTextColor(Color(aRGBFontColor));
OUString aText(rTextCandidate.getText()); OUString aText(rTextCandidate.getText());
sal_Int32 nPos = rTextCandidate.getTextPosition(); sal_Int32 nPos = rTextCandidate.getTextPosition();
sal_Int32 nLen = rTextCandidate.getTextLength(); sal_Int32 nLen = rTextCandidate.getTextLength();
@@ -439,6 +437,7 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
// tdf#152990 set the font after the MapMode is (potentially) set so canvas uses the desired // tdf#152990 set the font after the MapMode is (potentially) set so canvas uses the desired
// font size // font size
mpOutputDevice->SetFont(aFont); mpOutputDevice->SetFont(aFont);
mpOutputDevice->SetTextColor(Color(aRGBFontColor));
if (!aDXArray.empty()) if (!aDXArray.empty())
{ {