sw: prefix members of SwTOXBase

Change-Id: I23bdc9a885228848568ebaf3fb618826598b8267

2 files changed, 96 insertions, 96 deletions

diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 439a540aa562..ee50c7ae10bf 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -392,33 +392,33 @@ namespace nsSwTOOElements
 // Class for all indexes
 class SW_DLLPUBLIC SwTOXBase : public SwClient
 {
-    SwForm      aForm;              // description of the lines
-    OUString    aName;              // unique name
-    OUString    aTitle;             // title
+    SwForm      m_aForm;              // description of the lines
+    OUString    m_aName;              // unique name
+    OUString    m_aTitle;             // title
     OUString    m_aBookmarkName;      //Bookmark Name
     OUString    m_aEntryTypeName;   // Type name
 
-    OUString    sMainEntryCharStyle; // name of the character style applied to main index entries
+    OUString    m_sMainEntryCharStyle; // name of the character style applied to main index entries
 
-    OUString    aStyleNames[MAXLEVEL]; // (additional) style names TOX_CONTENT, TOX_USER
-    OUString    sSequenceName;      // FieldTypeName of a caption sequence
+    OUString    m_aStyleNames[MAXLEVEL]; // (additional) style names TOX_CONTENT, TOX_USER
+    OUString    m_sSequenceName;      // FieldTypeName of a caption sequence
 
-    LanguageType    eLanguage;
-    OUString        sSortAlgorithm;
+    LanguageType    m_eLanguage;
+    OUString        m_sSortAlgorithm;
 
     union {
         sal_uInt16      nLevel;             // consider outline levels
         sal_uInt16      nOptions;           // options of alphabetical index
-    } aData;
-
-    sal_uInt16      nCreateType;        // sources to create the index from
-    sal_uInt16      nOLEOptions;        // OLE sources
-    SwCaptionDisplay eCaptionDisplay;
-    bool        bProtected : 1;         // index protected ?
-    bool        bFromChapter : 1;       // create from chapter or document
-    bool        bFromObjectNames : 1;   // create a table or object index
+    } m_aData;
+
+    sal_uInt16      m_nCreateType;        // sources to create the index from
+    sal_uInt16      m_nOLEOptions;        // OLE sources
+    SwCaptionDisplay m_eCaptionDisplay;
+    bool        m_bProtected : 1;         // index protected ?
+    bool        m_bFromChapter : 1;       // create from chapter or document
+    bool        m_bFromObjectNames : 1;   // create a table or object index
                                     // from the names rather than the caption
-    bool        bLevelFromChapter : 1; // User index: get the level from the source chapter
+    bool        m_bLevelFromChapter : 1; // User index: get the level from the source chapter
 
 protected:
     // Add a data member, for record the TOC field expression of MS Word binary format
@@ -442,8 +442,8 @@ public:
 
     sal_uInt16              GetCreateType() const;      // creation types
 
-    OUString            GetTOXName() const {return aName;}
-    void                SetTOXName(const OUString& rSet) {aName = rSet;}
+    OUString            GetTOXName() const {return m_aName;}
+    void                SetTOXName(const OUString& rSet) {m_aName = rSet;}
 
     // for record the TOC field expression of MS Word binary format
     const OUString&     GetMSTOCExpression() const{return maMSTOCExpression;}
@@ -463,8 +463,8 @@ public:
 
     TOXTypes            GetType() const;
 
-    OUString            GetMainEntryCharStyle() const {return sMainEntryCharStyle;}
-    void                SetMainEntryCharStyle(const OUString& rSet)  {sMainEntryCharStyle = rSet;}
+    OUString            GetMainEntryCharStyle() const {return m_sMainEntryCharStyle;}
+    void                SetMainEntryCharStyle(const OUString& rSet)  {m_sMainEntryCharStyle = rSet;}
 
     // for record the Index field expression of MS Word
     OUString         GetEntryTypeName() const;
@@ -479,53 +479,53 @@ public:
     inline void             SetOptions(sal_uInt16 nOpt);
 
     // index of objects
