commit 9935fdbcb45ef021c4a25aaced19bcefce5301d7
author Caolán McNamara <caolanm@redhat.com> Sat Dec 03 20:35:09 2022 +0000
committer Caolán McNamara <caolanm@redhat.com> Sun Dec 04 10:23:51 2022 +0000
tree a8e9cc14cc8d6a780283b76f9861111ea3b320c9
parent 815fd0084aaa6b8c536a13a415cb8cdaf6124ba7

Related: tdf#152196 adjustLinearPosX takes a double

Change-Id: I5e32c82b37af3900642199e0af74bf8b48218c2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/143623
Tested-by: Caolán McNamara <caolanm@redhat.com>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>

vcl/inc/sallayout.hxx

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 5a3a253..3549675 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);

vcl/source/gdi/sallayout.cxx

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 5f26dc3..2d5a332 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;