drawinglayer/source/processor2d/vclprocessor2d.cxx | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 41803670f7870cdc21cca1f0bbbdb17dd12c2fda
Author: Mike Kaganski <mike.kagan...@collabora.com>
AuthorDate: Fri Apr 26 01:00:21 2024 +0500
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Sat Oct 26 10:49:32 2024 +0200
tdf#157240: also set font color together with font
Commit b008831a5545e5a777d77547ef96b9798d795f30 (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.kagan...@collabora.com>
(cherry picked from commit 1112a2bea0cb260fd64360b679c3f0f5c495e16e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175486
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
(cherry picked from commit 69d8872fafbc6eab9f895f5c84355fa77e71ca3e)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175612
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx
b/drawinglayer/source/processor2d/vclprocessor2d.cxx
index 45127a454008..e442b2a6f0f8 100644
--- a/drawinglayer/source/processor2d/vclprocessor2d.cxx
+++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx
@@ -328,8 +328,6 @@ void
VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
mpOutputDevice->SetLayoutMode(nRTLLayoutMode);
}
- mpOutputDevice->SetTextColor(Color(aRGBFontColor));
-
OUString aText(rTextCandidate.getText());
sal_Int32 nPos = rTextCandidate.getTextPosition();
sal_Int32 nLen = rTextCandidate.getTextLength();
@@ -443,6 +441,7 @@ void
VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D(
// tdf#152990 set the font after the MapMode is (potentially) set
so canvas uses the desired
// font size
mpOutputDevice->SetFont(aFont);
+ mpOutputDevice->SetTextColor(Color(aRGBFontColor));
if (!aDXArray.empty())
{