-    sal_uInt16      GetOLEOptions() const {return nOLEOptions;}
-    void        SetOLEOptions(sal_uInt16 nOpt) {nOLEOptions = nOpt;}
+    sal_uInt16      GetOLEOptions() const {return m_nOLEOptions;}
+    void        SetOLEOptions(sal_uInt16 nOpt) {m_nOLEOptions = nOpt;}
 
     // index of objects
 
     OUString                GetStyleNames(sal_uInt16 nLevel) const
                                 {
                                 SAL_WARN_IF( nLevel >= MAXLEVEL, "sw", "Which level?");
-                                return aStyleNames[nLevel];
+                                return m_aStyleNames[nLevel];
                                 }
     void                    SetStyleNames(const OUString& rSet, sal_uInt16 nLevel)
                                 {
                                 SAL_WARN_IF( nLevel >= MAXLEVEL, "sw", "Which level?");
-                                aStyleNames[nLevel] = rSet;
+                                m_aStyleNames[nLevel] = rSet;
                                 }
-    bool                    IsFromChapter() const { return bFromChapter;}
-    void                    SetFromChapter(bool bSet) { bFromChapter = bSet;}
+    bool                    IsFromChapter() const { return m_bFromChapter;}
+    void                    SetFromChapter(bool bSet) { m_bFromChapter = bSet;}
 
-    bool                    IsFromObjectNames() const {return bFromObjectNames;}
-    void                    SetFromObjectNames(bool bSet) {bFromObjectNames = bSet;}
+    bool                    IsFromObjectNames() const {return m_bFromObjectNames;}
+    void                    SetFromObjectNames(bool bSet) {m_bFromObjectNames = bSet;}
 
-    bool                    IsLevelFromChapter() const {return bLevelFromChapter;}
-    void                    SetLevelFromChapter(bool bSet) {bLevelFromChapter = bSet;}
+    bool                    IsLevelFromChapter() const {return m_bLevelFromChapter;}
+    void                    SetLevelFromChapter(bool bSet) {m_bLevelFromChapter = bSet;}
 
-    bool                    IsProtected() const { return bProtected; }
-    void                    SetProtected(bool bSet) { bProtected = bSet; }
+    bool                    IsProtected() const { return m_bProtected; }
+    void                    SetProtected(bool bSet) { m_bProtected = bSet; }
 
-    OUString                GetSequenceName() const {return sSequenceName;}
-    void                    SetSequenceName(const OUString& rSet) {sSequenceName = rSet;}
+    OUString                GetSequenceName() const {return m_sSequenceName;}
+    void                    SetSequenceName(const OUString& rSet) {m_sSequenceName = rSet;}
 
-    SwCaptionDisplay        GetCaptionDisplay() const { return eCaptionDisplay;}
-    void                    SetCaptionDisplay(SwCaptionDisplay eSet) {eCaptionDisplay = eSet;}
+    SwCaptionDisplay        GetCaptionDisplay() const { return m_eCaptionDisplay;}
+    void                    SetCaptionDisplay(SwCaptionDisplay eSet) {m_eCaptionDisplay = eSet;}
 
     bool                    IsTOXBaseInReadonly() const;
 
     const SfxItemSet*       GetAttrSet() const;
     void                    SetAttrSet( const SfxItemSet& );
 
-    LanguageType    GetLanguage() const {return eLanguage;}
-    void            SetLanguage(LanguageType nLang)  {eLanguage = nLang;}
+    LanguageType    GetLanguage() const {return m_eLanguage;}
+    void            SetLanguage(LanguageType nLang)  {m_eLanguage = nLang;}
 
-    OUString        GetSortAlgorithm()const {return sSortAlgorithm;}
-    void            SetSortAlgorithm(const OUString& rSet) {sSortAlgorithm = rSet;}
+    OUString        GetSortAlgorithm()const {return m_sSortAlgorithm;}
+    void            SetSortAlgorithm(const OUString& rSet) {m_sSortAlgorithm = rSet;}
     // #i21237#
     void AdjustTabStops( SwDoc & rDoc )
     {
-        aForm.AdjustTabStops( rDoc );
+        m_aForm.AdjustTabStops( rDoc );
     }
 
     SwTOXBase& operator=(const SwTOXBase& rSource);
@@ -679,10 +679,10 @@ inline const SwTOXType* SwTOXBase::GetTOXType() const
     { return static_cast<const SwTOXType*>(GetRegisteredIn()); }
 
 inline sal_uInt16 SwTOXBase::GetCreateType() const
-    { return nCreateType; }
+    { return m_nCreateType; }
 
 inline OUString SwTOXBase::GetTitle() const
-    { return aTitle; }
+    { return m_aTitle; }
 
 inline OUString SwTOXBase::GetBookmarkName() const
     { return m_aBookmarkName; }
@@ -694,13 +694,13 @@ inline OUString SwTOXBase::GetTypeName() const
     { return GetTOXType()->GetTypeName();  }
 
 inline const SwForm& SwTOXBase::GetTOXForm() const
