sw: prefix members of SwTableFormulaUpdate

Change-Id: Id9e18c67a4fa6e3646ac33cd616838819d1f10d8

13 files changed, 90 insertions, 90 deletions

diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 47808f86976d..97a639773f75 100644
--- a/sw/inc/hints.hxx
+++ b/sw/inc/hints.hxx
@@ -162,16 +162,16 @@ enum TableFormulaUpdateFlags { TBL_CALC = 0,
 class SwTableFormulaUpdate : public SwMsgPoolItem
 {
 public:
-    const SwTable* pTable;         ///< Pointer to the current table
+    const SwTable* m_pTable;         ///< Pointer to the current table
     union {
         const SwTable* pDelTable;  ///< Merge: Pointer to the table to be removed
         const OUString* pNewTableNm; ///< Split: the name of the new table
-    } DATA;
-    SwHistory* pHistory;
-    sal_uInt16 nSplitLine;       ///< Split: from this BaseLine on will be splitted
-    TableFormulaUpdateFlags eFlags;
-    bool bModified : 1;
-    bool bBehindSplitLine : 1;
+    } m_aData;
+    SwHistory* m_pHistory;
+    sal_uInt16 m_nSplitLine;       ///< Split: from this BaseLine on will be splitted
+    TableFormulaUpdateFlags m_eFlags;
+    bool m_bModified : 1;
+    bool m_bBehindSplitLine : 1;
 
     /** Is sent if a table should be recalculated */
     SwTableFormulaUpdate( const SwTable* );
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 5cda63a62d3a..177f66a2c25e 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -118,51 +118,51 @@ void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
     if( pNd && &pNd->GetNodes() == &pNd->GetDoc()->GetNodes() &&
         0 != ( pTableNd = pNd->FindTableNode() ))
     {
-        switch( pUpdateField->eFlags )
+        switch( pUpdateField->m_eFlags )
         {
         case TBL_CALC:
             // reset value flag
             ChgValid( false );
             break;
         case TBL_BOXNAME:
-            if( &pTableNd->GetTable() == pUpdateField->pTable )
+            if( &pTableNd->GetTable() == pUpdateField->m_pTable )
                 // use external rendering
-                PtrToBoxNm( pUpdateField->pTable );
+                PtrToBoxNm( pUpdateField->m_pTable );
             break;
         case TBL_BOXPTR:
             // internal rendering
             BoxNmToPtr( &pTableNd->GetTable() );
             break;
         case TBL_RELBOXNAME:
-            if( &pTableNd->GetTable() == pUpdateField->pTable )
+            if( &pTableNd->GetTable() == pUpdateField->m_pTable )
                 // relative rendering
-                ToRelBoxNm( pUpdateField->pTable );
+                ToRelBoxNm( pUpdateField->m_pTable );
             break;
 
         case TBL_SPLITTBL:
-            if( &pTableNd->GetTable() == pUpdateField->pTable )
+            if( &pTableNd->GetTable() == pUpdateField->m_pTable )
             {
                 sal_uInt16 nLnPos = SwTableFormula::GetLnPosInTable(
                                         pTableNd->GetTable(), GetTableBox() );
-                pUpdateField->bBehindSplitLine = USHRT_MAX != nLnPos &&
-                                            pUpdateField->nSplitLine <= nLnPos;
+                pUpdateField->m_bBehindSplitLine = USHRT_MAX != nLnPos &&
+                                            pUpdateField->m_nSplitLine <= nLnPos;
             }
             else
-                pUpdateField->bBehindSplitLine = false;
+                pUpdateField->m_bBehindSplitLine = false;
             // no break
         case TBL_MERGETBL:
-            if( pUpdateField->pHistory )
+            if( pUpdateField->m_pHistory )
             {
                 // for a history record the unchanged formula is needed
                 SwTableBoxFormula aCopy( *this );
-                pUpdateField->bModified = false;
+                pUpdateField->m_bModified = false;
                 ToSplitMergeBoxNm( *pUpdateField );
 
-                if( pUpdateField->bModified )
+                if( pUpdateField->m_bModified )
                 {
                     // external rendering
                     aCopy.PtrToBoxNm( &pTableNd->GetTable() );
-                    pUpdateField->pHistory->Add(
+                    pUpdateField->m_pHistory->Add(
                         &aCopy,
                         &aCopy,
                         pNd->FindTableBoxStartNode()->GetIndex());
diff --git a/sw/source/core/attr/hints.cxx b/sw/source/core/attr/hints.cxx
index 8bd3359b24ea..abbf1b0c70cf 100644
--- a/sw/source/core/attr/hints.cxx
+++ b/sw/source/core/attr/hints.cxx
@@ -63,12 +63,12 @@ SwDocPosUpdate::SwDocPosUpdate( const SwTwips nDcPos )
 
 SwTableFormulaUpdate::SwTableFormulaUpdate( const SwTable* pNewTable )
     : SwMsgPoolItem( RES_TABLEFML_UPDATE ),
-    pTable( pNewTable ), pHistory( 0 ), nSplitLine( USHRT_MAX ),
-    eFlags( TBL_CALC )
+    m_pTable( pNewTable ), m_pHistory( 0 ), m_nSplitLine( USHRT_MAX ),
+    m_eFlags( TBL_CALC )
 {
-    DATA.pDelTable = 0;
-    bModified = bBehindSplitLine = false;
-    OSL_ENSURE( pTable, "No Table pointer" );
+    m_aData.pDelTable = 0;
+    m_bModified = m_bBehindSplitLine = false;
+    OSL_ENSURE( m_pTable, "No Table pointer" );
 }
 
 SwAutoFormatGetDocNode::SwAutoFormatGetDocNode( const SwNodes* pNds )
diff --git a/sw/source/core/doc/DocumentFieldsManager.cxx b/sw/source/core/doc/DocumentFieldsManager.cxx
index cec7dedc750a..6953c534ecf7 100644
--- a/sw/source/core/doc/DocumentFieldsManager.cxx
+++ b/sw/source/core/doc/DocumentFieldsManager.cxx
@@ -607,34 +607,34 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
                             0 == ( pTableNd = rTextNd.FindTableNode() ) )
                             continue;
 
-                        switch( pUpdateField->eFlags )
+                        switch( pUpdateField->m_eFlags )
                         {
                         case TBL_CALC:
                             // re-set the value flag
                             // JP 17.06.96: internal representation of all formulas
                             //              (reference to other table!!!)
                             if( nsSwExtendedSubType::SUB_CMD & pField->GetSubType() )
-                                pField->PtrToBoxNm( pUpdateField->pTable );
+                                pField->PtrToBoxNm( pUpdateField->m_pTable );
                             else
                                 pField->ChgValid( false );
                             break;
                         case TBL_BOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTableNd->GetTable() == pUpdateField->pTable )
+                            if( &pTableNd->GetTable() == pUpdateField->m_pTable )
                                 // to the external representation
-                                pField->PtrToBoxNm( pUpdateField->pTable );
+                                pField->PtrToBoxNm( pUpdateField->m_pTable );
                             break;
                         case TBL_BOXPTR:
                             // to the internal representation
                             // JP 17.06.96: internal representation on all formulas
                             //              (reference to other table!!!)
-                            pField->BoxNmToPtr( pUpdateField->pTable );
+                            pField->BoxNmToPtr( pUpdateField->m_pTable );
                             break;
                         case TBL_RELBOXNAME:
                             // is &m_rDoc the wanted table?
-                            if( &pTableNd->GetTable() == pUpdateField->pTable )
+                            if( &pTableNd->GetTable() == pUpdateField->m_pTable )
                                 // to the relative representation
-                                pField->ToRelBoxNm( pUpdateField->pTable );
+                                pField->ToRelBoxNm( pUpdateField->m_pTable );
                             break;
                         default:
                             break;
@@ -664,7 +664,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
 
     // all fields/boxes are now invalid, so we can start to calculate
     if( pHt && ( RES_TABLEFML_UPDATE != pHt->Which() ||
-                TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->eFlags ))
+                TBL_CALC != static_cast<SwTableFormulaUpdate*>(pHt)->m_eFlags ))
         return ;
 
     SwCalc* pCalc = 0;
@@ -696,7 +696,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
 
                     // if &m_rDoc field is not in the to-be-updated table, skip it
                     if( pHt && &pTableNd->GetTable() !=
-                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->m_pTable )
                         continue;
 
                     if( !pCalc )
@@ -761,7 +761,7 @@ void DocumentFieldsManager::UpdateTableFields( SfxPoolItem* pHt )
             {
                 const SwTableNode* pTableNd = pBox->GetSttNd()->FindTableNode();
                 if( !pHt || &pTableNd->GetTable() ==
-                                            static_cast<SwTableFormulaUpdate*>(pHt)->pTable )
+                                            static_cast<SwTableFormulaUpdate*>(pHt)->m_pTable )
                 {
                     double nValue;
                     if( !pCalc )
diff --git a/sw/source/core/doc/docsort.cxx b/sw/source/core/doc/docsort.cxx
index 9c4dd17bd4cd..58bb14e6f6fb 100644
--- a/sw/source/core/doc/docsort.cxx
+++ b/sw/source/core/doc/docsort.cxx
@@ -520,7 +520,7 @@ bool SwDoc::SortTable(const SwSelBoxes& rBoxes, const SwSortOptions& rOpt)
 
     // Switch to relative Formulas
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.eFlags = TBL_RELBOXNAME;
+    aMsgHint.m_eFlags = TBL_RELBOXNAME;
     getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // Table as a flat array structure
diff --git a/sw/source/core/doc/tblcpy.cxx b/sw/source/core/doc/tblcpy.cxx
index 8a4e80a09b1a..a9d0be95aa2e 100644
--- a/sw/source/core/doc/tblcpy.cxx
+++ b/sw/source/core/doc/tblcpy.cxx
@@ -693,7 +693,7 @@ bool SwTable::InsNewTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes
     {
         // Change table formulas into relative representation
         SwTableFormulaUpdate aMsgHint( &rCpyTable );
-        aMsgHint.eFlags = TBL_RELBOXNAME;
+        aMsgHint.m_eFlags = TBL_RELBOXNAME;
         pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
@@ -743,7 +743,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwNodeIndex& rSttBox,
     {
         // Convert Table formulas to their relative representation
         SwTableFormulaUpdate aMsgHint( &rCpyTable );
-        aMsgHint.eFlags = TBL_RELBOXNAME;
+        aMsgHint.m_eFlags = TBL_RELBOXNAME;
         pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
@@ -987,7 +987,7 @@ bool SwTable::InsTable( const SwTable& rCpyTable, const SwSelBoxes& rSelBoxes,
     {
         // Convert Table formulas to their relative representation
         SwTableFormulaUpdate aMsgHint( &rCpyTable );
-        aMsgHint.eFlags = TBL_RELBOXNAME;
+        aMsgHint.m_eFlags = TBL_RELBOXNAME;
         pCpyDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
diff --git a/sw/source/core/doc/tblrwcl.cxx b/sw/source/core/doc/tblrwcl.cxx
index 8be5172a4bf5..520c9c8669b0 100644
--- a/sw/source/core/doc/tblrwcl.cxx
+++ b/sw/source/core/doc/tblrwcl.cxx
@@ -2033,7 +2033,7 @@ bool SwTable::CopyHeadlineIntoTable( SwTableNode& rTableNd )
     {
         // Convert Table formulas to their relative representation
         SwTableFormulaUpdate aMsgHint( this );
-        aMsgHint.eFlags = TBL_RELBOXNAME;
+        aMsgHint.m_eFlags = TBL_RELBOXNAME;
         GetFrameFormat()->GetDoc()->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
@@ -2122,7 +2122,7 @@ bool SwTable::MakeCopy( SwDoc* pInsDoc, const SwPosition& rPos,
     {
         // Conver the Table formulas to their relative representation
         SwTableFormulaUpdate aMsgHint( this );
-        aMsgHint.eFlags = TBL_RELBOXNAME;
+        aMsgHint.m_eFlags = TBL_RELBOXNAME;
         pSrcDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 68aa2f4c4de3..66713a22fc96 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1461,7 +1461,7 @@ bool SwDoc::TableToText( const SwTableNode* pTableNd, sal_Unicode cCh )
     }
 
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.eFlags = TBL_BOXNAME;
+    aMsgHint.m_eFlags = TBL_BOXNAME;
     getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool bRet = GetNodes().TableToText( aRg, cCh, pUndo );
@@ -1730,7 +1730,7 @@ bool SwDoc::InsertCol( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
         SwTableFormulaUpdate aMsgHint( &rTable );
-        aMsgHint.eFlags = TBL_BOXPTR;
+        aMsgHint.m_eFlags = TBL_BOXPTR;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         bRet = rTable.InsertCol( this, rBoxes, nCnt, bBehind );
@@ -1792,7 +1792,7 @@ bool SwDoc::InsertRow( const SwSelBoxes& rBoxes, sal_uInt16 nCnt, bool bBehind )
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
         SwTableFormulaUpdate aMsgHint( &rTable );
-        aMsgHint.eFlags = TBL_BOXPTR;
+        aMsgHint.m_eFlags = TBL_BOXPTR;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         bRet = rTable.InsertRow( this, rBoxes, nCnt, bBehind );
@@ -2125,7 +2125,7 @@ bool SwDoc::DeleteRowCol( const SwSelBoxes& rBoxes, bool bColumn )
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
         SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-        aMsgHint.eFlags = TBL_BOXPTR;
+        aMsgHint.m_eFlags = TBL_BOXPTR;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (rTable.IsNewModel())
@@ -2199,7 +2199,7 @@ bool SwDoc::SplitTable( const SwSelBoxes& rBoxes, bool bVert, sal_uInt16 nCnt,
         ::sw::UndoGuard const undoGuard(GetIDocumentUndoRedo());
 
         SwTableFormulaUpdate aMsgHint( &rTable );
-        aMsgHint.eFlags = TBL_BOXPTR;
+        aMsgHint.m_eFlags = TBL_BOXPTR;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if (bVert)
@@ -2312,7 +2312,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
 
         // Merge them
         SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-        aMsgHint.eFlags = TBL_BOXPTR;
+        aMsgHint.m_eFlags = TBL_BOXPTR;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
         if( pTableNd->GetTable().Merge( this, aBoxes, aMerged, pMergeBox, pUndo ))
@@ -3148,7 +3148,7 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
     SwHistory aHistory;
     if (GetIDocumentUndoRedo().DoesUndo())
     {
-        aMsgHint.pHistory = &aHistory;
+        aMsgHint.m_pHistory = &aHistory;
     }
 
     {
@@ -3163,12 +3163,12 @@ bool SwDoc::SplitTable( const SwPosition& rPos, sal_uInt16 eHdlnMode,
                 pLine = pLine->GetUpper()->GetUpper();
 
             // pLine contains the top-level Line now
-            aMsgHint.nSplitLine = rTable.GetTabLines().GetPos( pLine );
+            aMsgHint.m_nSplitLine = rTable.GetTabLines().GetPos( pLine );
         }
 
         OUString sNewTableNm( GetUniqueTableName() );
-        aMsgHint.DATA.pNewTableNm = &sNewTableNm;
-        aMsgHint.eFlags = TBL_SPLITTBL;
+        aMsgHint.m_aData.pNewTableNm = &sNewTableNm;
+        aMsgHint.m_eFlags = TBL_SPLITTBL;
         getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
     }
 
@@ -3525,9 +3525,9 @@ bool SwDoc::MergeTable( const SwPosition& rPos, bool bWithPrev, sal_uInt16 nMode
 
     // Adapt all "TableFormulas"
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.DATA.pDelTable = &pDelTableNd->GetTable();
-    aMsgHint.eFlags = TBL_MERGETBL;
-    aMsgHint.pHistory = pHistory;
+    aMsgHint.m_aData.pDelTable = &pDelTableNd->GetTable();
+    aMsgHint.m_eFlags = TBL_MERGETBL;
+    aMsgHint.m_pHistory = pHistory;
     getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // The actual merge
@@ -3986,7 +3986,7 @@ bool SwDoc::SetColRowWidthHeight( SwTableBox& rAktBox, sal_uInt16 eType,
         return false;
 
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.eFlags = TBL_BOXPTR;
+    aMsgHint.m_eFlags = TBL_BOXPTR;
     getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     bool const bUndo(GetIDocumentUndoRedo().DoesUndo());
diff --git a/sw/source/core/edit/edtab.cxx b/sw/source/core/edit/edtab.cxx
index 029bab7ecdcb..ce7939436e32 100644
--- a/sw/source/core/edit/edtab.cxx
+++ b/sw/source/core/edit/edtab.cxx
@@ -322,7 +322,7 @@ bool SwEditShell::GetTableBoxFormulaAttrs( SfxItemSet& rSet ) const
             const SwTable& rTable = pSelBox->GetSttNd()->FindTableNode()->GetTable();
 
             SwTableFormulaUpdate aTableUpdate( &rTable );
-            aTableUpdate.eFlags = TBL_BOXNAME;
+            aTableUpdate.m_eFlags = TBL_BOXNAME;
             static_cast<SwDoc*>(GetDoc())->getIDocumentFieldsAccess().UpdateTableFields( &aTableUpdate );
 
             rSet.Put( pTableFormat->GetAttrSet() );
diff --git a/sw/source/core/fields/cellfml.cxx b/sw/source/core/fields/cellfml.cxx
index f4a5c8589f00..b369311d2c64 100644
--- a/sw/source/core/fields/cellfml.cxx
+++ b/sw/source/core/fields/cellfml.cxx
@@ -1066,21 +1066,21 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
         if( pFnd )
             pTable = pFnd;
 
-        if( TBL_MERGETBL == rTableUpd.eFlags )
+        if( TBL_MERGETBL == rTableUpd.m_eFlags )
         {
             if( pFnd )
             {
-                if( pFnd == rTableUpd.DATA.pDelTable )
+                if( pFnd == rTableUpd.m_aData.pDelTable )
                 {
-                    if( rTableUpd.pTable != &rTable ) // not the current one
-                        rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + "."; // set new table name
-                    rTableUpd.bModified = true;
+                    if( rTableUpd.m_pTable != &rTable ) // not the current one
+                        rNewStr += rTableUpd.m_pTable->GetFrameFormat()->GetName() + "."; // set new table name
+                    rTableUpd.m_bModified = true;
                 }
-                else if( pFnd != rTableUpd.pTable ||
-                    ( rTableUpd.pTable != &rTable && &rTable != rTableUpd.DATA.pDelTable))
+                else if( pFnd != rTableUpd.m_pTable ||
+                    ( rTableUpd.m_pTable != &rTable && &rTable != rTableUpd.m_aData.pDelTable))
                     rNewStr += sTableNm + "."; // keep table name
                 else
-                    rTableUpd.bModified = true;
+                    rTableUpd.m_bModified = true;
             }
             else
                 rNewStr += sTableNm + ".";     // keep table name
@@ -1121,7 +1121,7 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
     if( pTable->GetTabSortBoxes().find( pSttBox ) == pTable->GetTabSortBoxes().end() )
         pSttBox = 0;
 
-    if( TBL_SPLITTBL == rTableUpd.eFlags )
+    if( TBL_SPLITTBL == rTableUpd.m_eFlags )
     {
         // Where are the boxes - in the old or in the new table?
         bool bInNewTable = false;
@@ -1133,21 +1133,21 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
                     nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
 
             if( USHRT_MAX != nSttLnPos && USHRT_MAX != nEndLnPos &&
-                ((rTableUpd.nSplitLine <= nSttLnPos) ==
-                (rTableUpd.nSplitLine <= nEndLnPos)) )
+                ((rTableUpd.m_nSplitLine <= nSttLnPos) ==
+                (rTableUpd.m_nSplitLine <= nEndLnPos)) )
             {
                 // stay in same table
-                bInNewTable = rTableUpd.nSplitLine <= nEndLnPos &&
-                                    pTable == rTableUpd.pTable;
+                bInNewTable = rTableUpd.m_nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.m_pTable;
             }
             else
             {
                 // this is definitely an invalid formula, also mark as modified for Undo
-                rTableUpd.bModified = true;
+                rTableUpd.m_bModified = true;
                 if( pEndBox )
                     bInNewTable = USHRT_MAX != nEndLnPos &&
-                                    rTableUpd.nSplitLine <= nEndLnPos &&
-                                    pTable == rTableUpd.pTable;
+                                    rTableUpd.m_nSplitLine <= nEndLnPos &&
+                                    pTable == rTableUpd.m_pTable;
             }
         }
         else
@@ -1155,25 +1155,25 @@ void SwTableFormula::_SplitMergeBoxNm( const SwTable& rTable, OUString& rNewStr,
             sal_uInt16 nSttLnPos = SwTableFormula::GetLnPosInTable( *pTable, pSttBox );
             // Put it in the new table?
             bInNewTable = USHRT_MAX != nSttLnPos &&
-                            rTableUpd.nSplitLine <= nSttLnPos &&
-                            pTable == rTableUpd.pTable;
+                            rTableUpd.m_nSplitLine <= nSttLnPos &&
+                            pTable == rTableUpd.m_pTable;
         }
 
         // formula goes into new table
-        if( rTableUpd.bBehindSplitLine )
+        if( rTableUpd.m_bBehindSplitLine )
         {
             if( !bInNewTable )
             {
-                rTableUpd.bModified = true;
-                rNewStr += rTableUpd.pTable->GetFrameFormat()->GetName() + ".";
+                rTableUpd.m_bModified = true;
+                rNewStr += rTableUpd.m_pTable->GetFrameFormat()->GetName() + ".";
             }
             else if( !sTableNm.isEmpty() )
                 rNewStr += sTableNm + ".";
         }
         else if( bInNewTable )
         {
-            rTableUpd.bModified = true;
-            rNewStr += *rTableUpd.DATA.pNewTableNm + ".";
+            rTableUpd.m_bModified = true;
+            rNewStr += *rTableUpd.m_aData.pNewTableNm + ".";
         }
         else if( !sTableNm.isEmpty() )
             rNewStr += sTableNm + ".";
@@ -1194,7 +1194,7 @@ void SwTableFormula::ToSplitMergeBoxNm( SwTableFormulaUpdate& rTableUpd )
     if( pNd && 0 != ( pNd = pNd->FindTableNode() ))
         pTable = &static_cast<const SwTableNode*>(pNd)->GetTable();
     else
-        pTable = rTableUpd.pTable;
+        pTable = rTableUpd.m_pTable;
 
     m_sFormula = ScanString( &SwTableFormula::_SplitMergeBoxNm, *pTable, static_cast<void*>(&rTableUpd) );
     m_eNmType = INTRNL_NAME;
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx
index 073cdf67121e..b74a6cff4e81 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -1351,7 +1351,7 @@ void _InsertCnt( SwLayoutFrm *pLay, SwDoc *pDoc,
             // needs to clean up. To keep table formulas correct, change
             // all table formulas to internal (BOXPTR) representation.
             SwTableFormulaUpdate aMsgHint( &pTableNode->GetTable() );
-            aMsgHint.eFlags = TBL_BOXPTR;
+            aMsgHint.m_eFlags = TBL_BOXPTR;
             pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
             pTableNode->GetTable().GCLines();
 
diff --git a/sw/source/core/undo/rolbck.cxx b/sw/source/core/undo/rolbck.cxx
index 857725ffcb6b..c1d3e425801b 100644
--- a/sw/source/core/undo/rolbck.cxx
+++ b/sw/source/core/undo/rolbck.cxx
@@ -91,7 +91,7 @@ SwHistorySetFormat::SwHistorySetFormat( const SfxPoolItem* pFormatHt, sal_uLong
                     if (pTableNode)
                     {
                         SwTableFormulaUpdate aMsgHint( &pTableNode->GetTable() );
-                        aMsgHint.eFlags = TBL_BOXNAME;
+                        aMsgHint.m_eFlags = TBL_BOXNAME;
                         rNew.ChgDefinedIn( rOld.GetDefinedIn() );
                         rNew.ChangeState( &aMsgHint );
                     }
@@ -729,7 +729,7 @@ SwHistorySetAttrSet::SwHistorySetAttrSet( const SfxItemSet& rSet,
                                 {
                                     SwTableFormulaUpdate aMsgHint(
                                         &pTableNode->GetTable() );
-                                    aMsgHint.eFlags = TBL_BOXNAME;
+                                    aMsgHint.m_eFlags = TBL_BOXNAME;
                                     rNew.ChgDefinedIn( rOld.GetDefinedIn() );
                                     rNew.ChangeState( &aMsgHint );
                                 }
diff --git a/sw/source/core/undo/untbl.cxx b/sw/source/core/undo/untbl.cxx
index 1473dfa9bb49..edb77103c3b1 100644
--- a/sw/source/core/undo/untbl.cxx
+++ b/sw/source/core/undo/untbl.cxx
@@ -903,7 +903,7 @@ sal_uInt16 _SaveTable::AddFormat( SwFrameFormat* pFormat, bool bIsLine )
             if (m_pSwTable && m_bSaveFormula)
             {
                 SwTableFormulaUpdate aMsgHint(m_pSwTable);
-                aMsgHint.eFlags = TBL_BOXNAME;
+                aMsgHint.m_eFlags = TBL_BOXNAME;
                 SwTableBoxFormula* pFormulaItem = const_cast<SwTableBoxFormula*>(static_cast<const SwTableBoxFormula*>(pItem));
                 pFormulaItem->ChgDefinedIn( pFormat );
                 pFormulaItem->ChangeState( &aMsgHint );
@@ -1677,7 +1677,7 @@ void SwUndoTableNdsChg::UndoImpl(::sw::UndoRedoContext & rContext)
     OSL_ENSURE( pTableNd, "no TableNode" );
 
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.eFlags = TBL_BOXPTR;
+    aMsgHint.m_eFlags = TBL_BOXPTR;
     rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     CHECK_TABLE( pTableNd->GetTable() )
@@ -1861,7 +1861,7 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
         if( USHRT_MAX == nSetColType )
         {
             SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-            aMsgHint.eFlags = TBL_BOXPTR;
+            aMsgHint.m_eFlags = TBL_BOXPTR;
             rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
             SwTable &rTable = pTableNd->GetTable();
             if( nMax > nMin && rTable.IsNewModel() )
@@ -1873,7 +1873,7 @@ void SwUndoTableNdsChg::RedoImpl(::sw::UndoRedoContext & rContext)
             SwTable& rTable = pTableNd->GetTable();
 
             SwTableFormulaUpdate aMsgHint( &rTable );
-            aMsgHint.eFlags = TBL_BOXPTR;
+            aMsgHint.m_eFlags = TBL_BOXPTR;
             rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
             SwTableBox* pBox = rTable.GetTableBox( nCurrBox );
@@ -1952,7 +1952,7 @@ void SwUndoTableMerge::UndoImpl(::sw::UndoRedoContext & rContext)
     OSL_ENSURE( pTableNd, "no TableNode" );
 
     SwTableFormulaUpdate aMsgHint( &pTableNd->GetTable() );
-    aMsgHint.eFlags = TBL_BOXPTR;
+    aMsgHint.m_eFlags = TBL_BOXPTR;
     rDoc.getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     _FndBox aTmpBox( 0, 0 );
@@ -2907,7 +2907,7 @@ void SwUndoSplitTable::UndoImpl(::sw::UndoRedoContext & rContext)
     SwTable& rTable = pTableNd->GetTable();
 
     SwTableFormulaUpdate aMsgHint( &rTable );
-    aMsgHint.eFlags = TBL_BOXPTR;
+    aMsgHint.m_eFlags = TBL_BOXPTR;
     pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     switch( nMode )
@@ -3022,7 +3022,7 @@ void SwUndoMergeTable::UndoImpl(::sw::UndoRedoContext & rContext)
     SwTable* pTable = &pTableNd->GetTable();
 
     SwTableFormulaUpdate aMsgHint( pTable );
-    aMsgHint.eFlags = TBL_BOXPTR;
+    aMsgHint.m_eFlags = TBL_BOXPTR;
     pDoc->getIDocumentFieldsAccess().UpdateTableFields( &aMsgHint );
 
     // get lines for layout update