sw/inc/hints.hxx | 14 +++---
sw/inc/node.hxx | 6 +-
sw/inc/swtable.hxx | 16 +++----
sw/source/core/attr/cellatr.cxx | 26 +++++------
sw/source/core/attr/hints.cxx | 10 ++--
sw/source/core/doc/DocumentFieldsManager.cxx | 20 ++++-----
sw/source/core/doc/docsort.cxx | 2
sw/source/core/doc/tblcpy.cxx | 6 +-
sw/source/core/doc/tblrwcl.cxx | 4 -
sw/source/core/docnode/ndtbl.cxx | 44 +++++++++----------
sw/source/core/edit/edtab.cxx | 2
sw/source/core/fields/cellfml.cxx | 48 ++++++++++-----------
sw/source/core/inc/sectfrm.hxx | 34 +++++++--------
sw/source/core/layout/flowfrm.cxx | 4 -
sw/source/core/layout/frmtool.cxx | 2
sw/source/core/layout/sectfrm.cxx | 60 +++++++++++++--------------
sw/source/core/table/swtable.cxx | 10 ++--
sw/source/core/undo/rolbck.cxx | 4 -
sw/source/core/undo/untbl.cxx | 14 +++---
19 files changed, 163 insertions(+), 163 deletions(-)
New commits:
commit 60cf585a487966d1fe25ef2607ff601480be9cdd
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Oct 27 08:43:03 2015 +0100
sw: prefix members of SwSectionFrm
Change-Id: I962ee5dc35d5b33c751890ff9d56850897c7d080
diff --git a/sw/source/core/inc/sectfrm.hxx b/sw/source/core/inc/sectfrm.hxx
index 208c325..9f264eb 100644
--- a/sw/source/core/inc/sectfrm.hxx
+++ b/sw/source/core/inc/sectfrm.hxx
@@ -36,12 +36,12 @@ class SwLayouter;
class SwSectionFrm: public SwLayoutFrm, public SwFlowFrm
{
- SwSection* pSection;
- bool bFootnoteAtEnd; // footnotes at the end of section
- bool bEndnAtEnd; // endnotes at the end of section
- bool bContentLock; // content locked
- bool bOwnFootnoteNum; // special numbering of footnotes
- bool bFootnoteLock; // ftn, don't leave this section bwd
+ SwSection* m_pSection;
+ bool m_bFootnoteAtEnd; // footnotes at the end of section
+ bool m_bEndnAtEnd; // endnotes at the end of section
+ bool m_bContentLock; // content locked
+ bool m_bOwnFootnoteNum; // special numbering of footnotes
+ bool m_bFootnoteLock; // ftn, don't leave this section bwd
void _UpdateAttr( const SfxPoolItem*, const SfxPoolItem*, sal_uInt8 &,
SwAttrSetChg *pa = 0, SwAttrSetChg *pb = 0 );
@@ -82,8 +82,8 @@ public:
SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 );
inline const SwContentFrm *FindLastContent( sal_uInt8 nMode = 0 ) const;
- inline SwSection* GetSection() { return pSection; }
- inline const SwSection* GetSection() const { return pSection; }
+ inline SwSection* GetSection() { return m_pSection; }
+ inline const SwSection* GetSection() const { return m_pSection; }
inline void ColLock() { mbColLocked = true; }
inline void ColUnlock() { mbColLocked = false; }
@@ -111,7 +111,7 @@ public:
*/
bool ToMaximize( bool bCheckFollow ) const;
inline bool _ToMaximize() const
- { if( !pSection ) return false; return ToMaximize( false ); }
+ { if( !m_pSection ) return false; return ToMaximize( false ); }
bool MoveAllowed( const SwFrm* ) const;
bool CalcMinDiff( SwTwips& rMinDiff ) const;
@@ -140,17 +140,17 @@ public:
virtual void dumpAsXmlAttributes(xmlTextWriterPtr writer) const override;
- bool IsFootnoteAtEnd() const { return bFootnoteAtEnd; }
- bool IsEndnAtEnd() const { return bEndnAtEnd; }
- bool IsAnyNoteAtEnd() const { return bFootnoteAtEnd || bEndnAtEnd; }
+ bool IsFootnoteAtEnd() const { return m_bFootnoteAtEnd; }
+ bool IsEndnAtEnd() const { return m_bEndnAtEnd; }
+ bool IsAnyNoteAtEnd() const { return m_bFootnoteAtEnd || m_bEndnAtEnd; }
- void SetContentLock( bool bNew ) { bContentLock = bNew; }
- bool IsContentLocked() const { return bContentLock; }
+ void SetContentLock( bool bNew ) { m_bContentLock = bNew; }
+ bool IsContentLocked() const { return m_bContentLock; }
- bool IsOwnFootnoteNum() const { return bOwnFootnoteNum; }
+ bool IsOwnFootnoteNum() const { return m_bOwnFootnoteNum; }
- void SetFootnoteLock( bool bNew ) { bFootnoteLock = bNew; }
- bool IsFootnoteLock() const { return bFootnoteLock; }
+ void SetFootnoteLock( bool bNew ) { m_bFootnoteLock = bNew; }
+ bool IsFootnoteLock() const { return m_bFootnoteLock; }
DECL_FIXEDMEMPOOL_NEWDEL(SwSectionFrm)
};
diff --git a/sw/source/core/layout/flowfrm.cxx
b/sw/source/core/layout/flowfrm.cxx
index 99376c4..c17391b 100644
--- a/sw/source/core/layout/flowfrm.cxx
+++ b/sw/source/core/layout/flowfrm.cxx
@@ -663,10 +663,10 @@ SwSectionFrm* SwSectionFrm::FindMaster() const
{
OSL_ENSURE( IsFollow(), "SwSectionFrm::FindMaster(): !IsFollow" );
- if (!pSection)
+ if (!m_pSection)
return nullptr;
- SwIterator<SwSectionFrm,SwFormat> aIter( *pSection->GetFormat() );
+ SwIterator<SwSectionFrm,SwFormat> aIter( *m_pSection->GetFormat() );
SwSectionFrm* pSect = aIter.First();
while ( pSect )
{
diff --git a/sw/source/core/layout/sectfrm.cxx
b/sw/source/core/layout/sectfrm.cxx
index 21a67dc..898b85b 100644
--- a/sw/source/core/layout/sectfrm.cxx
+++ b/sw/source/core/layout/sectfrm.cxx
@@ -43,12 +43,12 @@
SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib )
: SwLayoutFrm( rSect.GetFormat(), pSib )
, SwFlowFrm( static_cast<SwFrm&>(*this) )
- , pSection( &rSect )
- , bFootnoteAtEnd(false)
- , bEndnAtEnd(false)
- , bContentLock(false)
- , bOwnFootnoteNum(false)
- , bFootnoteLock(false)
+ , m_pSection( &rSect )
+ , m_bFootnoteAtEnd(false)
+ , m_bEndnAtEnd(false)
+ , m_bContentLock(false)
+ , m_bOwnFootnoteNum(false)
+ , m_bFootnoteLock(false)
{
mnFrmType = FRM_SECTION;
@@ -59,12 +59,12 @@ SwSectionFrm::SwSectionFrm( SwSection &rSect, SwFrm* pSib )
SwSectionFrm::SwSectionFrm( SwSectionFrm &rSect, bool bMaster ) :
SwLayoutFrm( rSect.GetFormat(), rSect.getRootFrm() ),
SwFlowFrm( (SwFrm&)*this ),
- pSection( rSect.GetSection() ),
- bFootnoteAtEnd( rSect.IsFootnoteAtEnd() ),
- bEndnAtEnd( rSect.IsEndnAtEnd() ),
- bContentLock( false ),
- bOwnFootnoteNum( false ),
- bFootnoteLock( false )
+ m_pSection( rSect.GetSection() ),
+ m_bFootnoteAtEnd( rSect.IsFootnoteAtEnd() ),
+ m_bEndnAtEnd( rSect.IsEndnAtEnd() ),
+ m_bContentLock( false ),
+ m_bOwnFootnoteNum( false ),
+ m_bFootnoteLock( false )
{
mnFrmType = FRM_SECTION;
@@ -200,12 +200,12 @@ void SwSectionFrm::DelEmpty( bool bRemove )
{ // If we already were half dead before this DelEmpty,
// we are likely in the list and have to remove us from
// it
- if( !pSection && getRootFrm() )
+ if( !m_pSection && getRootFrm() )
getRootFrm()->RemoveFromList( this );
}
else if( getRootFrm() )
getRootFrm()->InsertEmptySct( this );
- pSection = NULL; // like this a reanimation is virtually impossible
though
+ m_pSection = NULL; // like this a reanimation is virtually impossible
though
}
}
@@ -692,7 +692,7 @@ void SwSectionFrm::MakeAll(vcl::RenderContext*
/*pRenderContext*/)
{
if ( IsJoinLocked() || IsColLocked() || StackHack::IsLocked() ||
StackHack::Count() > 50 )
return;
- if( !pSection ) // Via DelEmpty
+ if( !m_pSection ) // Via DelEmpty
{
#ifdef DBG_UTIL
OSL_ENSURE( getRootFrm()->IsInDelList( this ), "SectionFrm without
Section" );
@@ -744,7 +744,7 @@ void SwSectionFrm::MakeAll(vcl::RenderContext*
/*pRenderContext*/)
#endif
SwLayoutFrm::MakeAll(getRootFrm()->GetCurrShell()->GetOut());
UnlockJoin();
- if( pSection && IsSuperfluous() )
+ if( m_pSection && IsSuperfluous() )
DelEmpty( false );
}
@@ -756,7 +756,7 @@ bool SwSectionFrm::ShouldBwdMoved( SwLayoutFrm *, bool ,
bool & )
const SwSectionFormat* SwSectionFrm::_GetEndSectFormat() const
{
- const SwSectionFormat *pFormat = pSection->GetFormat();
+ const SwSectionFormat *pFormat = m_pSection->GetFormat();
while( !pFormat->GetEndAtTextEnd().IsAtEnd() )
{
if( dynamic_cast< const SwSectionFormat *>(
pFormat->GetRegisteredIn()) != nullptr )
@@ -805,7 +805,7 @@ SwContentFrm *SwSectionFrm::FindLastContent( sal_uInt8
nMode )
if( nMode )
{
const SwSectionFormat *pFormat = IsEndnAtEnd() ? GetEndSectFormat() :
- pSection->GetFormat();
+ m_pSection->GetFormat();
do {
while( pSect->HasFollow() )
pSect = pSect->GetFollow();
@@ -1212,7 +1212,7 @@ class ExtraFormatToPositionObjs
/// "formats" the frame; Frm and PrtArea
void SwSectionFrm::Format( vcl::RenderContext* pRenderContext, const
SwBorderAttrs *pAttr )
{
- if( !pSection ) // via DelEmpty
+ if( !m_pSection ) // via DelEmpty
{
#ifdef DBG_UTIL
OSL_ENSURE( getRootFrm()->IsInDelList( this ), "SectionFrm without
Section" );
@@ -2203,9 +2203,9 @@ SwFrm* SwFrm::_GetIndNext()
bool SwSectionFrm::IsDescendantFrom( const SwSectionFormat* pFormat ) const
{
- if( !pSection || !pFormat )
+ if( !m_pSection || !pFormat )
return false;
- const SwSectionFormat *pMyFormat = pSection->GetFormat();
+ const SwSectionFormat *pMyFormat = m_pSection->GetFormat();
while( pFormat != pMyFormat )
{
if( dynamic_cast< const SwSectionFormat *>(
pMyFormat->GetRegisteredIn()) != nullptr )
@@ -2220,10 +2220,10 @@ void SwSectionFrm::CalcFootnoteAtEndFlag()
{
SwSectionFormat *pFormat = GetSection()->GetFormat();
sal_uInt16 nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue();
- bFootnoteAtEnd = FTNEND_ATPGORDOCEND != nVal;
- bOwnFootnoteNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
+ m_bFootnoteAtEnd = FTNEND_ATPGORDOCEND != nVal;
+ m_bOwnFootnoteNum = FTNEND_ATTXTEND_OWNNUMSEQ == nVal ||
FTNEND_ATTXTEND_OWNNUMANDFMT == nVal;
- while( !bFootnoteAtEnd && !bOwnFootnoteNum )
+ while( !m_bFootnoteAtEnd && !m_bOwnFootnoteNum )
{
if( dynamic_cast< const SwSectionFormat *>(
pFormat->GetRegisteredIn()) != nullptr )
pFormat =
static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn());
@@ -2232,8 +2232,8 @@ void SwSectionFrm::CalcFootnoteAtEndFlag()
nVal = pFormat->GetFootnoteAtTextEnd( false ).GetValue();
if( FTNEND_ATPGORDOCEND != nVal )
{
- bFootnoteAtEnd = true;
- bOwnFootnoteNum = bOwnFootnoteNum ||FTNEND_ATTXTEND_OWNNUMSEQ ==
nVal ||
+ m_bFootnoteAtEnd = true;
+ m_bOwnFootnoteNum = m_bOwnFootnoteNum ||FTNEND_ATTXTEND_OWNNUMSEQ
== nVal ||
FTNEND_ATTXTEND_OWNNUMANDFMT == nVal;
}
}
@@ -2241,20 +2241,20 @@ void SwSectionFrm::CalcFootnoteAtEndFlag()
bool SwSectionFrm::IsEndnoteAtMyEnd() const
{
- return pSection->GetFormat()->GetEndAtTextEnd( false ).IsAtEnd();
+ return m_pSection->GetFormat()->GetEndAtTextEnd( false ).IsAtEnd();
}
void SwSectionFrm::CalcEndAtEndFlag()
{
SwSectionFormat *pFormat = GetSection()->GetFormat();
- bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
- while( !bEndnAtEnd )
+ m_bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
+ while( !m_bEndnAtEnd )
{
if( dynamic_cast< const SwSectionFormat *>(
pFormat->GetRegisteredIn()) != nullptr )
pFormat =
static_cast<SwSectionFormat*>(pFormat->GetRegisteredIn());
else
break;
- bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
+ m_bEndnAtEnd = pFormat->GetEndAtTextEnd( false ).IsAtEnd();
}
}
commit 163b3d7ca0056d16b300b68d7e831874b6cf393a
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Oct 27 08:42:35 2015 +0100
sw: prefix members of SwTableFormulaUpdate
Change-Id: Id9e18c67a4fa6e3646ac33cd616838819d1f10d8
diff --git a/sw/inc/hints.hxx b/sw/inc/hints.hxx
index 47808f8..97a6397 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 5cda63a..177f66a 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 8bd3359..abbf1b0 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 cec7ded..6953c53 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 9c4dd17..58bb14e 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 8a4e80a..a9d0be9 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 8be5172..520c9c8 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 68aa2f4..66713a2 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 029bab7..ce79394 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 f4a5c85..b369311 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 073cdf6..b74a6cf 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 857725f..c1d3e42 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 1473dfa..edb7710 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
commit d82d89ad27657a9f937e8ed44574626e1564102a
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Oct 27 08:41:41 2015 +0100
sw: prefix members of SwTableLine
Change-Id: I89c434ba488963fdbaa9025bdd1dd420ab255dac
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index bf492dd..c53f846 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -344,23 +344,23 @@ public:
/// SwTableLine is one table row in the document model.
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat.
{
- SwTableBoxes aBoxes;
- SwTableBox *pUpper;
+ SwTableBoxes m_aBoxes;
+ SwTableBox *m_pUpper;
public:
TYPEINFO_OVERRIDE();
- SwTableLine() : pUpper(0) {}
+ SwTableLine() : m_pUpper(0) {}
SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp );
virtual ~SwTableLine();
- SwTableBoxes &GetTabBoxes() { return aBoxes; }
- const SwTableBoxes &GetTabBoxes() const { return aBoxes; }
+ SwTableBoxes &GetTabBoxes() { return m_aBoxes; }
+ const SwTableBoxes &GetTabBoxes() const { return m_aBoxes; }
- SwTableBox *GetUpper() { return pUpper; }
- const SwTableBox *GetUpper() const { return pUpper; }
- void SetUpper( SwTableBox *pNew ) { pUpper = pNew; }
+ SwTableBox *GetUpper() { return m_pUpper; }
+ const SwTableBox *GetUpper() const { return m_pUpper; }
+ void SetUpper( SwTableBox *pNew ) { m_pUpper = pNew; }
SwFrameFormat* GetFrameFormat() { return
static_cast<SwFrameFormat*>(GetRegisteredIn()); }
SwFrameFormat* GetFrameFormat() const { return
const_cast<SwFrameFormat*>(static_cast<const
SwFrameFormat*>(GetRegisteredIn())); }
diff --git a/sw/source/core/table/swtable.cxx b/sw/source/core/table/swtable.cxx
index 76043c6..83a31fd 100644
--- a/sw/source/core/table/swtable.cxx
+++ b/sw/source/core/table/swtable.cxx
@@ -1476,17 +1476,17 @@ bool SwTable::IsTableComplex() const
SwTableLine::SwTableLine( SwTableLineFormat *pFormat, sal_uInt16 nBoxes,
SwTableBox *pUp )
: SwClient( pFormat ),
- aBoxes(),
- pUpper( pUp )
+ m_aBoxes(),
+ m_pUpper( pUp )
{
- aBoxes.reserve( nBoxes );
+ m_aBoxes.reserve( nBoxes );
}
SwTableLine::~SwTableLine()
{
- for (size_t i = 0; i < aBoxes.size(); ++i)
+ for (size_t i = 0; i < m_aBoxes.size(); ++i)
{
- delete aBoxes[i];
+ delete m_aBoxes[i];
}
// the TabelleLine can be deleted if it's the last client of the
FrameFormat
SwModify* pMod = GetFrameFormat();
commit d0a09f854e054bf3b7df312190780db8e1873ef0
Author: Miklos Vajna <vmik...@collabora.co.uk>
Date: Tue Oct 27 08:40:30 2015 +0100
sw: prefix members of SwTableNode
Change-Id: Ibbcafef60e5074ef8b9e86bd6709bcfa50a5068d
diff --git a/sw/inc/node.hxx b/sw/inc/node.hxx
index e24ae4b..9d07024 100644
--- a/sw/inc/node.hxx
+++ b/sw/inc/node.hxx
@@ -494,15 +494,15 @@ private:
class SW_DLLPUBLIC SwTableNode : public SwStartNode, public SwModify
{
friend class SwNodes;
- SwTable* pTable;
+ SwTable* m_pTable;
protected:
virtual ~SwTableNode();
public:
SwTableNode( const SwNodeIndex & );
- const SwTable& GetTable() const { return *pTable; }
- SwTable& GetTable() { return *pTable; }
+ const SwTable& GetTable() const { return *m_pTable; }
+ SwTable& GetTable() { return *m_pTable; }
SwTabFrm *MakeFrm( SwFrm* );
/// Creates the frms for the table node (i.e. the TabFrms).
diff --git a/sw/source/core/docnode/ndtbl.cxx b/sw/source/core/docnode/ndtbl.cxx
index 5500e12..68aa2f4 100644
--- a/sw/source/core/docnode/ndtbl.cxx
+++ b/sw/source/core/docnode/ndtbl.cxx
@@ -1597,7 +1597,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange,
sal_Unicode cCh,
// "Delete" the Table and merge all Lines/Boxes
_DelTabPara aDelPara( *this, cCh, pUndo );
- for( SwTableLine *pLine : pTableNd->pTable->GetTabLines() )
+ for( SwTableLine *pLine : pTableNd->m_pTable->GetTabLines() )
lcl_DelLine( pLine, &aDelPara );
// We just created a TextNode with fitting separator for every TableLine.
@@ -1609,7 +1609,7 @@ bool SwNodes::TableToText( const SwNodeRange& rRange,
sal_Unicode cCh,
// first Text Node
{
// What about UNDO?
- const SfxItemSet& rTableSet =
pTableNd->pTable->GetFrameFormat()->GetAttrSet();
+ const SfxItemSet& rTableSet =
pTableNd->m_pTable->GetFrameFormat()->GetAttrSet();
const SfxPoolItem *pBreak, *pDesc;
if( SfxItemState::SET != rTableSet.GetItemState( RES_PAGEDESC, false,
&pDesc ))
pDesc = 0;
@@ -2342,7 +2342,7 @@ sal_uInt16 SwDoc::MergeTable( SwPaM& rPam )
SwTableNode::SwTableNode( const SwNodeIndex& rIdx )
: SwStartNode( rIdx, ND_TABLENODE )
{
- pTable = new SwTable( 0 );
+ m_pTable = new SwTable( 0 );
}
SwTableNode::~SwTableNode()
@@ -2353,12 +2353,12 @@ SwTableNode::~SwTableNode()
pTableFormat );
pTableFormat->ModifyNotification( &aMsgHint, &aMsgHint );
DelFrms();
- delete pTable;
+ delete m_pTable;
}
SwTabFrm *SwTableNode::MakeFrm( SwFrm* pSib )
{
- return new SwTabFrm( *pTable, pSib );
+ return new SwTabFrm( *m_pTable, pSib );
}
/**
@@ -2435,7 +2435,7 @@ void SwTableNode::DelFrms()
The TabFrms are attached to the FrameFormat of the SwTable.
We need to delete them in a more cumbersome way, for the Master to also
delete the Follows. */
- SwIterator<SwTabFrm,SwFormat> aIter( *(pTable->GetFrameFormat()) );
+ SwIterator<SwTabFrm,SwFormat> aIter( *(m_pTable->GetFrameFormat()) );
SwTabFrm *pFrm = aIter.First();
while ( pFrm )
{
@@ -2472,8 +2472,8 @@ void SwTableNode::DelFrms()
void SwTableNode::SetNewTable( SwTable* pNewTable, bool bNewFrames )
{
DelFrms();
- delete pTable;
- pTable = pNewTable;
+ delete m_pTable;
+ m_pTable = pNewTable;
if( bNewFrames )
{
SwNodeIndex aIdx( *EndOfSectionNode());
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
