commit 97ed0bdcb283a3c45d4b155515cd9ef5d97138ab
author Khaled Hosny <khaledhosny@eglug.org> Fri Jan 10 23:12:57 2014 +0200
committer Khaled Hosny <khaledhosny@eglug.org> Sat Jan 18 01:11:09 2014 +0200
tree 982e871e38f6999b4351b2ec1c01a06a6929dee7
parent 5e6d1e3332ea4cd31d2c5e739dc27bb37b34b4dc

Use a more descriptive and distinct field name

It is not immediately clear what maRerun is, besides it can be
confused with regular maRuns.

Change-Id: Idc754a185149a9a4d5e7495b76d8e61f783b42d2

vcl/inc/sallayout.hxx

diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx
index 0473086..b824e74 100644
--- a/vcl/inc/sallayout.hxx
+++ b/vcl/inc/sallayout.hxx
@@ -99,7 +99,7 @@ public:

    // data for bidi and glyph+script fallback
    ImplLayoutRuns      maRuns;
    ImplLayoutRuns      maReruns;
    ImplLayoutRuns      maFallbackRuns;

public:
                ImplLayoutArgs( const sal_Unicode* pStr, int nLength,
@@ -115,12 +115,12 @@ public:
                    { return maRuns.GetNextPos( nCharPos, bRTL ); }
    bool        GetNextRun( int* nMinRunPos, int* nEndRunPos, bool* bRTL );
    bool        NeedFallback( int nCharPos, bool bRTL )
                    { return maReruns.AddPos( nCharPos, bRTL ); }
                    { return maFallbackRuns.AddPos( nCharPos, bRTL ); }
    bool        NeedFallback( int nMinRunPos, int nEndRunPos, bool bRTL )
                    { return maReruns.AddRun( nMinRunPos, nEndRunPos, bRTL ); }
                    { return maFallbackRuns.AddRun( nMinRunPos, nEndRunPos, bRTL ); }
    // methods used by BiDi and glyph fallback
    bool        NeedFallback() const
                    { return !maReruns.IsEmpty(); }
                    { return !maFallbackRuns.IsEmpty(); }
    bool        PrepareFallback();

protected:

vcl/source/gdi/sallayout.cxx

diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx
index 30be7b1..90e6d29 100644
--- a/vcl/source/gdi/sallayout.cxx
+++ b/vcl/source/gdi/sallayout.cxx
@@ -621,7 +621,7 @@ void ImplLayoutArgs::AddRun( int nCharPos0, int nCharPos1, bool bRTL )
bool ImplLayoutArgs::PrepareFallback()
{
    // short circuit if no fallback is needed
    if( maReruns.IsEmpty() )
    if( maFallbackRuns.IsEmpty() )
    {
        maRuns.Clear();
        return false;
@@ -635,11 +635,11 @@ bool ImplLayoutArgs::PrepareFallback()
    typedef std::vector<int> IntVector;
    IntVector aPosVector;
    aPosVector.reserve( mnLength );
    maReruns.ResetPos();
    for(; maReruns.GetRun( &nMin, &nEnd, &bRTL ); maReruns.NextRun() )
    maFallbackRuns.ResetPos();
    for(; maFallbackRuns.GetRun( &nMin, &nEnd, &bRTL ); maFallbackRuns.NextRun() )
        for( int i = nMin; i < nEnd; ++i )
            aPosVector.push_back( i );
    maReruns.Clear();
    maFallbackRuns.Clear();

    // sort the individual fallback requests
    std::sort( aPosVector.begin(), aPosVector.end() );