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

[Bjoern Michaelsen]

 sw/source/core/text/porfly.cxx |    6 +++---
 sw/source/core/text/porfly.hxx |   16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

New commits:
commit 2c1a6138e412d8dd19d0b000b84f5426f73d04b1
Author: Bjoern Michaelsen <bjoern.michaelsen at canonical.com>
Date:   Thu Dec 22 02:48:10 2016 +0100

    prefix SwFlyCntPortion member var names
    
    Change-Id: Ia46b4a4f869390f452f565cf9a8f5d94bcf79ca7
    Reviewed-on: https://gerrit.libreoffice.org/32320
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: Björn Michaelsen <bjoern.michaelsen at canonical.com>

diff --git a/sw/source/core/text/porfly.cxx b/sw/source/core/text/porfly.cxx
index 65d5ad7a..7cf1f9e 100644
--- a/sw/source/core/text/porfly.cxx
+++ b/sw/source/core/text/porfly.cxx
@@ -254,8 +254,8 @@ void sw::DrawFlyCntPortion::Paint(const SwTextPaintInfo&) const
  * Use the dimensions of pFly->OutRect()
  */
 SwFlyCntPortion::SwFlyCntPortion()
-    : bMax(false)
-    , eAlign(sw::LineAlign::NONE)
+    : m_bMax(false)
+    , m_eAlign(sw::LineAlign::NONE)
 {
     nLineLength = 1;
     SetWhichPor(POR_FLYCNT);
@@ -381,7 +381,7 @@ void SwFlyCntPortion::SetBase( const SwTextFrame& rFrame, const Point &rBase,
 
     SetAlign( aObjPositioning.GetLineAlignment() );
 
-    aRef = aObjPositioning.GetAnchorPos();
+    m_aRef = aObjPositioning.GetAnchorPos();
     if( nFlags & AsCharFlags::Rotate )
         SvXSize( aObjPositioning.GetObjBoundRectInclSpacing().SSize() );
     else
diff --git a/sw/source/core/text/porfly.hxx b/sw/source/core/text/porfly.hxx
index e000d3d..090ee7f 100644
--- a/sw/source/core/text/porfly.hxx
+++ b/sw/source/core/text/porfly.hxx
@@ -45,19 +45,19 @@ public:
 /// This portion represents an as-character anchored fly (shape, frame, etc.)
 class SwFlyCntPortion : public SwLinePortion
 {
-    Point aRef;     // Relatively to this point we calculate the AbsPos
-    bool bMax;   // Line adjustment and height == line height
-    sw::LineAlign eAlign;
+    Point m_aRef;     // Relatively to this point we calculate the AbsPos
+    bool m_bMax;   // Line adjustment and height == line height
+    sw::LineAlign m_eAlign;
 
     virtual SdrObject* GetSdrObj(const SwTextFrame&) =0;
 
 public:
     SwFlyCntPortion();
-    inline const Point& GetRefPoint() const { return aRef; }
-    inline bool IsMax() const { return bMax; }
-    inline sw::LineAlign GetAlign() const { return eAlign; }
-    inline void SetAlign(sw::LineAlign eNew) { eAlign = eNew; }
-    inline void SetMax(bool bNew) { bMax = bNew; }
+    inline const Point& GetRefPoint() const { return m_aRef; }
+    inline bool IsMax() const { return m_bMax; }
+    inline sw::LineAlign GetAlign() const { return m_eAlign; }
+    inline void SetAlign(sw::LineAlign eAlign) { m_eAlign = eAlign; }
+    inline void SetMax(bool bMax) { m_bMax = bMax; }
     void SetBase(const SwTextFrame& rFrame, const Point& rBase, long nLnAscent, long nLnDescent, long nFlyAscent, long nFlyDescent, AsCharFlags nFlags);
     virtual bool Format(SwTextFormatInfo& rInf) override;
     OUTPUT_OPERATOR_OVERRIDE