[Libreoffice-commits] core.git: vcl/source

[Caolán McNamara (via logerrit)]

 vcl/source/gdi/pdfwriter_impl.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit f83019d9098196e0d7dd1dd4a05cf5137cc1bceb
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 25 20:56:34 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 26 09:36:31 2022 +0200

    aAdjOffset is derived from a DevicePoint, so keep it as a DevicePoint
    
    Change-Id: Id05963df6ab96ecfdc28c4463415e61b796f8fe0
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138852
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/gdi/pdfwriter_impl.cxx 
b/vcl/source/gdi/pdfwriter_impl.cxx
index d862da0f253a..8c41b5d88987 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6544,15 +6544,15 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, 
const OUString& rText, bool
     {
         if (pGlyph->IsSpacing())
         {
-            Point aAdjOffset = aOffset;
-            aAdjOffset.AdjustX((pGlyph->newWidth() - nEmphWidth) / 2 );
+            DevicePoint aAdjOffset(aOffset.X(), aOffset.Y());
+            aAdjOffset.adjustX((pGlyph->newWidth() - nEmphWidth) / 2);
             aAdjOffset = aRotScale.transform( aAdjOffset );
 
-            aAdjOffset -= Point( nEmphWidth2, nEmphHeight2 );
+            aAdjOffset -= DevicePoint(nEmphWidth2, nEmphHeight2);
 
-            Point aMarkPos(aPos.getX(), aPos.getY());
-            aMarkPos += aAdjOffset;
-            aMarkPos = PixelToLogic(aMarkPos);
+            DevicePoint aMarkDevPos(aPos);
+            aMarkDevPos += aAdjOffset;
+            Point aMarkPos = SubPixelToLogic(aMarkDevPos, true);
             drawEmphasisMark( aMarkPos.X(), aMarkPos.Y(),
                               aEmphPoly, bEmphPolyLine,
                               aEmphRect1, aEmphRect2 );