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

[Caolán McNamara (via logerrit)]

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

New commits:
commit 6895bd63359f9d3ff7de0eea985c8171aef245f9
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Thu Aug 25 20:50:42 2022 +0100
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Fri Aug 26 00:37:42 2022 +0200

    aStartPt is derived from a DevicePoint, so keep it as a DevicePoint
    
    Change-Id: I85f4275593fe491bf5ba06d334312881367ceacf
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/138851
    Tested-by: Jenkins
    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 617871036117..d862da0f253a 100644
--- a/vcl/source/gdi/pdfwriter_impl.cxx
+++ b/vcl/source/gdi/pdfwriter_impl.cxx
@@ -6442,7 +6442,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const 
OUString& rText, bool
         bool bUnderlineAbove = m_aCurrentPDFState.m_aFont.IsUnderlineAbove();
         if( m_aCurrentPDFState.m_aFont.IsWordLineMode() )
         {
-            Point aStartPt;
+            DevicePoint aStartPt;
             DeviceCoordinate nWidth = 0;
             nIndex = 0;
             while (rLayout.GetNextGlyph(&pGlyph, aPos, nIndex))
@@ -6450,13 +6450,13 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, 
const OUString& rText, bool
                 if (!pGlyph->IsSpacing())
                 {
                     if( !nWidth )
-                        aStartPt = Point(aPos.getX(), aPos.getY());
+                        aStartPt = aPos;
 
                     nWidth += pGlyph->newWidth();
                 }
                 else if( nWidth > 0 )
                 {
-                    drawTextLine( PixelToLogic( aStartPt ),
+                    drawTextLine( SubPixelToLogic(aStartPt, true),
                                   ImplDevicePixelToLogicWidth( nWidth ),
                                   eStrikeout, eUnderline, eOverline, 
bUnderlineAbove );
                     nWidth = 0;
@@ -6465,7 +6465,7 @@ void PDFWriterImpl::drawLayout( SalLayout& rLayout, const 
OUString& rText, bool
 
             if( nWidth > 0 )
             {
-                drawTextLine( PixelToLogic( aStartPt ),
+                drawTextLine( SubPixelToLogic(aStartPt, true),
                               ImplDevicePixelToLogicWidth( nWidth ),
                               eStrikeout, eUnderline, eOverline, 
bUnderlineAbove );
             }