sw: prefix members of CompareNodeContent, SwDDEFieldType, ...

... SwDropDownField and SwRangeRedline

See tdf#94879 for motivation.

Change-Id: Ic38825413d5725a143a2a7f81f0d464984e231e6
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/97360
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

7 files changed, 105 insertions, 105 deletions

diff --git a/sw/inc/ddefld.hxx b/sw/inc/ddefld.hxx
index 03f3ab74d11d..3e7d91479b56 100644
--- a/sw/inc/ddefld.hxx
+++ b/sw/inc/ddefld.hxx
@@ -50,15 +50,15 @@ namespace sw
 // FieldType for DDE
 class SW_DLLPUBLIC SwDDEFieldType final : public SwFieldType
 {
-    OUString aName;
-    OUString aExpansion;
+    OUString m_aName;
+    OUString m_aExpansion;
 
-    tools::SvRef<sfx2::SvBaseLink> refLink;
-    SwDoc* pDoc;
+    tools::SvRef<sfx2::SvBaseLink> m_RefLink;
+    SwDoc* m_pDoc;
 
-    sal_uInt16 nRefCnt;
-    bool bCRLFFlag : 1;
-    bool bDeleted : 1;
+    sal_uInt16 m_nRefCount;
+    bool m_bCRLFFlag : 1;
+    bool m_bDeleted : 1;
 
     SAL_DLLPRIVATE void RefCntChgd();
 
@@ -67,9 +67,9 @@ public:
                     SfxLinkUpdateMode );
     virtual ~SwDDEFieldType() override;
 
-    const OUString& GetExpansion() const               { return aExpansion; }
-    void SetExpansion( const OUString& rStr )   { aExpansion = rStr;
-                                                  bCRLFFlag = false; }
+    const OUString& GetExpansion() const               { return m_aExpansion; }
+    void SetExpansion( const OUString& rStr )   { m_aExpansion = rStr;
+                                                  m_bCRLFFlag = false; }
 
     virtual std::unique_ptr<SwFieldType> Copy() const override;
     virtual OUString GetName() const override;
@@ -80,25 +80,25 @@ public:
     OUString const & GetCmd() const;
     void SetCmd( const OUString& aStr );
 
-    SfxLinkUpdateMode GetType() const          { return refLink->GetUpdateMode();  }
-    void SetType( SfxLinkUpdateMode nType )    { refLink->SetUpdateMode( nType );  }
+    SfxLinkUpdateMode GetType() const          { return m_RefLink->GetUpdateMode();  }
+    void SetType( SfxLinkUpdateMode nType )    { m_RefLink->SetUpdateMode( nType );  }
 
-    bool IsDeleted() const          { return bDeleted; }
-    void SetDeleted( bool b )       { bDeleted = b; }
+    bool IsDeleted() const          { return m_bDeleted; }
+    void SetDeleted( bool b )       { m_bDeleted = b; }
 
-    void Disconnect()               { refLink->Disconnect(); }
+    void Disconnect()               { m_RefLink->Disconnect(); }
 
-    const ::sfx2::SvBaseLink& GetBaseLink() const    { return *refLink; }
-          ::sfx2::SvBaseLink& GetBaseLink()          { return *refLink; }
+    const ::sfx2::SvBaseLink& GetBaseLink() const    { return *m_RefLink; }
+          ::sfx2::SvBaseLink& GetBaseLink()          { return *m_RefLink; }
 
-    const SwDoc* GetDoc() const     { return pDoc; }
-          SwDoc* GetDoc()           { return pDoc; }
+    const SwDoc* GetDoc() const     { return m_pDoc; }
+          SwDoc* GetDoc()           { return m_pDoc; }
     void SetDoc( SwDoc* pDoc );
 
-    void IncRefCnt() {  if( !nRefCnt++ && pDoc ) RefCntChgd(); }
-    void DecRefCnt() {  if( !--nRefCnt && pDoc ) RefCntChgd(); }
+    void IncRefCnt() {  if( !m_nRefCount++ && m_pDoc ) RefCntChgd(); }
+    void DecRefCnt() {  if( !--m_nRefCount && m_pDoc ) RefCntChgd(); }
 
-    void SetCRLFDelFlag( bool bFlag )    { bCRLFFlag = bFlag; }
+    void SetCRLFDelFlag( bool bFlag )    { m_bCRLFFlag = bFlag; }
 };
 
 // DDE-field
