sw: prefix members of AuthorCharAttr

Change-Id: I9439c900ef2ec567cde105a3e7b8fe222ac1ccb6
Reviewed-on: https://gerrit.libreoffice.org/45780
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Tested-by: Jenkins <ci@libreoffice.org>

6 files changed, 70 insertions, 70 deletions

diff --git a/sw/inc/authratr.hxx b/sw/inc/authratr.hxx
index 814e914f3f9d..1507e088addf 100644
--- a/sw/inc/authratr.hxx
+++ b/sw/inc/authratr.hxx
@@ -27,16 +27,16 @@
 class SW_DLLPUBLIC AuthorCharAttr
 {
 public:
-    sal_uInt16  nItemId;
-    sal_uInt16  nAttr;
-    ColorData nColor;
+    sal_uInt16  m_nItemId;
+    sal_uInt16  m_nAttr;
+    ColorData m_nColor;
 
     AuthorCharAttr();
 
     bool operator == ( const AuthorCharAttr& rAttr ) const
     {
-        return  nItemId == rAttr.nItemId && nAttr == rAttr.nAttr &&
-                nColor == rAttr.nColor;
+        return  m_nItemId == rAttr.m_nItemId && m_nAttr == rAttr.m_nAttr &&
+                m_nColor == rAttr.m_nColor;
     }
 };
 
diff --git a/sw/source/core/access/accpara.cxx b/sw/source/core/access/accpara.cxx
index 6a9d33767e35..4fb50f858d8d 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -2092,7 +2092,7 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
                 break;
             }
         }
-        switch( aChangeAttr.nItemId )
+        switch( aChangeAttr.m_nItemId )
         {
         case SID_ATTR_CHAR_WEIGHT:
             ChangeAttr.Name = UNO_NAME_CHAR_WEIGHT;
@@ -2108,26 +2108,26 @@ void SwAccessibleParagraph::_correctValues( const sal_Int32 nIndex,
             break;
         case SID_ATTR_CHAR_UNDERLINE:
             ChangeAttr.Name = UNO_NAME_CHAR_UNDERLINE;
-            ChangeAttr.Value <<= aChangeAttr.nAttr; //underline line
+            ChangeAttr.Value <<= aChangeAttr.m_nAttr; //underline line
             break;
         }
-        if( aChangeAttr.nColor != COL_NONE_COLOR )
+        if( aChangeAttr.m_nColor != COL_NONE_COLOR )
         {
-            if( aChangeAttr.nItemId == SID_ATTR_BRUSH )
+            if( aChangeAttr.m_nItemId == SID_ATTR_BRUSH )
             {
                 ChangeAttrColor.Name = UNO_NAME_CHAR_BACK_COLOR;
-                if( aChangeAttr.nColor == COL_TRANSPARENT )//char backcolor
+                if( aChangeAttr.m_nColor == COL_TRANSPARENT )//char backcolor
                     ChangeAttrColor.Value <<= COL_BLUE;
                 else
-                    ChangeAttrColor.Value <<= aChangeAttr.nColor;
+                    ChangeAttrColor.Value <<= aChangeAttr.m_nColor;
             }
             else
             {
                 ChangeAttrColor.Name = UNO_NAME_CHAR_COLOR;
-                if( aChangeAttr.nColor == COL_TRANSPARENT )//char color
+                if( aChangeAttr.m_nColor == COL_TRANSPARENT )//char color
                     ChangeAttrColor.Value <<= COL_BLUE;
                 else
-                    ChangeAttrColor.Value <<= aChangeAttr.nColor;
+                    ChangeAttrColor.Value <<= aChangeAttr.m_nColor;
             }
         }
     }
