Kaydet (Commit) d82d89ad authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwTableLine

Change-Id: I89c434ba488963fdbaa9025bdd1dd420ab255dac
üst d0a09f85
...@@ -344,23 +344,23 @@ public: ...@@ -344,23 +344,23 @@ public:
/// SwTableLine is one table row in the document model. /// SwTableLine is one table row in the document model.
class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat. class SW_DLLPUBLIC SwTableLine: public SwClient // Client of FrameFormat.
{ {
SwTableBoxes aBoxes; SwTableBoxes m_aBoxes;
SwTableBox *pUpper; SwTableBox *m_pUpper;
public: public:
TYPEINFO_OVERRIDE(); TYPEINFO_OVERRIDE();
SwTableLine() : pUpper(0) {} SwTableLine() : m_pUpper(0) {}
SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp ); SwTableLine( SwTableLineFormat*, sal_uInt16 nBoxes, SwTableBox *pUp );
virtual ~SwTableLine(); virtual ~SwTableLine();
SwTableBoxes &GetTabBoxes() { return aBoxes; } SwTableBoxes &GetTabBoxes() { return m_aBoxes; }
const SwTableBoxes &GetTabBoxes() const { return aBoxes; } const SwTableBoxes &GetTabBoxes() const { return m_aBoxes; }
SwTableBox *GetUpper() { return pUpper; } SwTableBox *GetUpper() { return m_pUpper; }
const SwTableBox *GetUpper() const { return pUpper; } const SwTableBox *GetUpper() const { return m_pUpper; }
void SetUpper( SwTableBox *pNew ) { pUpper = pNew; } void SetUpper( SwTableBox *pNew ) { m_pUpper = pNew; }
SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); } SwFrameFormat* GetFrameFormat() { return static_cast<SwFrameFormat*>(GetRegisteredIn()); }
SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); } SwFrameFormat* GetFrameFormat() const { return const_cast<SwFrameFormat*>(static_cast<const SwFrameFormat*>(GetRegisteredIn())); }
......
...@@ -1476,17 +1476,17 @@ bool SwTable::IsTableComplex() const ...@@ -1476,17 +1476,17 @@ bool SwTable::IsTableComplex() const
SwTableLine::SwTableLine( SwTableLineFormat *pFormat, sal_uInt16 nBoxes, SwTableLine::SwTableLine( SwTableLineFormat *pFormat, sal_uInt16 nBoxes,
SwTableBox *pUp ) SwTableBox *pUp )
: SwClient( pFormat ), : SwClient( pFormat ),
aBoxes(), m_aBoxes(),
pUpper( pUp ) m_pUpper( pUp )
{ {
aBoxes.reserve( nBoxes ); m_aBoxes.reserve( nBoxes );
} }
SwTableLine::~SwTableLine() 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 // the TabelleLine can be deleted if it's the last client of the FrameFormat
SwModify* pMod = GetFrameFormat(); SwModify* pMod = GetFrameFormat();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment