diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2022-12-03 20:28:21 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2022-12-03 23:42:22 +0000 |
| commit | c50cf1883af26daebdfc9d796ced3c20c222f43b (patch) | |
| tree | 7265766e288016e11e40a6bdfab28de496754a8b /vcl | |
| parent | 3a9f7d5aa91f2eb5756727639aae2ac84cafe018 (diff) | |
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 <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/inc/sallayout.hxx | 2 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 6 |
2 files changed, 4 insertions, 4 deletions
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(); |