-    { return aForm; }
+    { return m_aForm; }
 
 inline void SwTOXBase::SetCreate(sal_uInt16 nCreate)
-    { nCreateType = nCreate; }
+    { m_nCreateType = nCreate; }
 
 inline void SwTOXBase::SetTOXForm(const SwForm& rForm)
-    {  aForm = rForm; }
+    {  m_aForm = rForm; }
 
 inline TOXTypes SwTOXBase::GetType() const
     { return GetTOXType()->GetType(); }
@@ -708,25 +708,25 @@ inline TOXTypes SwTOXBase::GetType() const
 inline void SwTOXBase::SetLevel(sal_uInt16 nLev)
 {
     SAL_WARN_IF(GetTOXType()->GetType() == TOX_INDEX, "sw", "Wrong type");
-    aData.nLevel = nLev;
+    m_aData.nLevel = nLev;
 }
 
 inline sal_uInt16 SwTOXBase::GetLevel() const
 {
     SAL_WARN_IF(GetTOXType()->GetType() == TOX_INDEX, "sw", "Wrong type");
-    return aData.nLevel;
+    return m_aData.nLevel;
 }
 
 inline sal_uInt16 SwTOXBase::GetOptions() const
 {
     SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
-    return aData.nOptions;
+    return m_aData.nOptions;
 }
 
 inline void SwTOXBase::SetOptions(sal_uInt16 nOpt)
 {
     SAL_WARN_IF(GetTOXType()->GetType() != TOX_INDEX, "sw", "Wrong type");
-    aData.nOptions = nOpt;
+    m_aData.nOptions = nOpt;
 }
 
 #endif // INCLUDED_SW_INC_TOX_HXX
diff --git a/sw/source/core/tox/tox.cxx b/sw/source/core/tox/tox.cxx
index 6490ae81663d..ed8bd3ccd986 100644
--- a/sw/source/core/tox/tox.cxx
+++ b/sw/source/core/tox/tox.cxx
@@ -429,20 +429,20 @@ OUString SwForm::GetFormAuth()        {return OUString("<A>");}
 SwTOXBase::SwTOXBase(const SwTOXType* pTyp, const SwForm& rForm,
                      sal_uInt16 nCreaType, const OUString& rTitle )
     : SwClient(const_cast<SwModify*>(static_cast<SwModify const *>(pTyp)))
-    , aForm(rForm)
-    , aTitle(rTitle)
-    , eLanguage((LanguageType)::GetAppLanguage())
-    , nCreateType(nCreaType)
-    , nOLEOptions(0)
-    , eCaptionDisplay(CAPTION_COMPLETE)
-    , bProtected( true )
-    , bFromChapter(false)
-    , bFromObjectNames(false)
-    , bLevelFromChapter(false)
+    , m_aForm(rForm)
+    , m_aTitle(rTitle)
+    , m_eLanguage((LanguageType)::GetAppLanguage())
+    , m_nCreateType(nCreaType)
+    , m_nOLEOptions(0)
+    , m_eCaptionDisplay(CAPTION_COMPLETE)
+    , m_bProtected( true )
+    , m_bFromChapter(false)
+    , m_bFromObjectNames(false)
+    , m_bLevelFromChapter(false)
     , maMSTOCExpression()
     , mbKeepExpression(true)
 {
-    aData.nOptions = 0;
+    m_aData.nOptions = 0;
 }
 
 SwTOXBase::SwTOXBase( const SwTOXBase& rSource, SwDoc* pDoc )
@@ -483,32 +483,32 @@ SwTOXBase& SwTOXBase::CopyTOXBase( SwDoc* pDoc, const SwTOXBase& rSource )
     }
     pType->Add( this );
 
-    nCreateType = rSource.nCreateType;
-    aTitle      = rSource.aTitle;
-    aForm       = rSource.aForm;
+    m_nCreateType = rSource.m_nCreateType;
+    m_aTitle      = rSource.m_aTitle;
+    m_aForm       = rSource.m_aForm;
     m_aBookmarkName = rSource.m_aBookmarkName;
     m_aEntryTypeName = rSource.m_aEntryTypeName ;
-    bProtected  = rSource.bProtected;
-    bFromChapter = rSource.bFromChapter;
-    bFromObjectNames = rSource.bFromObjectNames;
-    sMainEntryCharStyle = rSource.sMainEntryCharStyle;
-    sSequenceName = rSource.sSequenceName;
-    eCaptionDisplay = rSource.eCaptionDisplay;
-    nOLEOptions = rSource.nOLEOptions;
-    eLanguage = rSource.eLanguage;
-    sSortAlgorithm = rSource.sSortAlgorithm;
-    bLevelFromChapter = rSource.bLevelFromChapter;
+    m_bProtected  = rSource.m_bProtected;
+    m_bFromChapter = rSource.m_bFromChapter;
+    m_bFromObjectNames = rSource.m_bFromObjectNames;
+    m_sMainEntryCharStyle = rSource.m_sMainEntryCharStyle;
+    m_sSequenceName = rSource.m_sSequenceName;
+    m_eCaptionDisplay = rSource.m_eCaptionDisplay;
+    m_nOLEOptions = rSource.m_nOLEOptions;
+    m_eLanguage = rSource.m_eLanguage;
+    m_sSortAlgorithm = rSource.m_sSortAlgorithm;
+    m_bLevelFromChapter = rSource.m_bLevelFromChapter;
 
     for( sal_uInt16 i = 0; i < MAXLEVEL; ++i )
-        aStyleNames[i] = rSource.aStyleNames[i];
+        m_aStyleNames[i] = rSource.m_aStyleNames[i];
 
     // its the same data type!
-    aData.nOptions =  rSource.aData.nOptions;
+    m_aData.nOptions =  rSource.m_aData.nOptions;
 
     if( !pDoc || pDoc->IsCopyIsMove() )
-        aName = rSource.GetTOXName();
+        m_aName = rSource.GetTOXName();
     else
-        aName = pDoc->GetUniqueTOXBaseName( *pType, rSource.GetTOXName() );
+        m_aName = pDoc->GetUniqueTOXBaseName( *pType, rSource.GetTOXName() );
 
     return *this;
 }
@@ -521,7 +521,7 @@ SwTOXBase::~SwTOXBase()
 }
 
 void SwTOXBase::SetTitle(const OUString& rTitle)
-    {   aTitle = rTitle; }
+    {   m_aTitle = rTitle; }
 
 void SwTOXBase::SetBookmarkName(const OUString& bName)
 {
@@ -535,25 +535,25 @@ void SwTOXBase::SetEntryTypeName(const OUString& sName)
 
 SwTOXBase & SwTOXBase::operator = (const SwTOXBase & rSource)
 {
-    aForm = rSource.aForm;
-    aName = rSource.aName;
-    aTitle = rSource.aTitle;
+    m_aForm = rSource.m_aForm;
+    m_aName = rSource.m_aName;
+    m_aTitle = rSource.m_aTitle;
     m_aBookmarkName = rSource.m_aBookmarkName;
     m_aEntryTypeName = rSource.m_aEntryTypeName ;
-    sMainEntryCharStyle = rSource.sMainEntryCharStyle;
+    m_sMainEntryCharStyle = rSource.m_sMainEntryCharStyle;
     for(sal_uInt16 nLevel = 0; nLevel < MAXLEVEL; nLevel++)
-        aStyleNames[nLevel] = rSource.aStyleNames[nLevel];
-    sSequenceName = rSource.sSequenceName;
-    eLanguage = rSource.eLanguage;
-    sSortAlgorithm = rSource.sSortAlgorithm;
-    aData = rSource.aData;
-    nCreateType = rSource.nCreateType;
-    nOLEOptions = rSource.nOLEOptions;
-    eCaptionDisplay = rSource.eCaptionDisplay;
-    bProtected = rSource.bProtected;
-    bFromChapter = rSource.bFromChapter;
-    bFromObjectNames = rSource.bFromObjectNames;
-    bLevelFromChapter = rSource.bLevelFromChapter;
+        m_aStyleNames[nLevel] = rSource.m_aStyleNames[nLevel];
+    m_sSequenceName = rSource.m_sSequenceName;
+    m_eLanguage = rSource.m_eLanguage;
+    m_sSortAlgorithm = rSource.m_sSortAlgorithm;
+    m_aData = rSource.m_aData;
+    m_nCreateType = rSource.m_nCreateType;
+    m_nOLEOptions = rSource.m_nOLEOptions;
+    m_eCaptionDisplay = rSource.m_eCaptionDisplay;
+    m_bProtected = rSource.m_bProtected;
+    m_bFromChapter = rSource.m_bFromChapter;
+    m_bFromObjectNames = rSource.m_bFromObjectNames;
+    m_bLevelFromChapter = rSource.m_bLevelFromChapter;
 
     if (rSource.GetAttrSet())
         SetAttrSet(*rSource.GetAttrSet());