diff options
| -rw-r--r-- | vcl/inc/sallayout.hxx | 8 | ||||
| -rw-r--r-- | vcl/source/gdi/sallayout.cxx | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/vcl/inc/sallayout.hxx b/vcl/inc/sallayout.hxx index 047308632e97..b824e74d627f 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: diff --git a/vcl/source/gdi/sallayout.cxx b/vcl/source/gdi/sallayout.cxx index 30be7b152ed2..90e6d2996c85 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() ); |