diff --git a/sw/source/ui/config/optpage.cxx b/sw/source/ui/config/optpage.cxx
index 1ce7ae23e78d..ccbed1e2e6ac 100644
--- a/sw/source/ui/config/optpage.cxx
+++ b/sw/source/ui/config/optpage.cxx
@@ -1720,8 +1720,8 @@ namespace
         {
             CharAttr& rAttr(aRedlineAttr[pAttrMap[i]]);
             rLB.SetEntryData(i, &rAttr);
-            if (rAttr.nItemId == rAttrToSelect.nItemId &&
-                rAttr.nAttr == rAttrToSelect.nAttr)
+            if (rAttr.nItemId == rAttrToSelect.m_nItemId &&
+                rAttr.nAttr == rAttrToSelect.m_nAttr)
                 rLB.SelectEntryPos(i);
         }
     }
@@ -1838,9 +1838,9 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
     {
         pAttr = static_cast<CharAttr *>(m_pInsertLB->GetEntryData(nPos));
-        aInsertedAttr.nItemId = pAttr->nItemId;
-        aInsertedAttr.nAttr = pAttr->nAttr;
-        aInsertedAttr.nColor = m_pInsertColorLB->GetSelectEntryColor().GetColor();
+        aInsertedAttr.m_nItemId = pAttr->nItemId;
+        aInsertedAttr.m_nAttr = pAttr->nAttr;
+        aInsertedAttr.m_nColor = m_pInsertColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetInsertAuthorAttr(aInsertedAttr);
     }
 
@@ -1848,9 +1848,9 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
     {
         pAttr = static_cast<CharAttr *>(m_pDeletedLB->GetEntryData(nPos));
-        aDeletedAttr.nItemId = pAttr->nItemId;
-        aDeletedAttr.nAttr = pAttr->nAttr;
-        aDeletedAttr.nColor = m_pDeletedColorLB->GetSelectEntryColor().GetColor();
+        aDeletedAttr.m_nItemId = pAttr->nItemId;
+        aDeletedAttr.m_nAttr = pAttr->nAttr;
+        aDeletedAttr.m_nColor = m_pDeletedColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetDeletedAuthorAttr(aDeletedAttr);
     }
 
@@ -1858,9 +1858,9 @@ bool SwRedlineOptionsTabPage::FillItemSet( SfxItemSet* )
     if (nPos != LISTBOX_ENTRY_NOTFOUND)
     {
         pAttr = static_cast<CharAttr *>(m_pChangedLB->GetEntryData(nPos));
-        aChangedAttr.nItemId = pAttr->nItemId;
-        aChangedAttr.nAttr = pAttr->nAttr;
-        aChangedAttr.nColor = m_pChangedColorLB->GetSelectEntryColor().GetColor();
+        aChangedAttr.m_nItemId = pAttr->nItemId;
+        aChangedAttr.m_nAttr = pAttr->nAttr;
+        aChangedAttr.m_nColor = m_pChangedColorLB->GetSelectEntryColor().GetColor();
         pOpt->SetFormatAuthorAttr(aChangedAttr);
     }
 
@@ -1909,13 +1909,13 @@ void SwRedlineOptionsTabPage::Reset( const SfxItemSet*  )
     InitFontStyle(*m_pDeletedPreviewWN);
     InitFontStyle(*m_pChangedPreviewWN);
 
-    ColorData nColor = rInsertAttr.nColor;
+    ColorData nColor = rInsertAttr.m_nColor;
     m_pInsertColorLB->SelectEntry(Color(nColor));
 
-    nColor = rDeletedAttr.nColor;
+    nColor = rDeletedAttr.m_nColor;
     m_pDeletedColorLB->SelectEntry(Color(nColor));
 
-    nColor = rChangedAttr.nColor;
+    nColor = rChangedAttr.m_nColor;
     m_pChangedColorLB->SelectEntry(Color(nColor));
 
     m_pMarkColorLB->SelectEntry(pOpt->GetMarkAlignColor());
diff --git a/sw/source/uibase/app/swmodul1.cxx b/sw/source/uibase/app/swmodul1.cxx
index 49067db87393..565e07f6b2b1 100644
--- a/sw/source/uibase/app/swmodul1.cxx
+++ b/sw/source/uibase/app/swmodul1.cxx
@@ -482,18 +482,18 @@ std::size_t SwModule::InsertRedlineAuthor(const OUString& rAuthor)
 static void lcl_FillAuthorAttr( std::size_t nAuthor, SfxItemSet &rSet,
                         const AuthorCharAttr &rAttr )
 {
-    Color aCol( rAttr.nColor );
+    Color aCol( rAttr.m_nColor );
 
-    if( COL_TRANSPARENT == rAttr.nColor )
+    if( COL_TRANSPARENT == rAttr.m_nColor )
         aCol.SetColor(lcl_GetAuthorColor(nAuthor));
 
-    bool bBackGr = COL_NONE_COLOR == rAttr.nColor;
+    bool bBackGr = COL_NONE_COLOR == rAttr.m_nColor;
 
-    switch (rAttr.nItemId)
+    switch (rAttr.m_nItemId)
     {
     case SID_ATTR_CHAR_WEIGHT:
         {
-            SvxWeightItem aW( (FontWeight)rAttr.nAttr, RES_CHRATR_WEIGHT );
+            SvxWeightItem aW( (FontWeight)rAttr.m_nAttr, RES_CHRATR_WEIGHT );
             rSet.Put( aW );
             aW.SetWhich( RES_CHRATR_CJK_WEIGHT );
             rSet.Put( aW );
@@ -504,7 +504,7 @@ static void lcl_FillAuthorAttr( std::size_t nAuthor, SfxItemSet &rSet,
 
     case SID_ATTR_CHAR_POSTURE:
         {
-            SvxPostureItem aP( (FontItalic)rAttr.nAttr, RES_CHRATR_POSTURE );
+            SvxPostureItem aP( (FontItalic)rAttr.m_nAttr, RES_CHRATR_POSTURE );
             rSet.Put( aP );
             aP.SetWhich( RES_CHRATR_CJK_POSTURE );
             rSet.Put( aP );
@@ -514,17 +514,17 @@ static void lcl_FillAuthorAttr( std::size_t nAuthor, SfxItemSet &rSet,
         break;
 
     case SID_ATTR_CHAR_UNDERLINE:
-        rSet.Put( SvxUnderlineItem( (FontLineStyle)rAttr.nAttr,
+        rSet.Put( SvxUnderlineItem( (FontLineStyle)rAttr.m_nAttr,
                                     RES_CHRATR_UNDERLINE));
         break;
 
     case SID_ATTR_CHAR_STRIKEOUT:
-        rSet.Put(SvxCrossedOutItem( (FontStrikeout)rAttr.nAttr,
+        rSet.Put(SvxCrossedOutItem( (FontStrikeout)rAttr.m_nAttr,
                                     RES_CHRATR_CROSSEDOUT));
         break;
 
     case SID_ATTR_CHAR_CASEMAP:
-        rSet.Put( SvxCaseMapItem( (SvxCaseMap)rAttr.nAttr,
+        rSet.Put( SvxCaseMapItem( (SvxCaseMap)rAttr.m_nAttr,
                                     RES_CHRATR_CASEMAP));
         break;
 
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index 527abc141670..c40ff766a7e0 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -248,15 +248,15 @@ SwRevisionConfig::SwRevisionConfig() :
     ConfigItem("Office.Writer/Revision",
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
 {
-    aInsertAttr.nItemId = SID_ATTR_CHAR_UNDERLINE;
-    aInsertAttr.nAttr = LINESTYLE_SINGLE;
-    aInsertAttr.nColor = COL_TRANSPARENT;
-    aDeletedAttr.nItemId = SID_ATTR_CHAR_STRIKEOUT;
-    aDeletedAttr.nAttr = STRIKEOUT_SINGLE;
-    aDeletedAttr.nColor = COL_TRANSPARENT;
-    aFormatAttr.nItemId = SID_ATTR_CHAR_WEIGHT;
-    aFormatAttr.nAttr = WEIGHT_BOLD;
-    aFormatAttr.nColor = COL_BLACK;
+    aInsertAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE;
+    aInsertAttr.m_nAttr = LINESTYLE_SINGLE;
+    aInsertAttr.m_nColor = COL_TRANSPARENT;
+    aDeletedAttr.m_nItemId = SID_ATTR_CHAR_STRIKEOUT;
+    aDeletedAttr.m_nAttr = STRIKEOUT_SINGLE;
+    aDeletedAttr.m_nColor = COL_TRANSPARENT;
+    aFormatAttr.m_nItemId = SID_ATTR_CHAR_WEIGHT;
+    aFormatAttr.m_nAttr = WEIGHT_BOLD;
+    aFormatAttr.m_nColor = COL_BLACK;
 
     Load();
 }
@@ -268,15 +268,15 @@ SwRevisionConfig::~SwRevisionConfig()
 static sal_Int32 lcl_ConvertAttrToCfg(const AuthorCharAttr& rAttr)
 {
     sal_Int32 nRet = 0;
-    switch(rAttr.nItemId)
+    switch(rAttr.m_nItemId)
     {
         case  SID_ATTR_CHAR_WEIGHT: nRet = 1; break;
         case  SID_ATTR_CHAR_POSTURE: nRet = 2; break;
-        case  SID_ATTR_CHAR_UNDERLINE: nRet = LINESTYLE_SINGLE == rAttr.nAttr ? 3 : 4; break;
+        case  SID_ATTR_CHAR_UNDERLINE: nRet = LINESTYLE_SINGLE == rAttr.m_nAttr ? 3 : 4; break;
         case  SID_ATTR_CHAR_STRIKEOUT: nRet = 3; break;
         case  SID_ATTR_CHAR_CASEMAP:
         {
-            switch((SvxCaseMap)rAttr.nAttr)
+            switch((SvxCaseMap)rAttr.m_nAttr)
             {
                 case  SvxCaseMap::Uppercase : nRet = 5;break;
                 case  SvxCaseMap::Lowercase : nRet = 6;break;
@@ -305,11 +305,11 @@ void SwRevisionConfig::ImplCommit()
         switch(nProp)
         {
             case 0 : nVal = lcl_ConvertAttrToCfg(aInsertAttr); break;
-            case 1 : nVal = aInsertAttr.nColor  ; break;
+            case 1 : nVal = aInsertAttr.m_nColor  ; break;
             case 2 : nVal = lcl_ConvertAttrToCfg(aDeletedAttr); break;
-            case 3 : nVal = aDeletedAttr.nColor ; break;
+            case 3 : nVal = aDeletedAttr.m_nColor ; break;
             case 4 : nVal = lcl_ConvertAttrToCfg(aFormatAttr); break;
-            case 5 : nVal = aFormatAttr.nColor  ; break;
+            case 5 : nVal = aFormatAttr.m_nColor  ; break;
             case 6 : nVal = nMarkAlign          ; break;
             case 7 : nVal = aMarkColor.GetColor(); break;
         }
@@ -320,28 +320,28 @@ void SwRevisionConfig::ImplCommit()
 
 static void lcl_ConvertCfgToAttr(sal_Int32 nVal, AuthorCharAttr& rAttr, bool bDelete = false)
 {
-    rAttr.nItemId = rAttr.nAttr = 0;
+    rAttr.m_nItemId = rAttr.m_nAttr = 0;
     switch(nVal)
     {
-        case 1: rAttr.nItemId = SID_ATTR_CHAR_WEIGHT;   rAttr.nAttr = WEIGHT_BOLD              ; break;
-        case 2: rAttr.nItemId = SID_ATTR_CHAR_POSTURE;  rAttr.nAttr = ITALIC_NORMAL            ; break;
+        case 1: rAttr.m_nItemId = SID_ATTR_CHAR_WEIGHT;   rAttr.m_nAttr = WEIGHT_BOLD              ; break;
+        case 2: rAttr.m_nItemId = SID_ATTR_CHAR_POSTURE;  rAttr.m_nAttr = ITALIC_NORMAL            ; break;
         case 3: if(bDelete)
                 {
-                    rAttr.nItemId = SID_ATTR_CHAR_STRIKEOUT;
-                    rAttr.nAttr = STRIKEOUT_SINGLE;
+                    rAttr.m_nItemId = SID_ATTR_CHAR_STRIKEOUT;
+                    rAttr.m_nAttr = STRIKEOUT_SINGLE;
                 }
                 else
                 {
-                    rAttr.nItemId = SID_ATTR_CHAR_UNDERLINE;
-                    rAttr.nAttr = LINESTYLE_SINGLE;
+                    rAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE;
+                    rAttr.m_nAttr = LINESTYLE_SINGLE;
                 }
         break;
-        case 4: rAttr.nItemId = SID_ATTR_CHAR_UNDERLINE;rAttr.nAttr = LINESTYLE_DOUBLE         ; break;
-        case 5: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Uppercase; break;
-        case 6: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Lowercase; break;
-        case 7: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::SmallCaps; break;
-        case 8: rAttr.nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.nAttr = (sal_uInt16)SvxCaseMap::Capitalize; break;
-        case 9: rAttr.nItemId = SID_ATTR_BRUSH; break;
+        case 4: rAttr.m_nItemId = SID_ATTR_CHAR_UNDERLINE;rAttr.m_nAttr = LINESTYLE_DOUBLE         ; break;
+        case 5: rAttr.m_nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.m_nAttr = (sal_uInt16)SvxCaseMap::Uppercase; break;
+        case 6: rAttr.m_nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.m_nAttr = (sal_uInt16)SvxCaseMap::Lowercase; break;
+        case 7: rAttr.m_nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.m_nAttr = (sal_uInt16)SvxCaseMap::SmallCaps; break;
+        case 8: rAttr.m_nItemId = SID_ATTR_CHAR_CASEMAP;  rAttr.m_nAttr = (sal_uInt16)SvxCaseMap::Capitalize; break;
+        case 9: rAttr.m_nItemId = SID_ATTR_BRUSH; break;
     }
 }
 void SwRevisionConfig::Load()
@@ -359,11 +359,11 @@ void SwRevisionConfig::Load()
             switch (nProp)
             {
                 case 0 : lcl_ConvertCfgToAttr(nVal, aInsertAttr); break;
-                case 1 : aInsertAttr.nColor     = nVal; break;
+                case 1 : aInsertAttr.m_nColor     = nVal; break;
                 case 2 : lcl_ConvertCfgToAttr(nVal, aDeletedAttr, true); break;
-                case 3 : aDeletedAttr.nColor    = nVal; break;
+                case 3 : aDeletedAttr.m_nColor    = nVal; break;
                 case 4 : lcl_ConvertCfgToAttr(nVal, aFormatAttr); break;
-                case 5 : aFormatAttr.nColor     = nVal; break;
+                case 5 : aFormatAttr.m_nColor     = nVal; break;
                 case 6 : nMarkAlign = sal::static_int_cast< sal_uInt16, sal_Int32>(nVal); break;
                 case 7 : aMarkColor.SetColor(nVal); break;
             }
diff --git a/sw/source/uibase/config/viewopt.cxx b/sw/source/uibase/config/viewopt.cxx
index 8c132b83c5c3..2061e8424013 100644
--- a/sw/source/uibase/config/viewopt.cxx
+++ b/sw/source/uibase/config/viewopt.cxx
@@ -322,9 +322,9 @@ void SwViewOption::SetOnlineSpell(bool b)
 }
 
 AuthorCharAttr::AuthorCharAttr() :
-    nItemId (SID_ATTR_CHAR_UNDERLINE),
-    nAttr   (LINESTYLE_SINGLE),
-    nColor  (COL_TRANSPARENT)
+    m_nItemId (SID_ATTR_CHAR_UNDERLINE),
+    m_nAttr   (LINESTYLE_SINGLE),
+    m_nColor  (COL_TRANSPARENT)
 {
 }