core.git: Branch 'libreoffice-24-2' - vcl/source

[Khaled Hosny (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

New commits:
commit af319f4122aab98d44e88e8d582c109096c57049
Author:     Khaled Hosny <kha...@libreoffice.org>
AuthorDate: Sat May 18 17:23:19 2024 +0300
Commit:     Xisco Fauli <xiscofa...@libreoffice.org>
CommitDate: Mon May 20 10:45:50 2024 +0200

    tdf#160884: Apply scale to position of embedded images in Type 3 fonts
    
    Regression from:
    
    commit bc3f6c3a47411a3b5dafadca4e5c55cd24e30662
    Author: Khaled Hosny <kha...@libreoffice.org>
    Date:   Tue Aug 22 10:47:33 2023 +0300
    
        tdf#155610: Workaround Acrobat bug with Type 3 fonts and unusual UPEM
    
    Change-Id: I5e352292268d19fb8348a038d251f2d395a0be46
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167830
    Reviewed-by: Stéphane Guillou <stephane.guil...@libreoffice.org>
    Reviewed-by: خالد حسني <kha...@libreoffice.org>
    Tested-by: Jenkins
    (cherry picked from commit 44f2bc12779645bce1000289caf9c66804ecb14e)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167815
    Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index ff7383d7be99..16b0b5e23501 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -2746,15 +2746,11 @@ bool PDFWriterImpl::emitType3Font(const 
vcl::font::PhysicalFontFace* pFace,
                 appendDouble(aRect.GetWidth() * fScale, aContents);
                 aContents.append(" 0 0 ");
                 appendDouble(aRect.GetHeight() * fScale, aContents);
-                aContents.append(
-                    + " "
-                    + OString::number(aRect.getX())
-                    + " "
-                    + OString::number(aRect.getY())
-                    + " cm "
-                      "/Im"
-                    + OString::number(nObject)
-                    + " Do Q
");
+                aContents.append(" ");
+                appendDouble(aRect.getX() * fScale, aContents);
+                aContents.append(" ");
+                appendDouble(aRect.getY() * fScale, aContents);
+                aContents.append(" cm /Im" + OString::number(nObject) + " Do Q
");
             }
 
             const auto& rOutline = rGlyph.getOutline();