diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2023-01-13 17:00:40 +0000 |
|---|---|---|
| committer | Adolfo Jayme Barrientos <fitojb@ubuntu.com> | 2023-01-14 15:30:24 +0000 |
| commit | d5c8b38eab3d3766f403a33e11dffa498655be8f (patch) | |
| tree | 9172233286fab1a51066ca13b4bd942f514707b0 /drawinglayer/source/processor2d/vclprocessor2d.cxx | |
| parent | 57d1de08dee74b691b8686c8b35f3e61257b8107 (diff) | |
tdf#152990 set the font after the MapMode is (potentially) setco-23.05-branch-point
Change-Id: I64617a5c85e7e6b444aac705ebbfdd777b4ea55a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145442
Tested-by: Jenkins
Reviewed-by: Adolfo Jayme Barrientos <fitojb@ubuntu.com>
Diffstat (limited to 'drawinglayer/source/processor2d/vclprocessor2d.cxx')
| -rw-r--r-- | drawinglayer/source/processor2d/vclprocessor2d.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drawinglayer/source/processor2d/vclprocessor2d.cxx b/drawinglayer/source/processor2d/vclprocessor2d.cxx index bd92921396ae..8bd9abadf15c 100644 --- a/drawinglayer/source/processor2d/vclprocessor2d.cxx +++ b/drawinglayer/source/processor2d/vclprocessor2d.cxx @@ -306,7 +306,6 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( mpOutputDevice->SetLayoutMode(nRTLLayoutMode); } - mpOutputDevice->SetFont(aFont); mpOutputDevice->SetTextColor(Color(aRGBFontColor)); OUString aText(rTextCandidate.getText()); @@ -364,6 +363,10 @@ void VclProcessor2D::RenderTextSimpleOrDecoratedPortionPrimitive2D( mpOutputDevice->SetMapMode(aMapMode); } + // tdf#152990 set the font after the MapMode is (potentially) set so canvas uses the desired + // font size + mpOutputDevice->SetFont(aFont); + if (!aDXArray.empty()) { const SalLayoutGlyphs* pGlyphs = SalLayoutGlyphsCache::self()->GetLayoutGlyphs( |