[Libreoffice-commits] core.git: sw/inc sw/source

[Miklos Vajna]

 sw/inc/cellatr.hxx              |    6 +++---
 sw/source/core/attr/cellatr.cxx |   14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

New commits:
commit 9d778261d4dd6e50e6c5f7583c4dfa5f8d5b5a0b
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Mar 13 09:16:13 2017 +0100

    sw: prefix members of SwTableBoxFormula
    
    Change-Id: If96fbf097e2314303e60fd4f10ae314d12f2c468

diff --git a/sw/inc/cellatr.hxx b/sw/inc/cellatr.hxx
index af49f78..68b5c18 100644
--- a/sw/inc/cellatr.hxx
+++ b/sw/inc/cellatr.hxx
@@ -49,7 +49,7 @@ public:
 
 class SwTableBoxFormula : public SfxPoolItem, public SwTableFormula
 {
-    SwModify* pDefinedIn;   // Modify object where the formula is located
+    SwModify* m_pDefinedIn;   // Modify object where the formula is located
                             // can only be TableBoxFormat
 
 public:
@@ -59,9 +59,9 @@ public:
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
 
-    const SwModify* GetDefinedIn() const { return pDefinedIn; }
+    const SwModify* GetDefinedIn() const { return m_pDefinedIn; }
     void ChgDefinedIn( const SwModify* pNew )
-                                            { pDefinedIn = const_cast<SwModify*>(pNew); }
+                                            { m_pDefinedIn = const_cast<SwModify*>(pNew); }
     //  BoxAttribut -> BoxStartNode
     virtual const SwNode* GetNodeOfFormula() const override;
 
diff --git a/sw/source/core/attr/cellatr.cxx b/sw/source/core/attr/cellatr.cxx
index 6a0401b..e471bd7a 100644
--- a/sw/source/core/attr/cellatr.cxx
+++ b/sw/source/core/attr/cellatr.cxx
@@ -51,7 +51,7 @@ SfxPoolItem* SwTableBoxNumFormat::Clone( SfxItemPool* ) const
 SwTableBoxFormula::SwTableBoxFormula( const OUString& rFormula )
     : SfxPoolItem( RES_BOXATR_FORMULA ),
     SwTableFormula( rFormula ),
-    pDefinedIn( nullptr )
+    m_pDefinedIn( nullptr )
 {
 }
 
@@ -59,7 +59,7 @@ bool SwTableBoxFormula::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
     return GetFormula() == static_cast<const SwTableBoxFormula&>(rAttr).GetFormula() &&
-           pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).pDefinedIn;
+           m_pDefinedIn == static_cast<const SwTableBoxFormula&>(rAttr).m_pDefinedIn;
 }
 
 SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
@@ -80,9 +80,9 @@ SfxPoolItem* SwTableBoxFormula::Clone( SfxItemPool* ) const
 const SwNode* SwTableBoxFormula::GetNodeOfFormula() const
 {
     const SwNode* pRet = nullptr;
-    if( pDefinedIn )
+    if( m_pDefinedIn )
     {
-        SwTableBox* pBox = SwIterator<SwTableBox,SwModify>( *pDefinedIn ).First();
+        SwTableBox* pBox = SwIterator<SwTableBox,SwModify>( *m_pDefinedIn ).First();
         if( pBox )
             pRet = pBox->GetSttNd();
     }
@@ -92,14 +92,14 @@ const SwNode* SwTableBoxFormula::GetNodeOfFormula() const
 SwTableBox* SwTableBoxFormula::GetTableBox()
 {
     SwTableBox* pBox = nullptr;
-    if( pDefinedIn )
-        pBox = SwIterator<SwTableBox,SwModify>( *pDefinedIn ).First();
+    if( m_pDefinedIn )
+        pBox = SwIterator<SwTableBox,SwModify>( *m_pDefinedIn ).First();
     return pBox;
 }
 
 void SwTableBoxFormula::ChangeState( const SfxPoolItem* pItem )
 {
-    if( !pDefinedIn )
+    if( !m_pDefinedIn )
         return ;
 
     SwTableFormulaUpdate* pUpdateField;