From 163b3d7ca0056d16b300b68d7e831874b6cf393a Mon Sep 17 00:00:00 2001 From: Miklos Vajna Date: Tue, 27 Oct 2015 08:42:35 +0100 Subject: sw: prefix members of SwTableFormulaUpdate Change-Id: Id9e18c67a4fa6e3646ac33cd616838819d1f10d8 --- sw/source/core/attr/cellatr.cxx | 26 +++++++++++++------------- sw/source/core/attr/hints.cxx | 10 +++++----- 2 files changed, 18 insertions(+), 18 deletions(-) (limited to 'sw/source/core/attr') 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 ) -- cgit v1.2.3