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

[Caolán McNamara (via logerrit)]

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

New commits:
commit c50cf1883af26daebdfc9d796ced3c20c222f43b
Author:     Caolán McNamara <caol...@redhat.com>
AuthorDate: Sat Dec 3 20:28:21 2022 +0000
Commit:     Caolán McNamara <caol...@redhat.com>
CommitDate: Sat Dec 3 23:42:22 2022 +0000

    Related: tdf#152196 these should be at least DeviceCoordinate
    
    Change-Id: I50404aaf522d5361fb2110258020564cb888f44d
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143621
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caol...@redhat.com>

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 54b486b36afd..5a3a253b68a9 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, tools::Long nNewXPos);
+    void            MoveGlyph(int nStart, DeviceCoordinate nNewXPos);
     void            DropGlyph(int nStart);
     void            Simplify(bool bIsBase);
 
diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 521cbb3d6007..be00aaa51a42 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, tools::Long nNewXPos )
+void GenericSalLayout::MoveGlyph( int nStart, DeviceCoordinate nNewXPos )
 {
     if( nStart >= static_cast<int>(m_GlyphItems.size()) )
         return;
@@ -553,7 +553,7 @@ void GenericSalLayout::MoveGlyph( int nStart, tools::Long 
nNewXPos )
     if( pGlyphIter->IsRTLGlyph() )
         nNewXPos += pGlyphIter->newWidth() - pGlyphIter->origWidth();
     // calculate the x-offset to the old position
-    tools::Long nXDelta = nNewXPos - pGlyphIter->linearPos().getX() + 
pGlyphIter->xOffset();
+    DeviceCoordinate nXDelta = nNewXPos - pGlyphIter->linearPos().getX() + 
pGlyphIter->xOffset();
     // adjust all following glyph positions if needed
     if( nXDelta != 0 )
     {
@@ -771,7 +771,7 @@ void 
MultiSalLayout::ImplAdjustMultiLayout(vcl::text::ImplLayoutArgs& rArgs,
     mnLevel = nLevel;
 
     // prepare merge the fallback levels
-    tools::Long nXPos = 0;
+    DeviceCoordinate nXPos = 0;
     for( n = 0; n < nLevel; ++n )
         maFallbackRuns[n].ResetPos();