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

[Miklos Vajna]

 sw/inc/fmtflcnt.hxx                 |   10 +++++-----
 sw/source/core/txtnode/atrflyin.cxx |   16 ++++++++--------
 2 files changed, 13 insertions(+), 13 deletions(-)

New commits:
commit a577f6fb33eb83f44370cf648b799ef808e97247
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Mon Sep 18 09:58:03 2017 +0200

    sw: prefix members of SwFormatFlyCnt
    
    Change-Id: I41c611d4babe227ce298ed8d6ba3d9e05da5a82b
    Reviewed-on: https://gerrit.libreoffice.org/42404
    Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
    Tested-by: Jenkins <ci at libreoffice.org>

diff --git a/sw/inc/fmtflcnt.hxx b/sw/inc/fmtflcnt.hxx
index 57873510d8b0..18ba66c2fb48 100644
--- a/sw/inc/fmtflcnt.hxx
+++ b/sw/inc/fmtflcnt.hxx
@@ -32,8 +32,8 @@ class SwTextFlyCnt;
 class SwFormatFlyCnt : public SfxPoolItem
 {
     friend class SwTextFlyCnt;
-    SwTextFlyCnt* pTextAttr;
-    SwFrameFormat* pFormat; ///< My Fly/DrawFrame-format.
+    SwTextFlyCnt* m_pTextAttr;
+    SwFrameFormat* m_pFormat; ///< My Fly/DrawFrame-format.
     SwFormatFlyCnt& operator=(const SwFormatFlyCnt& rFlyCnt) = delete;
 
 public:
@@ -42,11 +42,11 @@ public:
     virtual bool            operator==( const SfxPoolItem& ) const override;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = nullptr ) const override;
 
-    SwFrameFormat *GetFrameFormat() const { return pFormat; }
+    SwFrameFormat *GetFrameFormat() const { return m_pFormat; }
     /// For Undo: delete the FlyFrameFormat "logically"; it is kept in Undo-object.
-    void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { pFormat = pNew; }
+    void SetFlyFormat( SwFrameFormat* pNew = nullptr )   { m_pFormat = pNew; }
 
-    const SwTextFlyCnt *GetTextFlyCnt() const { return pTextAttr; }
+    const SwTextFlyCnt *GetTextFlyCnt() const { return m_pTextAttr; }
 };
 
 #endif
diff --git a/sw/source/core/txtnode/atrflyin.cxx b/sw/source/core/txtnode/atrflyin.cxx
index b4ca1e96e704..26d34a1740d5 100644
--- a/sw/source/core/txtnode/atrflyin.cxx
+++ b/sw/source/core/txtnode/atrflyin.cxx
@@ -37,28 +37,28 @@
 
 SwFormatFlyCnt::SwFormatFlyCnt( SwFrameFormat *pFrameFormat )
     : SfxPoolItem( RES_TXTATR_FLYCNT ),
-    pTextAttr( nullptr ),
-    pFormat( pFrameFormat )
+    m_pTextAttr( nullptr ),
+    m_pFormat( pFrameFormat )
 {
 }
 
 bool SwFormatFlyCnt::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return( pTextAttr && static_cast<const SwFormatFlyCnt&>(rAttr).pTextAttr &&
-            pTextAttr->GetStart() == static_cast<const SwFormatFlyCnt&>(rAttr).pTextAttr->GetStart() &&
-            pFormat == static_cast<const SwFormatFlyCnt&>(rAttr).GetFrameFormat() );
+    return( m_pTextAttr && static_cast<const SwFormatFlyCnt&>(rAttr).m_pTextAttr &&
+            m_pTextAttr->GetStart() == static_cast<const SwFormatFlyCnt&>(rAttr).m_pTextAttr->GetStart() &&
+            m_pFormat == static_cast<const SwFormatFlyCnt&>(rAttr).GetFrameFormat() );
 }
 
 SfxPoolItem* SwFormatFlyCnt::Clone( SfxItemPool* ) const
 {
-    return new SwFormatFlyCnt( pFormat );
+    return new SwFormatFlyCnt( m_pFormat );
 }
 
 SwTextFlyCnt::SwTextFlyCnt( SwFormatFlyCnt& rAttr, sal_Int32 nStartPos )
     : SwTextAttr( rAttr, nStartPos )
 {
-    rAttr.pTextAttr = this;
+    rAttr.m_pTextAttr = this;
     SetHasDummyChar(true);
 }
 
@@ -214,7 +214,7 @@ SwFlyInContentFrame *SwTextFlyCnt::GetFlyFrame_( const SwFrame *pCurrFrame )
         return nullptr;
     }
 
-    SwIterator<SwFlyFrame,SwFormat> aIter( *GetFlyCnt().pFormat );
+    SwIterator<SwFlyFrame,SwFormat> aIter( *GetFlyCnt().m_pFormat );
     assert(pCurrFrame->IsTextFrame());
     SwFrame* pFrame = aIter.First();
     if ( pFrame )