[Libreoffice-commits] core.git: sw/source

[Michael Stahl]

 sw/source/core/text/redlnitr.cxx |   36 ++++++++++++++++++------------------
 sw/source/core/text/redlnitr.hxx |   30 +++++++++++++++++-------------
 2 files changed, 35 insertions(+), 31 deletions(-)

New commits:
commit 55ad38a42077f35910c84c8b3e33fe46c33369a4
Author: Michael Stahl <Michael.Stahl at cib.de>
Date:   Thu Apr 26 15:37:23 2018 +0200

    SwExtend: prefix members
    
    Change-Id: Ia1b539a9017b1b9f5be09d367bc77eeb08bcd619
    Reviewed-on: https://gerrit.libreoffice.org/54118
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 08c8fcd2e0cc..acd4584054b2 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -418,12 +418,12 @@ void SwExtend::ActualizeFont( SwFont &rFnt, ExtTextInputAttr nAttr )
 short SwExtend::Enter(SwFont& rFnt, sal_Int32 nNew)
 {
     OSL_ENSURE( !Inside(), "SwExtend: Enter without Leave" );
-    OSL_ENSURE( !pFnt, "SwExtend: Enter with Font" );
-    nPos = nNew;
+    OSL_ENSURE( !m_pFont, "SwExtend: Enter with Font" );
+    m_nPos = nNew;
     if( Inside() )
     {
-        pFnt.reset( new SwFont( rFnt ) );
-        ActualizeFont( rFnt, rArr[ nPos - nStart ] );
+        m_pFont.reset( new SwFont(rFnt) );
+        ActualizeFont( rFnt, m_rArr[m_nPos - m_nStart] );
         return 1;
     }
     return 0;
@@ -432,21 +432,21 @@ short SwExtend::Enter(SwFont& rFnt, sal_Int32 nNew)
 bool SwExtend::Leave_(SwFont& rFnt, sal_Int32 nNew)
 {
     OSL_ENSURE( Inside(), "SwExtend: Leave without Enter" );
-    const ExtTextInputAttr nOldAttr = rArr[ nPos - nStart ];
-    nPos = nNew;
+    const ExtTextInputAttr nOldAttr = m_rArr[m_nPos - m_nStart];
+    m_nPos = nNew;
     if( Inside() )
     {   // We stayed within the ExtendText-section
-        const ExtTextInputAttr nAttr = rArr[ nPos - nStart ];
+        const ExtTextInputAttr nAttr = m_rArr[m_nPos - m_nStart];
         if( nOldAttr != nAttr ) // Is there an (inner) change of attributes?
         {
-            rFnt = *pFnt;
+            rFnt = *m_pFont;
             ActualizeFont( rFnt, nAttr );
         }
     }
     else
     {
-        rFnt = *pFnt;
-        pFnt.reset();
+        rFnt = *m_pFont;
+        m_pFont.reset();
         return true;
     }
     return false;
@@ -454,18 +454,18 @@ bool SwExtend::Leave_(SwFont& rFnt, sal_Int32 nNew)
 
 sal_Int32 SwExtend::Next( sal_Int32 nNext )
 {
-    if( nPos < nStart )
+    if (m_nPos < m_nStart)
     {
-        if( nNext > nStart )
-            nNext = nStart;
+        if (nNext > m_nStart)
+            nNext = m_nStart;
     }
-    else if( nPos < nEnd )
+    else if (m_nPos < m_nEnd)
     {
-        sal_Int32 nIdx = nPos - nStart;
-        const ExtTextInputAttr nAttr = rArr[ nIdx ];
-        while( static_cast<size_t>(++nIdx) < rArr.size() && nAttr == rArr[ nIdx ] )
+        sal_Int32 nIdx = m_nPos - m_nStart;
+        const ExtTextInputAttr nAttr = m_rArr[ nIdx ];
+        while (static_cast<size_t>(++nIdx) < m_rArr.size() && nAttr == m_rArr[nIdx])
             ; //nothing
-        nIdx = nIdx + nStart;
+        nIdx = nIdx + m_nStart;
         if( nNext > nIdx )
             nNext = nIdx;
     }
diff --git a/sw/source/core/text/redlnitr.hxx b/sw/source/core/text/redlnitr.hxx
index 1e7258228390..879a9e952d67 100644
--- a/sw/source/core/text/redlnitr.hxx
+++ b/sw/source/core/text/redlnitr.hxx
@@ -36,25 +36,29 @@ class SwAttrHandler;
 
 class SwExtend
 {
-    std::unique_ptr<SwFont> pFnt;
-    const std::vector<ExtTextInputAttr> ⇒
-    sal_Int32 nStart;
-    sal_Int32 nPos;
-    sal_Int32 nEnd;
+    std::unique_ptr<SwFont> m_pFont;
+    const std::vector<ExtTextInputAttr> &m_rArr;
+    sal_Int32 m_nStart;
+    sal_Int32 m_nPos;
+    sal_Int32 m_nEnd;
     bool Leave_( SwFont& rFnt, sal_Int32 nNew );
-    bool Inside() const { return ( nPos >= nStart && nPos < nEnd ); }
+    bool Inside() const { return (m_nPos >= m_nStart && m_nPos < m_nEnd); }
     static void ActualizeFont( SwFont &rFnt, ExtTextInputAttr nAttr );
 public:
-    SwExtend( const std::vector<ExtTextInputAttr> &rA, sal_Int32 nSt ) : rArr( rA ),
-        nStart( nSt ), nPos( COMPLETE_STRING ), nEnd( nStart + rA.size() ) {}
-    bool IsOn() const { return pFnt != nullptr; }
-    void Reset() { pFnt.reset(); nPos = COMPLETE_STRING; }
+    SwExtend(const std::vector<ExtTextInputAttr> &rArr, sal_Int32 const nStart)
+        : m_rArr(rArr)
+        , m_nStart(nStart)
+        , m_nPos(COMPLETE_STRING)
+        , m_nEnd(m_nStart + rArr.size())
+    {}
+    bool IsOn() const { return m_pFont != nullptr; }
+    void Reset() { m_pFont.reset(); m_nPos = COMPLETE_STRING; }
     bool Leave( SwFont& rFnt, sal_Int32 nNew )
-        { return pFnt && Leave_( rFnt, nNew ); }
+        { return m_pFont && Leave_( rFnt, nNew ); }
     short Enter( SwFont& rFnt, sal_Int32 nNew );
     sal_Int32 Next( sal_Int32 nNext );
-    SwFont* GetFont()  { return pFnt.get(); }
-    void UpdateFont( SwFont &rFnt ) { ActualizeFont( rFnt, rArr[ nPos - nStart ] ); }
+    SwFont* GetFont() { return m_pFont.get(); }
+    void UpdateFont(SwFont &rFont) { ActualizeFont(rFont, m_rArr[m_nPos - m_nStart]); }
 };
 
 class SwRedlineItr