commit a39f2e1943c7092dd32bd1f4e480ee6da54a80e4
author Alexander Farrow <alexanderfarrow@tutanota.com> Mon Apr 08 18:54:20 2019 +0100
committer Noel Grandin <noel.grandin@collabora.co.uk> Tue Apr 09 09:10:22 2019 +0200
tree 8cd8d732d8642a31357785d26ea8887b12a1f945
parent 30a9bfec76c807d203b39bfcdeed1cb0c3118719

tdf#103322 GlyphItem::m_aLinearPos use getX() instead of X()

GlyphItem::m_aLinearPos is a tools::Point variable.
Eventually it will be changed to a basegfx::B2DPoint variable - to add support
for sub pixel glyph positioning.

basegfx::B2DPoint has the getX() method to retrieve a point's X coordinate.

tools::Point has two methods to retrieve a point's X coordinate:
1. X()
2. getX()
Both of these methods return the same value because getX() just calls X().
So any call to X() can replaced by getX() and vice versa.

By replacing calls to X() with getX() now we won't have to make these changes
later when we swap from tools::Point to basegfx::B2DPoint.

Change-Id: Idfa0584cb3a7ce246b5499814b7e29f86167d8b8
Reviewed-on: https://gerrit.libreoffice.org/70436
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

vcl/source/gdi/CommonSalLayout.cxx

diff --git a/vcl/source/gdi/CommonSalLayout.cxx b/vcl/source/gdi/CommonSalLayout.cxx
index 6187ec6f..8726032 100644
--- a/vcl/source/gdi/CommonSalLayout.cxx
+++ b/vcl/source/gdi/CommonSalLayout.cxx
@@ -767,7 +767,7 @@
                    nOverlap = nExcess / (nCopies - 1);
            }

            Point aPos(pGlyphIter->m_aLinearPos.X() - nTotalWidth, 0);
            Point aPos(pGlyphIter->m_aLinearPos.getX() - nTotalWidth, 0);
            int nCharPos = pGlyphIter->m_nCharPos;
            int const nFlags = GlyphItem::IS_IN_CLUSTER | GlyphItem::IS_RTL_GLYPH;
            while (nCopies--)

vcl/source/gdi/sallayout.cxx

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 9b66567..fc0a765 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -712,7 +712,7 @@
    for (auto const& aGlyphItem : *m_GlyphItems.Impl())
    {
        // update the text extent with the glyph extent
        DeviceCoordinate nXPos = aGlyphItem.m_aLinearPos.X();
        DeviceCoordinate nXPos = aGlyphItem.m_aLinearPos.getX();
        if( nMinPos > nXPos )
            nMinPos = nXPos;
        nXPos += aGlyphItem.m_nNewWidth - aGlyphItem.m_nXOffset;
@@ -789,14 +789,14 @@
        {
            for( pGlyphIter = m_GlyphItems.Impl()->begin(); ++pGlyphIter != pGlyphIterRight;)
            {
                int nX = pGlyphIter->m_aLinearPos.X();
                int nX = pGlyphIter->m_aLinearPos.getX();
                nX = static_cast<int>(nX * fSqueeze);
                pGlyphIter->m_aLinearPos.setX( nX );
            }
        }
        // adjust glyph widths to new positions
        for( pGlyphIter = m_GlyphItems.Impl()->begin(); pGlyphIter != pGlyphIterRight; ++pGlyphIter )
            pGlyphIter->m_nNewWidth = pGlyphIter[1].m_aLinearPos.X() - pGlyphIter[0].m_aLinearPos.X();
            pGlyphIter->m_nNewWidth = pGlyphIter[1].m_aLinearPos.getX() - pGlyphIter[0].m_aLinearPos.getX();
    }
}

@@ -850,7 +850,7 @@
    // calculate caret positions using glyph array
    for (auto const& aGlyphItem : *m_GlyphItems.Impl())
    {
        long nXPos = aGlyphItem.m_aLinearPos.X();
        long nXPos = aGlyphItem.m_aLinearPos.getX();
        long nXRight = nXPos + aGlyphItem.m_nOrigWidth;
        int n = aGlyphItem.m_nCharPos;
        int nCurrIdx = 2 * (n - mnMinCharPos);
@@ -943,7 +943,7 @@
    if( pGlyphIter->IsRTLGlyph() )
        nNewXPos += pGlyphIter->m_nNewWidth - pGlyphIter->m_nOrigWidth;
    // calculate the x-offset to the old position
    long nXDelta = nNewXPos - pGlyphIter->m_aLinearPos.X();
    long nXDelta = nNewXPos - pGlyphIter->m_aLinearPos.getX();
    // adjust all following glyph positions if needed
    if( nXDelta != 0 )
    {