core.git: Branch 'distro/collabora/co-23.05' - vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit f31f61de291a37b57c23ebdfa6f9c5e78364608d
Author:     Caolán McNamara <caolan.mcnam...@collabora.com>
AuthorDate: Thu Aug 1 09:49:49 2024 +0100
Commit:     Miklos Vajna <vmik...@collabora.com>
CommitDate: Fri Aug 2 15:21:48 2024 +0200

    m_aPixelSize should be in pixels, but GetPrefSize depends on GetPrefMapMode
    
    i.e later we do:
    
    Size aSize = PixelToLogic(rEmit.m_aPixelSize, 
MapMode(m_aMapMode.GetMapUnit()));
    
    and PrefSize is in PrefMapMode units.
    
    Change-Id: I387316804496fc0a05c3370f370f5f562c288d77
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171251
    Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoff...@gmail.com>
    Reviewed-by: Miklos Vajna <vmik...@collabora.com>
    (cherry picked from commit de15d0a566ce72f2d508ceb7b3fbf60d2aa31329)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171405

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index 99b7e768c23e..bca34b3d9fae 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -9669,7 +9669,7 @@ void PDFWriterImpl::createEmbeddedFile(const Graphic& 
rGraphic, ReferenceXObject
     }
 
     rEmit.m_nFormObject = createObject();
-    rEmit.m_aPixelSize = rGraphic.GetPrefSize();
+    rEmit.m_aPixelSize = rGraphic.GetSizePixel();
 }
 
 void PDFWriterImpl::drawJPGBitmap( SvStream& rDCTData, bool bIsTrueColor, 
const Size& rSizePixel, const tools::Rectangle& rTargetArea, const AlphaMask& 
rAlphaMask, const Graphic& rGraphic )