diff --git a/sw/inc/flddropdown.hxx b/sw/inc/flddropdown.hxx
index 20ed29ac638f..a2501aff85e4 100644
--- a/sw/inc/flddropdown.hxx
+++ b/sw/inc/flddropdown.hxx
@@ -60,27 +60,27 @@ class SW_DLLPUBLIC SwDropDownField final : public SwField
     /**
        the possible values (aka items) of the dropdown box
     */
-    std::vector<OUString> aValues;
+    std::vector<OUString> m_aValues;
 
     /**
       the selected item
     */
-    OUString aSelectedItem;
+    OUString m_aSelectedItem;
 
     /**
       the name of the field
     */
-    OUString aName;
+    OUString m_aName;
 
     /**
        help text
      */
-    OUString aHelp;
+    OUString m_aHelp;
 
     /**
        tool tip string
      */
-    OUString aToolTip;
+    OUString m_aToolTip;
 
     /**
        Expands the field.
@@ -181,28 +181,28 @@ public:
 
        @return the selected item
     */
-    const OUString& GetSelectedItem() const { return aSelectedItem;}
+    const OUString& GetSelectedItem() const { return m_aSelectedItem;}
 
     /**
        Returns the name of the field.
 
        @return the name of the field
     */
-    const OUString& GetName() const { return aName;}
+    const OUString& GetName() const { return m_aName;}
 
     /**
        Returns the help text of the field.
 
        @return the help text of the field
     */
-    const OUString& GetHelp() const { return aHelp;}
+    const OUString& GetHelp() const { return m_aHelp;}
 
     /**
        Returns the tool tip of the field.
 
        @return the tool tip of the field
      */
