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

[Caolán McNamara (via logerrit)]

 vcl/inc/sallayout.hxx        |    2 +-
 vcl/source/gdi/sallayout.cxx |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit 9935fdbcb45ef021c4a25aaced19bcefce5301d7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 3 20:35:09 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 4 10:23:51 2022 +0000

    Related: tdf#152196 adjustLinearPosX takes a double
    
    Change-Id: I5e32c82b37af3900642199e0af74bf8b48218c2b
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143623
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 5a3a253b68a9..35496750c286 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -132,7 +132,7 @@ public:
 
 private:
     // for glyph+font+script fallback
-    void            MoveGlyph(int nStart, DeviceCoordinate nNewXPos);
+    void            MoveGlyph(int nStart, double nNewXPos);
     void            DropGlyph(int nStart);
     void            Simplify(bool bIsBase);
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 5f26dc351316..2d5a33237e1b 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -539,7 +539,7 @@ bool GenericSalLayout::GetNextGlyph(const GlyphItem** 
pGlyph,
     return true;
 }
 
-void GenericSalLayout::MoveGlyph( int nStart, DeviceCoordinate nNewXPos )
+void GenericSalLayout::MoveGlyph(int nStart, double nNewXPos)
 {
     if( nStart >= static_cast<int>(m_GlyphItems.size()) )
         return;
commit 815fd0084aaa6b8c536a13a415cb8cdaf6124ba7
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 3 20:30:27 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sun Dec 4 10:23:39 2022 +0000

    Related: tdf#152196 adjustLinearPosX takes a double
    
    Change-Id: I9566904b03b3856dc4092c5d1c15beb35ba7c840
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143622
    Tested-by: Caolán McNamara <caol...@redhat.com>
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index be00aaa51a42..5f26dc351316 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -553,7 +553,7 @@ void GenericSalLayout::MoveGlyph( int nStart, 
DeviceCoordinate nNewXPos )
     if( pGlyphIter->IsRTLGlyph() )
         nNewXPos += pGlyphIter->newWidth() - pGlyphIter->origWidth();
     // calculate the x-offset to the old position
-    DeviceCoordinate nXDelta = nNewXPos - pGlyphIter->linearPos().getX() + 
pGlyphIter->xOffset();
+    double nXDelta = nNewXPos - pGlyphIter->linearPos().getX() + 
pGlyphIter->xOffset();
     // adjust all following glyph positions if needed
     if( nXDelta != 0 )
     {