diff options
| author | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-24 17:29:13 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2018-05-25 08:45:24 +0200 |
| commit | 89dc667cebfec5315f0c0361e49d759e88458689 (patch) | |
| tree | affbfc03e045e00bc983b7d4074d9051078876c7 /vcl/source/gdi | |
| parent | 6b1b8ef51b752f9711d6581283d6c515d3c50d9b (diff) | |
tdf#113143 PDF export: fix mis-scaled JPGs on Impress note pages
This is really similar to commit
4c2172a3e973bc6351107a3a1b554c77b40b75dd (tdf#106702 PDF export: fix
missing images from Writer headers/footers, 2018-05-22) just this one is
about the size of the output rectangle for JPG content, while the
previous problem was about the position of them.
Also extract PdfExportTest::exportAndParse() from the last two tests to
avoid duplication.
Change-Id: I9812924d505e9fdaca2a95b4990e7aaa5e44fd7f
Reviewed-on: https://gerrit.libreoffice.org/54773
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'vcl/source/gdi')
| -rw-r--r-- | vcl/source/gdi/pdfextoutdevdata.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/vcl/source/gdi/pdfextoutdevdata.cxx b/vcl/source/gdi/pdfextoutdevdata.cxx index 05bb37a0c6c3..d36ab2844f17 100644 --- a/vcl/source/gdi/pdfextoutdevdata.cxx +++ b/vcl/source/gdi/pdfextoutdevdata.cxx @@ -466,8 +466,9 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc // Look up the output rectangle from the previous // bitmap scale action if possible. This has the - // correct position for images repeated in - // Writer headers/footers for non-first pages. + // correct position and size for images with a + // custom translation (Writer header) or scaling + // (Impress notes page). if (rCurGDIMtfAction > 0) { const MetaAction* pAction = rMtf.GetAction(rCurGDIMtfAction - 1); @@ -476,6 +477,7 @@ bool PageSyncData::PlaySyncPageAct( PDFWriter& rWriter, sal_uInt32& rCurGDIMtfAc const MetaBmpScaleAction* pA = static_cast<const MetaBmpScaleAction*>(pAction); aOutputRect.SetPos(pA->GetPoint()); + aOutputRect.SetSize(pA->GetSize()); } } |