-    const OUString& GetToolTip() const { return aToolTip;}
+    const OUString& GetToolTip() const { return m_aToolTip;}
 
     /**
        Sets the selected item.
diff --git a/sw/inc/redline.hxx b/sw/inc/redline.hxx
index e00c769fd118..b3193395ebd9 100644
--- a/sw/inc/redline.hxx
+++ b/sw/inc/redline.hxx
@@ -166,7 +166,7 @@ class SW_DLLPUBLIC SwRangeRedline : public SwPaM
     void MoveFromSection(size_t nMyPos);
 
 public:
-    static sal_uInt32 m_nLastId;
+    static sal_uInt32 s_nLastId;
 
     SwRangeRedline( RedlineType eType, const SwPaM& rPam );
     SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam );
@@ -175,7 +175,7 @@ public:
     SwRangeRedline(SwRedlineData* pData, const SwPosition& rPos,
                bool bDelLP) :
         SwPaM( rPos ), m_pRedlineData( pData ), m_pContentSect( nullptr ),
-        m_bDelLastPara( bDelLP ), m_bIsVisible( true ), m_nId( m_nLastId++ )
+        m_bDelLastPara( bDelLP ), m_bIsVisible( true ), m_nId( s_nLastId++ )
     {}
     SwRangeRedline( const SwRangeRedline& );
     virtual ~SwRangeRedline() override;
diff --git a/sw/source/core/doc/docredln.cxx b/sw/source/core/doc/docredln.cxx
index 4a8b9791b97d..585a6600acc0 100644
--- a/sw/source/core/doc/docredln.cxx
+++ b/sw/source/core/doc/docredln.cxx
@@ -974,13 +974,13 @@ OUString SwRedlineData::GetDescr() const
     return SwResId(STR_REDLINE_ARY[static_cast<int>(GetType())]);
 }
 
-sal_uInt32 SwRangeRedline::m_nLastId = 1;
+sal_uInt32 SwRangeRedline::s_nLastId = 1;
 
 SwRangeRedline::SwRangeRedline(RedlineType eTyp, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     m_pRedlineData( new SwRedlineData( eTyp, GetDoc()->getIDocumentRedlineAccess().GetRedlineAuthor() ) ),
     m_pContentSect( nullptr ),
-    m_nId( m_nLastId++ )
+    m_nId( s_nLastId++ )
 {
     m_bDelLastPara = false;
     m_bIsVisible = true;
@@ -992,7 +992,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPaM& rPam )
     : SwPaM( *rPam.GetMark(), *rPam.GetPoint() ),
     m_pRedlineData( new SwRedlineData( rData )),
     m_pContentSect( nullptr ),
-    m_nId( m_nLastId++ )
+    m_nId( s_nLastId++ )
 {
     m_bDelLastPara = false;
     m_bIsVisible = true;
@@ -1004,7 +1004,7 @@ SwRangeRedline::SwRangeRedline( const SwRedlineData& rData, const SwPosition& rP
     : SwPaM( rPos ),
     m_pRedlineData( new SwRedlineData( rData )),
     m_pContentSect( nullptr ),
-    m_nId( m_nLastId++ )
+    m_nId( s_nLastId++ )
 {
     m_bDelLastPara = false;
     m_bIsVisible = true;
@@ -1014,7 +1014,7 @@ SwRangeRedline::SwRangeRedline( const SwRangeRedline& rCpy )
     : SwPaM( *rCpy.GetMark(), *rCpy.GetPoint() ),
     m_pRedlineData( new SwRedlineData( *rCpy.m_pRedlineData )),
     m_pContentSect( nullptr ),
-    m_nId( m_nLastId++ )
+    m_nId( s_nLastId++ )
 {
     m_bDelLastPara = false;
     m_bIsVisible = true;
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 0604c83930fd..96c8f3d4bf7d 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -199,28 +199,28 @@ namespace {
 /// Travel between table of content Marks
 class CompareNodeContent
 {
-    sal_uLong nNode;
-    sal_Int32 nContent;
+    sal_uLong m_nNode;
+    sal_Int32 m_nContent;
 public:
     CompareNodeContent( sal_uLong nNd, sal_Int32 nCnt )
-        : nNode( nNd ), nContent( nCnt ) {}
+        : m_nNode( nNd ), m_nContent( nCnt ) {}
 
     bool operator==( const CompareNodeContent& rCmp ) const
-        { return nNode == rCmp.nNode && nContent == rCmp.nContent; }
+        { return m_nNode == rCmp.m_nNode && m_nContent == rCmp.m_nContent; }
     bool operator!=( const CompareNodeContent& rCmp ) const
-        { return nNode != rCmp.nNode || nContent != rCmp.nContent; }
+        { return m_nNode != rCmp.m_nNode || m_nContent != rCmp.m_nContent; }
     bool operator< ( const CompareNodeContent& rCmp ) const
-        { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nContent < rCmp.nContent); }
+        { return m_nNode < rCmp.m_nNode ||
+            ( m_nNode == rCmp.m_nNode && m_nContent < rCmp.m_nContent); }
     bool operator<=( const CompareNodeContent& rCmp ) const
-        { return nNode < rCmp.nNode ||
-            ( nNode == rCmp.nNode && nContent <= rCmp.nContent); }
+        { return m_nNode < rCmp.m_nNode ||
+            ( m_nNode == rCmp.m_nNode && m_nContent <= rCmp.m_nContent); }
     bool operator> ( const CompareNodeContent& rCmp ) const
-        { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nContent > rCmp.nContent); }
+        { return m_nNode > rCmp.m_nNode ||
+            ( m_nNode == rCmp.m_nNode && m_nContent > rCmp.m_nContent); }
     bool operator>=( const CompareNodeContent& rCmp ) const
-        { return nNode > rCmp.nNode ||
-            ( nNode == rCmp.nNode && nContent >= rCmp.nContent); }
+        { return m_nNode > rCmp.m_nNode ||
+            ( m_nNode == rCmp.m_nNode && m_nContent >= rCmp.m_nContent); }
 };
 
 }
diff --git a/sw/source/core/fields/ddefld.cxx b/sw/source/core/fields/ddefld.cxx
index f03bf02575ce..9402db0bf65c 100644
--- a/sw/source/core/fields/ddefld.cxx
+++ b/sw/source/core/fields/ddefld.cxx
@@ -188,33 +188,33 @@ bool SwIntrnlRefLink::IsInRange( sal_uLong nSttNd, sal_uLong nEndNd ) const
 SwDDEFieldType::SwDDEFieldType(const OUString& rName,
                                const OUString& rCmd, SfxLinkUpdateMode nUpdateType )
     : SwFieldType( SwFieldIds::Dde ),
-    aName( rName ), pDoc( nullptr ), nRefCnt( 0 )
+    m_aName( rName ), m_pDoc( nullptr ), m_nRefCount( 0 )
 {
-    bCRLFFlag = bDeleted = false;
-    refLink = new SwIntrnlRefLink( *this, nUpdateType );
+    m_bCRLFFlag = m_bDeleted = false;
+    m_RefLink = new SwIntrnlRefLink( *this, nUpdateType );
     SetCmd( rCmd );
 }
 
 SwDDEFieldType::~SwDDEFieldType()
 {
-    if( pDoc && !pDoc->IsInDtor() )
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
-    refLink->Disconnect();
+    if( m_pDoc && !m_pDoc->IsInDtor() )
+        m_pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
+    m_RefLink->Disconnect();
 }
 
 std::unique_ptr<SwFieldType> SwDDEFieldType::Copy() const
 {
-    std::unique_ptr<SwDDEFieldType> pType(new SwDDEFieldType( aName, GetCmd(), GetType() ));
-    pType->aExpansion = aExpansion;
-    pType->bCRLFFlag = bCRLFFlag;
-    pType->bDeleted = bDeleted;
-    pType->SetDoc( pDoc );
+    std::unique_ptr<SwDDEFieldType> pType(new SwDDEFieldType( m_aName, GetCmd(), GetType() ));
+    pType->m_aExpansion = m_aExpansion;
+    pType->m_bCRLFFlag = m_bCRLFFlag;
+    pType->m_bDeleted = m_bDeleted;
+    pType->SetDoc( m_pDoc );
     return pType;
 }
 
 OUString SwDDEFieldType::GetName() const
 {
-    return aName;
+    return m_aName;
 }
 
 void SwDDEFieldType::SetCmd( const OUString& _aStr )
@@ -225,46 +225,46 @@ void SwDDEFieldType::SetCmd( const OUString& _aStr )
     {
         aStr = aStr.replaceFirst("  ", " ", &nIndex);
     } while (nIndex>=0);
-    refLink->SetLinkSourceName( aStr );
+    m_RefLink->SetLinkSourceName( aStr );
 }
 
 OUString const & SwDDEFieldType::GetCmd() const
 {
-    return refLink->GetLinkSourceName();
+    return m_RefLink->GetLinkSourceName();
 }
 
 void SwDDEFieldType::SetDoc( SwDoc* pNewDoc )
 {
-    if( pNewDoc == pDoc )
+    if( pNewDoc == m_pDoc )
         return;
 
-    if( pDoc && refLink.is() )
+    if( m_pDoc && m_RefLink.is() )
     {
-        OSL_ENSURE( !nRefCnt, "How do we get the references?" );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
+        OSL_ENSURE( !m_nRefCount, "How do we get the references?" );
+        m_pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
     }
 
-    pDoc = pNewDoc;
-    if( pDoc && nRefCnt )
+    m_pDoc = pNewDoc;
+    if( m_pDoc && m_nRefCount )
     {
-        refLink->SetVisible( pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink.get() );
+        m_RefLink->SetVisible( m_pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
+        m_pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( m_RefLink.get() );
     }
 }
 
 void SwDDEFieldType::RefCntChgd()
 {
-    if( nRefCnt )
+    if( m_nRefCount )
     {
-        refLink->SetVisible( pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( refLink.get() );
-        if( pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
-            refLink->Update();
+        m_RefLink->SetVisible( m_pDoc->getIDocumentLinksAdministration().IsVisibleLinks() );
+        m_pDoc->getIDocumentLinksAdministration().GetLinkManager().InsertDDELink( m_RefLink.get() );
+        if( m_pDoc->getIDocumentLayoutAccess().GetCurrentViewShell() )
+            m_RefLink->Update();
     }
     else
     {
         Disconnect();
-        pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( refLink.get() );
+        m_pDoc->getIDocumentLinksAdministration().GetLinkManager().Remove( m_RefLink.get() );
     }
 }
 
@@ -280,7 +280,7 @@ void SwDDEFieldType::QueryValue( uno::Any& rVal, sal_uInt16 nWhichId ) const
         rVal <<= GetType() == SfxLinkUpdateMode::ALWAYS;
         break;
     case FIELD_PROP_PAR5:
-        rVal <<= aExpansion;
+        rVal <<= m_aExpansion;
         break;
     default:
         assert(false);
@@ -303,7 +303,7 @@ void SwDDEFieldType::PutValue( const uno::Any& rVal, sal_uInt16 nWhichId )
                  SfxLinkUpdateMode::ONCALL );
         break;
     case FIELD_PROP_PAR5:
-        rVal >>= aExpansion;
+        rVal >>= m_aExpansion;
         break;
     default:
         assert(false);
diff --git a/sw/source/core/fields/flddropdown.cxx b/sw/source/core/fields/flddropdown.cxx
index 25c31230af47..2f98d2df53ab 100644
--- a/sw/source/core/fields/flddropdown.cxx
+++ b/sw/source/core/fields/flddropdown.cxx
@@ -51,8 +51,8 @@ SwDropDownField::SwDropDownField(SwFieldType * pTyp)
 
 SwDropDownField::SwDropDownField(const SwDropDownField & rSrc)
     : SwField(rSrc.GetTyp(), rSrc.GetFormat(), rSrc.GetLanguage()),
-      aValues(rSrc.aValues), aSelectedItem(rSrc.aSelectedItem),
-      aName(rSrc.aName), aHelp(rSrc.aHelp), aToolTip(rSrc.aToolTip)
+      m_aValues(rSrc.m_aValues), m_aSelectedItem(rSrc.m_aSelectedItem),
+      m_aName(rSrc.m_aName), m_aHelp(rSrc.m_aHelp), m_aToolTip(rSrc.m_aToolTip)
 {
 }
 
@@ -65,8 +65,8 @@ OUString SwDropDownField::ExpandImpl(SwRootFrame const*const) const
     OUString sSelect = GetSelectedItem();
     if (sSelect.isEmpty())
     {
-        vector<OUString>::const_iterator aIt = aValues.begin();
-        if ( aIt != aValues.end())
+        vector<OUString>::const_iterator aIt = m_aValues.begin();
+        if ( aIt != m_aValues.end())
             sSelect = *aIt;
     }
     // if still no list value is available a default text of 10 spaces is to be set
@@ -102,49 +102,49 @@ void SwDropDownField::SetPar2(const OUString & rName)
 
 void SwDropDownField::SetItems(const vector<OUString> & rItems)
 {
-    aValues = rItems;
-    aSelectedItem.clear();
+    m_aValues = rItems;
+    m_aSelectedItem.clear();
 }
 
 void SwDropDownField::SetItems(const uno::Sequence<OUString> & rItems)
 {
-    aValues.clear();
+    m_aValues.clear();
 
-    comphelper::sequenceToContainer(aValues, rItems);
+    comphelper::sequenceToContainer(m_aValues, rItems);
 
-    aSelectedItem.clear();
+    m_aSelectedItem.clear();
 }
 
 uno::Sequence<OUString> SwDropDownField::GetItemSequence() const
 {
-    return comphelper::containerToSequence(aValues);
+    return comphelper::containerToSequence(m_aValues);
 }
 
 
 void SwDropDownField::SetSelectedItem(const OUString & rItem)
 {
     vector<OUString>::const_iterator aIt =
-        std::find(aValues.begin(), aValues.end(), rItem);
+        std::find(m_aValues.begin(), m_aValues.end(), rItem);
 
-    if (aIt != aValues.end())
-        aSelectedItem = *aIt;
+    if (aIt != m_aValues.end())
+        m_aSelectedItem = *aIt;
     else
-        aSelectedItem.clear();
+        m_aSelectedItem.clear();
 }
 
 void SwDropDownField::SetName(const OUString & rName)
 {
-    aName = rName;
+    m_aName = rName;
 }
 
 void SwDropDownField::SetHelp(const OUString & rHelp)
 {
-    aHelp = rHelp;
+    m_aHelp = rHelp;
 }
 
 void SwDropDownField::SetToolTip(const OUString & rToolTip)
 {
-    aToolTip = rToolTip;
+    m_aToolTip = rToolTip;
 }
 
 bool SwDropDownField::QueryValue(::uno::Any &rVal, sal_uInt16 nWhich) const
@@ -153,16 +153,16 @@ bool SwDropDownField::QueryValue(::uno::Any &rVal, sal_uInt16 nWhich) const
     switch( nWhich )
     {
     case FIELD_PROP_PAR1:
-        rVal <<= aSelectedItem;
+        rVal <<= m_aSelectedItem;
         break;
     case FIELD_PROP_PAR2:
-        rVal <<= aName;
+        rVal <<= m_aName;
         break;
     case FIELD_PROP_PAR3:
-        rVal <<= aHelp;
+        rVal <<= m_aHelp;
         break;
     case FIELD_PROP_PAR4:
-        rVal <<= aToolTip;
+        rVal <<= m_aToolTip;
         break;
     case FIELD_PROP_STRINGS:
         rVal <<= GetItemSequence();
@@ -189,15 +189,15 @@ bool SwDropDownField::PutValue(const uno::Any &rVal,
         break;
 
     case FIELD_PROP_PAR2:
-        rVal >>= aName;
+        rVal >>= m_aName;
         break;
 
     case FIELD_PROP_PAR3:
-        rVal >>= aHelp;
+        rVal >>= m_aHelp;
         break;
 
     case FIELD_PROP_PAR4:
-        rVal >>= aToolTip;
+        rVal >>= m_aToolTip;
         break;
 
     case FIELD_PROP_STRINGS: