sw: prefix members of SwTOXBaseSection and SwTableConfig

Change-Id: I2fc2a7d456c92851e7bbb250f4467f3e0fd4f88a
Reviewed-on: https://gerrit.libreoffice.org/63546
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Tested-by: Jenkins

4 files changed, 89 insertions, 89 deletions

diff --git a/sw/inc/modcfg.hxx b/sw/inc/modcfg.hxx
index dd9c9ed40e15..16c96d5a5cfe 100644
--- a/sw/inc/modcfg.hxx
+++ b/sw/inc/modcfg.hxx
@@ -146,15 +146,15 @@ class SwTableConfig : public utl::ConfigItem
 {
     friend class SwModuleOptions;
 
-    sal_uInt16      nTableHMove;          //int Table/Shift/Row
-    sal_uInt16      nTableVMove;          //int Table/Shift/Column
-    sal_uInt16      nTableHInsert;        //int Table/Insert/Row
-    sal_uInt16      nTableVInsert;        //int Table/Insert/Column
-    TableChgMode  eTableChgMode;        //int Table/Change/Effect
+    sal_uInt16      m_nTableHMove;          //int Table/Shift/Row
+    sal_uInt16      m_nTableVMove;          //int Table/Shift/Column
+    sal_uInt16      m_nTableHInsert;        //int Table/Insert/Row
+    sal_uInt16      m_nTableVInsert;        //int Table/Insert/Column
+    TableChgMode  m_eTableChgMode;        //int Table/Change/Effect
 
-    bool    bInsTableFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
-    bool    bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
-    bool    bInsTableAlignNum;        // Table/Input/Alignment                // Align numbers.
+    bool    m_bInsTableFormatNum;       // Table/Input/NumberRecognition        // Automatic recognition of numbers.
+    bool    m_bInsTableChangeNumFormat; // Table/Input/NumberFormatRecognition  // Automatic recognition of number formats.
+    bool    m_bInsTableAlignNum;        // Table/Input/Alignment                // Align numbers.
 
     static const css::uno::Sequence<OUString>& GetPropertyNames();
 
@@ -218,24 +218,24 @@ class SW_DLLPUBLIC SwModuleOptions
 public:
     SwModuleOptions();
 
-    TableChgMode  GetTableMode() const { return m_aTableConfig.eTableChgMode;}
-    void        SetTableMode( TableChgMode  eSet ) { m_aTableConfig.eTableChgMode = eSet;
+    TableChgMode  GetTableMode() const { return m_aTableConfig.m_eTableChgMode;}
+    void        SetTableMode( TableChgMode  eSet ) { m_aTableConfig.m_eTableChgMode = eSet;
                                                 m_aTableConfig.SetModified();}
 
-    sal_uInt16      GetTableHMove() const { return m_aTableConfig.nTableHMove;}
-    void        SetTableHMove( sal_uInt16 nSet ) {    m_aTableConfig.nTableHMove = nSet;
+    sal_uInt16      GetTableHMove() const { return m_aTableConfig.m_nTableHMove;}
+    void        SetTableHMove( sal_uInt16 nSet ) {    m_aTableConfig.m_nTableHMove = nSet;
                                                 m_aTableConfig.SetModified();}
 
-    sal_uInt16      GetTableVMove() const { return m_aTableConfig.nTableVMove;}
-    void        SetTableVMove( sal_uInt16 nSet ) {    m_aTableConfig.nTableVMove = nSet;
+    sal_uInt16      GetTableVMove() const { return m_aTableConfig.m_nTableVMove;}
+    void        SetTableVMove( sal_uInt16 nSet ) {    m_aTableConfig.m_nTableVMove = nSet;
                                                 m_aTableConfig.SetModified();}
 
-    sal_uInt16      GetTableHInsert() const {return m_aTableConfig.nTableHInsert;}
-    void        SetTableHInsert( sal_uInt16 nSet ) {  m_aTableConfig.nTableHInsert = nSet;
+    sal_uInt16      GetTableHInsert() const {return m_aTableConfig.m_nTableHInsert;}
+    void        SetTableHInsert( sal_uInt16 nSet ) {  m_aTableConfig.m_nTableHInsert = nSet;
                                                 m_aTableConfig.SetModified();}
 
-    sal_uInt16      GetTableVInsert() const {return m_aTableConfig.nTableVInsert;}
-    void        SetTableVInsert( sal_uInt16 nSet ) {  m_aTableConfig.nTableVInsert = nSet;
+    sal_uInt16      GetTableVInsert() const {return m_aTableConfig.m_nTableVInsert;}
+    void        SetTableVInsert( sal_uInt16 nSet ) {  m_aTableConfig.m_nTableVInsert = nSet;
                                                 m_aTableConfig.SetModified();}
 
     const AuthorCharAttr    &GetInsertAuthorAttr() const { return m_aRevisionConfig.m_aInsertAttr; }
@@ -276,24 +276,24 @@ public:
                 }
 
     bool        IsInsTableFormatNum(bool bHTML) const
-                    { return bHTML ? m_aWebTableConfig.bInsTableFormatNum : m_aTableConfig.bInsTableFormatNum; }
+                    { return bHTML ? m_aWebTableConfig.m_bInsTableFormatNum : m_aTableConfig.m_bInsTableFormatNum; }
     void        SetInsTableFormatNum( bool bHTML, bool b )
                     { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
-                      config.bInsTableFormatNum = b;
+                      config.m_bInsTableFormatNum = b;
                       config.SetModified();}
 
     bool        IsInsTableChangeNumFormat(bool bHTML) const
-                    { return bHTML ? m_aWebTableConfig.bInsTableChangeNumFormat : m_aTableConfig.bInsTableChangeNumFormat; }
+                    { return bHTML ? m_aWebTableConfig.m_bInsTableChangeNumFormat : m_aTableConfig.m_bInsTableChangeNumFormat; }
     void        SetInsTableChangeNumFormat( bool bHTML, bool b )
                     { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
-                      config.bInsTableChangeNumFormat = b;
+                      config.m_bInsTableChangeNumFormat = b;
                       config.SetModified();}
 
     bool        IsInsTableAlignNum(bool bHTML) const
-                    { return bHTML ? m_aWebTableConfig.bInsTableAlignNum : m_aTableConfig.bInsTableAlignNum; }
+                    { return bHTML ? m_aWebTableConfig.m_bInsTableAlignNum : m_aTableConfig.m_bInsTableAlignNum; }
     void        SetInsTableAlignNum( bool bHTML, bool b )
                     { auto & config = bHTML ? m_aWebTableConfig : m_aTableConfig;
-                      config.bInsTableAlignNum = b;
+                      config.m_bInsTableAlignNum = b;
                       config.SetModified();}
 
     const SwInsertTableOptions& GetInsTableFlags(bool bHTML) const
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index cb8179062d71..3d04e1eaff69 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -832,7 +832,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                                GetOptions() : SwTOIOptions::NONE,
                                GetSortAlgorithm() );
 
-    aSortArr.clear();
+    m_aSortArr.clear();
 
     // find the first layout node for this TOX, if it only find the content
     // in his own chapter
@@ -940,12 +940,12 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
     // Sort the List of all TOC Marks and TOC Sections
     std::vector<SwTextFormatColl*> aCollArr( GetTOXForm().GetFormMax(), nullptr );
     SwNodeIndex aInsPos( *pFirstEmptyNd, 1 );
-    for( size_t nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
+    for( size_t nCnt = 0; nCnt < m_aSortArr.size(); ++nCnt )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
         // Put the Text into the TOC
-        sal_uInt16 nLvl = aSortArr[ nCnt ]->GetLevel();
+        sal_uInt16 nLvl = m_aSortArr[ nCnt ]->GetLevel();
         SwTextFormatColl* pColl = aCollArr[ nLvl ];
         if( !pColl )
         {
@@ -955,7 +955,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
 
         // Generate: Set dynamic TabStops
         SwTextNode* pTOXNd = pDoc->GetNodes().MakeTextNode( aInsPos , pColl );
-        aSortArr[ nCnt ]->pTOXNd = pTOXNd;
+        m_aSortArr[ nCnt ]->pTOXNd = pTOXNd;
 
         // Generate: Evaluate Form and insert the place holder for the
         // page number. If it is a TOX_INDEX and the SwForm IsCommaSeparated()
@@ -963,15 +963,15 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
         size_t nRange = 1;
         if(TOX_INDEX == SwTOXBase::GetType() &&
                 GetTOXForm().IsCommaSeparated() &&
-                aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
+                m_aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
+            const SwTOXMark& rMark = m_aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString& sPrimKey = rMark.GetPrimaryKey();
             const OUString& sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = nullptr;
-            while(aSortArr.size() > (nCnt + nRange)&&
-                    aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    nullptr != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
+            while(m_aSortArr.size() > (nCnt + nRange)&&
+                    m_aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
+                    nullptr != (pNextMark = &(m_aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -987,7 +987,7 @@ void SwTOXBaseSection::Update(const SfxItemSet* pAttr,
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_INDENT :
                                 sw::DefaultToxTabStopTokenHandler::TABSTOPS_RELATIVE_TO_PAGE);
         sw::ToxTextGenerator ttgn(GetTOXForm(), tabStopTokenHandler);
-        ttgn.GenerateText(GetFormat()->GetDoc(), aSortArr, nCnt, nRange);
+        ttgn.GenerateText(GetFormat()->GetDoc(), m_aSortArr, nCnt, nRange);
         nCnt += nRange - 1;
     }
 
@@ -1035,18 +1035,18 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
     SwDoc* pDoc = GetFormat()->GetDoc();
     OUString sLastDeli;
     size_t i = 0;
-    while( i < aSortArr.size() )
+    while( i < m_aSortArr.size() )
     {
         ::SetProgressState( 0, pDoc->GetDocShell() );
 
-        sal_uInt16 nLevel = aSortArr[i]->GetLevel();
+        sal_uInt16 nLevel = m_aSortArr[i]->GetLevel();
 
         // Skip AlphaDelimitter
         if( nLevel == FORM_ALPHA_DELIMITTER )
             continue;
 
-        const OUString sDeli = rIntl.GetIndexKey( aSortArr[i]->GetText(),
-                                   aSortArr[i]->GetLocale() );
+        const OUString sDeli = rIntl.GetIndexKey( m_aSortArr[i]->GetText(),
+                                   m_aSortArr[i]->GetLocale() );
 
         // Do we already have a Delimitter?
         if( !sDeli.isEmpty() && sLastDeli != sDeli )
@@ -1056,8 +1056,8 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
             {
                 std::unique_ptr<SwTOXCustom> pCst(new SwTOXCustom( TextAndReading(sDeli, OUString()),
                                                      FORM_ALPHA_DELIMITTER,
-                                                     rIntl, aSortArr[i]->GetLocale() ));
-                aSortArr.insert( aSortArr.begin() + i, std::move(pCst));
+                                                     rIntl, m_aSortArr[i]->GetLocale() ));
+                m_aSortArr.insert( m_aSortArr.begin() + i, std::move(pCst));
                 i++;
             }
             sLastDeli = sDeli;
@@ -1066,7 +1066,7 @@ void SwTOXBaseSection::InsertAlphaDelimitter( const SwTOXInternational& rIntl )
         // Skip until we get to the same or a lower Level
         do {
             i++;
-        } while (i < aSortArr.size() && aSortArr[i]->GetLevel() > nLevel);
+        } while (i < m_aSortArr.size() && m_aSortArr[i]->GetLevel() > nLevel);
     }
 }
 
@@ -1521,7 +1521,7 @@ void SwTOXBaseSection::UpdateTable( const SwTextNode* pOwnChapterNode )
 /// Calculate PageNumber and insert after formatting
 void SwTOXBaseSection::UpdatePageNum()
 {
-    if( aSortArr.empty() )
+    if( m_aSortArr.empty() )
         return ;
 
     // Insert the current PageNumber into the TOC
@@ -1534,22 +1534,22 @@ void SwTOXBaseSection::UpdatePageNum()
                               GetOptions() : SwTOIOptions::NONE,
                               GetSortAlgorithm() );
 
-    for( size_t nCnt = 0; nCnt < aSortArr.size(); ++nCnt )
+    for( size_t nCnt = 0; nCnt < m_aSortArr.size(); ++nCnt )
     {
         // Loop over all SourceNodes
 
         // process run in lines
         size_t nRange = 0;
         if(GetTOXForm().IsCommaSeparated() &&
-                aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
+                m_aSortArr[nCnt]->GetType() == TOX_SORT_INDEX)
         {
-            const SwTOXMark& rMark = aSortArr[nCnt]->pTextMark->GetTOXMark();
+            const SwTOXMark& rMark = m_aSortArr[nCnt]->pTextMark->GetTOXMark();
             const OUString& sPrimKey = rMark.GetPrimaryKey();
             const OUString& sSecKey = rMark.GetSecondaryKey();
             const SwTOXMark* pNextMark = nullptr;
-            while(aSortArr.size() > (nCnt + nRange)&&
-                    aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
-                    nullptr != (pNextMark = &(aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
+            while(m_aSortArr.size() > (nCnt + nRange)&&
+                    m_aSortArr[nCnt + nRange]->GetType() == TOX_SORT_INDEX &&
+                    nullptr != (pNextMark = &(m_aSortArr[nCnt + nRange]->pTextMark->GetTOXMark())) &&
                     pNextMark->GetPrimaryKey() == sPrimKey &&
                     pNextMark->GetSecondaryKey() == sSecKey)
                 nRange++;
@@ -1562,7 +1562,7 @@ void SwTOXBaseSection::UpdatePageNum()
             std::vector<sal_uInt16> aNums; // the PageNumber
             std::vector<SwPageDesc*> aDescs; // The PageDescriptors matching the PageNumbers
             std::vector<sal_uInt16> aMainNums; // contains page numbers of main entries
-            SwTOXSortTabBase* pSortBase = aSortArr[nRunInEntry].get();
+            SwTOXSortTabBase* pSortBase = m_aSortArr[nRunInEntry].get();
             size_t nSize = pSortBase->aTOXSources.size();
             for (size_t j = 0; j < nSize; ++j)
             {
@@ -1613,7 +1613,7 @@ void SwTOXBaseSection::UpdatePageNum()
                 }
             }
             // Insert the PageNumber into the TOC TextNode
-            const SwTOXSortTabBase* pBase = aSortArr[ nCnt ].get();
+            const SwTOXSortTabBase* pBase = m_aSortArr[ nCnt ].get();
             if(pBase->pTOXNd)
             {
                 const SwTextNode* pTextNd = pBase->pTOXNd->GetTextNode();
@@ -1625,7 +1625,7 @@ void SwTOXBaseSection::UpdatePageNum()
         }
     }
     // Delete the mapping array after setting the right PageNumber
-    aSortArr.clear();
+    m_aSortArr.clear();
 }
 
 /// Replace the PageNumber place holders. Search for the page no. in the array
@@ -1802,7 +1802,7 @@ void SwTOXBaseSection::UpdatePageNum_( SwTextNode* pNd,
 
 void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
 {
-    Range aRange(0, aSortArr.size());
+    Range aRange(0, m_aSortArr.size());
     if( TOX_INDEX == SwTOXBase::GetType() && pNew->pTextMark )
     {
         const SwTOXMark& rMark = pNew->pTextMark->GetTOXMark();
@@ -1826,7 +1826,7 @@ void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
     {
         for(short i = static_cast<short>(aRange.Min()); i < static_cast<short>(aRange.Max()); ++i)
         {
-            SwTOXSortTabBase* pOld = aSortArr[i].get();
+            SwTOXSortTabBase* pOld = m_aSortArr[i].get();
             if(*pOld == *pNew)
             {
                 if(*pOld < *pNew)
@@ -1836,7 +1836,7 @@ void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
                 else
                 {
                     // remove the old content
-                    aSortArr.erase( aSortArr.begin() + i );
+                    m_aSortArr.erase( m_aSortArr.begin() + i );
                     aRange.Max()--;
                     break;
                 }
@@ -1849,7 +1849,7 @@ void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
 
     for( i = aRange.Min(); i < aRange.Max(); ++i)
     {   // Only check for same level
-        SwTOXSortTabBase* pOld = aSortArr[i].get();
+        SwTOXSortTabBase* pOld = m_aSortArr[i].get();
         if(*pOld == *pNew)
         {
             if(TOX_AUTHORITIES != SwTOXBase::GetType())
@@ -1861,7 +1861,7 @@ void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
 
                 if(!(SwTOXSortTabBase::GetOptions() & SwTOIOptions::SameEntry))
                 {   // Own entry
-                    aSortArr.insert(aSortArr.begin() + i, std::move(pNew));
+                    m_aSortArr.insert(m_aSortArr.begin() + i, std::move(pNew));
                     return;
                 }
                 // If the own entry is already present, add it to the references list
@@ -1879,11 +1879,11 @@ void SwTOXBaseSection::InsertSorted(std::unique_ptr<SwTOXSortTabBase> pNew)
     }
     // Skip SubLevel
     while( TOX_INDEX == SwTOXBase::GetType() && i < aRange.Max() &&
-          aSortArr[i]->GetLevel() > pNew->GetLevel() )
+          m_aSortArr[i]->GetLevel() > pNew->GetLevel() )
         i++;
 
     // Insert at position i
-    aSortArr.insert(aSortArr.begin()+i, std::move(pNew));
+    m_aSortArr.insert(m_aSortArr.begin()+i, std::move(pNew));
 }
 
 /// Find Key Range and insert if possible
@@ -1909,7 +1909,7 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
 
     for( i = nMin; i < nMax; ++i)
     {
-        SwTOXSortTabBase* pBase = aSortArr[i].get();
+        SwTOXSortTabBase* pBase = m_aSortArr[i].get();
 
         if( rIntl.IsEqual( pBase->GetText(), pBase->GetLocale(),
                            aToCompare, rNew.GetLocale() )  &&
@@ -1922,18 +1922,18 @@ Range SwTOXBaseSection::GetKeyRange(const OUString& rStr, const OUString& rStrRe
                                              rNew.GetLocale() ));
         for(i = nMin; i < nMax; ++i)
         {
-            if(nLevel == aSortArr[i]->GetLevel() &&  *pKey < *(aSortArr[i]))
+            if(nLevel == m_aSortArr[i]->GetLevel() &&  *pKey < *(m_aSortArr[i]))
                 break;
         }
-        aSortArr.insert(aSortArr.begin() + i, std::move(pKey));
+        m_aSortArr.insert(m_aSortArr.begin() + i, std::move(pKey));
     }
     const long nStart = i+1;
-    const long nEnd   = aSortArr.size();
+    const long nEnd   = m_aSortArr.size();
 
     // Find end of range
     for(i = nStart; i < nEnd; ++i)
     {
-        if(aSortArr[i]->GetLevel() <= nLevel)
+        if(m_aSortArr[i]->GetLevel() <= nLevel)
         {
             return Range(nStart, i);
         }
diff --git a/sw/source/core/inc/doctxm.hxx b/sw/source/core/inc/doctxm.hxx
index 9eba84b25630..11ad51f4c398 100644
--- a/sw/source/core/inc/doctxm.hxx
+++ b/sw/source/core/inc/doctxm.hxx
@@ -33,7 +33,7 @@ struct SwTOXSortTabBase;
 
 class SwTOXBaseSection : public SwTOXBase, public SwSection
 {
-    std::vector<std::unique_ptr<SwTOXSortTabBase>> aSortArr;
+    std::vector<std::unique_ptr<SwTOXSortTabBase>> m_aSortArr;
 
     void UpdateMarks( const SwTOXInternational& rIntl,
                       const SwTextNode* pOwnChapterNode );
@@ -76,7 +76,7 @@ public:
                  const bool        _bNewTOX = false );
     void UpdatePageNum();               // insert page numbering
 
-    const std::vector<std::unique_ptr<SwTOXSortTabBase>>& GetTOXSortTabBases() const { return aSortArr; }
+    const std::vector<std::unique_ptr<SwTOXSortTabBase>>& GetTOXSortTabBases() const { return m_aSortArr; }
 
     bool SetPosAtStartEnd( SwPosition& rPos ) const;
 };
diff --git a/sw/source/uibase/config/modcfg.cxx b/sw/source/uibase/config/modcfg.cxx
index fd8f9eeef127..350f25f87b9e 100644
--- a/sw/source/uibase/config/modcfg.cxx
+++ b/sw/source/uibase/config/modcfg.cxx
@@ -1111,14 +1111,14 @@ const Sequence<OUString>& SwTableConfig::GetPropertyNames()
 SwTableConfig::SwTableConfig(bool bWeb)
     : ConfigItem(bWeb ? OUString("Office.WriterWeb/Table") : OUString("Office.Writer/Table"),
         ConfigItemMode::DelayedUpdate|ConfigItemMode::ReleaseTree)
-    , nTableHMove(0)
-    , nTableVMove(0)
-    , nTableHInsert(0)
-    , nTableVInsert(0)
-    , eTableChgMode(TableChgMode::FixedWidthChangeAbs)
-    , bInsTableFormatNum(false)
-    , bInsTableChangeNumFormat(false)
-    , bInsTableAlignNum(false)
+    , m_nTableHMove(0)
+    , m_nTableVMove(0)
+    , m_nTableHInsert(0)
+    , m_nTableVInsert(0)
+    , m_eTableChgMode(TableChgMode::FixedWidthChangeAbs)
+    , m_bInsTableFormatNum(false)
+    , m_bInsTableChangeNumFormat(false)
+    , m_bInsTableAlignNum(false)
 {
     Load();
 }
@@ -1139,14 +1139,14 @@ void SwTableConfig::ImplCommit()
     {
         switch(nProp)
         {
-            case 0 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHMove)); break;   //"Shift/Row",
-            case 1 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVMove)); break;     //"Shift/Column",
-            case 2 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableHInsert)); break;   //"Insert/Row",
-            case 3 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(nTableVInsert)); break;   //"Insert/Column",
-            case 4 : pValues[nProp] <<= static_cast<sal_Int32>(eTableChgMode); break;   //"Change/Effect",
-            case 5 : pValues[nProp] <<= bInsTableFormatNum; break;  //"Input/NumberRecognition",
-            case 6 : pValues[nProp] <<= bInsTableChangeNumFormat; break;  //"Input/NumberFormatRecognition",
-            case 7 : pValues[nProp] <<= bInsTableAlignNum; break;  //"Input/Alignment"
+            case 0 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableHMove)); break;   //"Shift/Row",
+            case 1 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableVMove)); break;     //"Shift/Column",
+            case 2 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableHInsert)); break;   //"Insert/Row",
+            case 3 : pValues[nProp] <<= static_cast<sal_Int32>(convertTwipToMm100(m_nTableVInsert)); break;   //"Insert/Column",
+            case 4 : pValues[nProp] <<= static_cast<sal_Int32>(m_eTableChgMode); break;   //"Change/Effect",
+            case 5 : pValues[nProp] <<= m_bInsTableFormatNum; break;  //"Input/NumberRecognition",
+            case 6 : pValues[nProp] <<= m_bInsTableChangeNumFormat; break;  //"Input/NumberFormatRecognition",
+            case 7 : pValues[nProp] <<= m_bInsTableAlignNum; break;  //"Input/Alignment"
         }
     }
     PutProperties(aNames, aValues);
@@ -1165,14 +1165,14 @@ void SwTableConfig::Load()
             sal_Int32 nTemp = 0;
             switch (nProp)
             {
-                case 0 : pValues[nProp] >>= nTemp; nTableHMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;  //"Shift/Row",
-                case 1 : pValues[nProp] >>= nTemp; nTableVMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;     //"Shift/Column",
-                case 2 : pValues[nProp] >>= nTemp; nTableHInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;   //"Insert/Row",
-                case 3 : pValues[nProp] >>= nTemp; nTableVInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;   //"Insert/Column",
-                case 4 : pValues[nProp] >>= nTemp; eTableChgMode = static_cast<TableChgMode>(nTemp); break;   //"Change/Effect",
-                case 5 : bInsTableFormatNum = *o3tl::doAccess<bool>(pValues[nProp]);  break;  //"Input/NumberRecognition",
-                case 6 : bInsTableChangeNumFormat = *o3tl::doAccess<bool>(pValues[nProp]); break;  //"Input/NumberFormatRecognition",
-                case 7 : bInsTableAlignNum = *o3tl::doAccess<bool>(pValues[nProp]); break;  //"Input/Alignment"
+                case 0 : pValues[nProp] >>= nTemp; m_nTableHMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;  //"Shift/Row",
+                case 1 : pValues[nProp] >>= nTemp; m_nTableVMove = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;     //"Shift/Column",
+                case 2 : pValues[nProp] >>= nTemp; m_nTableHInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;   //"Insert/Row",
+                case 3 : pValues[nProp] >>= nTemp; m_nTableVInsert = static_cast<sal_uInt16>(convertMm100ToTwip(nTemp)); break;   //"Insert/Column",
+                case 4 : pValues[nProp] >>= nTemp; m_eTableChgMode = static_cast<TableChgMode>(nTemp); break;   //"Change/Effect",
+                case 5 : m_bInsTableFormatNum = *o3tl::doAccess<bool>(pValues[nProp]);  break;  //"Input/NumberRecognition",
+                case 6 : m_bInsTableChangeNumFormat = *o3tl::doAccess<bool>(pValues[nProp]); break;  //"Input/NumberFormatRecognition",
+                case 7 : m_bInsTableAlignNum = *o3tl::doAccess<bool>(pValues[nProp]); break;  //"Input/Alignment"
             }
         }
     }