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

[Miklos Vajna]

 sw/inc/fmtornt.hxx               |   32 ++++++++++++++++----------------
 sw/source/core/layout/atrfrm.cxx |   34 +++++++++++++++++-----------------
 2 files changed, 33 insertions(+), 33 deletions(-)

New commits:
commit c5d8c466afe97190e550c3d43b52713a0840b273
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date:   Tue Mar 3 09:01:36 2015 +0100

    SwFmtHoriOrient: rename member variables missing their prefixes
    
    Change-Id: Ic245fe20e364be8c4110a52f5f91b611adb187db

diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 150f61a..df33db0 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -68,10 +68,10 @@ public:
 
 class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
 {
-    SwTwips         nXPos;              ///< Contains *always* the current RelPos.
-    sal_Int16       eOrient;
-    sal_Int16       eRelation;
-    bool            bPosToggle : 1; ///< Flip position on even pages.
+    SwTwips         m_nXPos;              ///< Contains *always* the current RelPos.
+    sal_Int16       m_eOrient;
+    sal_Int16       m_eRelation;
+    bool            m_bPosToggle : 1; ///< Flip position on even pages.
 public:
     TYPEINFO_OVERRIDE();
     SwFmtHoriOrient( SwTwips nX = 0, sal_Int16 eHori = com::sun::star::text::HoriOrientation::NONE,
@@ -89,16 +89,16 @@ public:
     virtual bool QueryValue( com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) const SAL_OVERRIDE;
     virtual bool PutValue( const com::sun::star::uno::Any& rVal, sal_uInt8 nMemberId = 0 ) SAL_OVERRIDE;
 
-    sal_Int16 GetHoriOrient() const { return eOrient; }
-    sal_Int16 GetRelationOrient() const { return eRelation; }
-    void SetHoriOrient( sal_Int16 eNew ) { eOrient = eNew; }
-    void SetRelationOrient( sal_Int16 eNew ) { eRelation = eNew; }
+    sal_Int16 GetHoriOrient() const { return m_eOrient; }
+    sal_Int16 GetRelationOrient() const { return m_eRelation; }
+    void SetHoriOrient( sal_Int16 eNew ) { m_eOrient = eNew; }
+    void SetRelationOrient( sal_Int16 eNew ) { m_eRelation = eNew; }
 
-    SwTwips GetPos() const { return nXPos; }
-    void    SetPos( SwTwips nNew ) { nXPos = nNew; }
+    SwTwips GetPos() const { return m_nXPos; }
+    void    SetPos( SwTwips nNew ) { m_nXPos = nNew; }
 
-    bool IsPosToggle() const { return bPosToggle; }
-    void SetPosToggle( bool bNew ) { bPosToggle = bNew; }
+    bool IsPosToggle() const { return m_bPosToggle; }
+    void SetPosToggle( bool bNew ) { m_bPosToggle = bNew; }
 
     void dumpAsXml(struct _xmlTextWriter* pWriter) const SAL_OVERRIDE;
 };
@@ -112,10 +112,10 @@ inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy
 }
 inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy )
 {
-    nXPos = rCpy.GetPos();
-    eOrient = rCpy.GetHoriOrient();
-    eRelation = rCpy.GetRelationOrient();
-    bPosToggle = rCpy.IsPosToggle();
+    m_nXPos = rCpy.GetPos();
+    m_eOrient = rCpy.GetHoriOrient();
+    m_eRelation = rCpy.GetRelationOrient();
+    m_bPosToggle = rCpy.IsPosToggle();
     return *this;
 }
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index 961b70f..7d4ee2a 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1430,24 +1430,24 @@ void SwFmtVertOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 SwFmtHoriOrient::SwFmtHoriOrient( SwTwips nX, sal_Int16 eHori,
                               sal_Int16 eRel, bool bPos )
     : SfxPoolItem( RES_HORI_ORIENT ),
-    nXPos( nX ),
-    eOrient( eHori ),
-    eRelation( eRel ),
-    bPosToggle( bPos )
+    m_nXPos( nX ),
+    m_eOrient( eHori ),
+    m_eRelation( eRel ),
+    m_bPosToggle( bPos )
 {}
 
 bool SwFmtHoriOrient::operator==( const SfxPoolItem& rAttr ) const
 {
     assert(SfxPoolItem::operator==(rAttr));
-    return ( nXPos == static_cast<const SwFmtHoriOrient&>(rAttr).nXPos &&
-             eOrient == static_cast<const SwFmtHoriOrient&>(rAttr).eOrient &&
-             eRelation == static_cast<const SwFmtHoriOrient&>(rAttr).eRelation &&
-             bPosToggle == static_cast<const SwFmtHoriOrient&>(rAttr).bPosToggle );
+    return ( m_nXPos == static_cast<const SwFmtHoriOrient&>(rAttr).m_nXPos &&
+             m_eOrient == static_cast<const SwFmtHoriOrient&>(rAttr).m_eOrient &&
+             m_eRelation == static_cast<const SwFmtHoriOrient&>(rAttr).m_eRelation &&
+             m_bPosToggle == static_cast<const SwFmtHoriOrient&>(rAttr).m_bPosToggle );
 }
 
 SfxPoolItem*  SwFmtHoriOrient::Clone( SfxItemPool* ) const
 {
-    return new SwFmtHoriOrient( nXPos, eOrient, eRelation, bPosToggle );
+    return new SwFmtHoriOrient( m_nXPos, m_eOrient, m_eRelation, m_bPosToggle );
 }
 
 bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1459,11 +1459,11 @@ bool SwFmtHoriOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
     {
         case MID_HORIORIENT_ORIENT:
         {
-            rVal <<= (sal_Int16)eOrient;
+            rVal <<= (sal_Int16)m_eOrient;
         }
         break;
         case MID_HORIORIENT_RELATION:
-            rVal <<= (sal_Int16)eRelation;
+            rVal <<= (sal_Int16)m_eRelation;
         break;
         case MID_HORIORIENT_POSITION:
                 rVal <<= (sal_Int32)convertTwipToMm100(GetPos());
@@ -1489,12 +1489,12 @@ bool SwFmtHoriOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
         {
             sal_Int16 nVal = text::HoriOrientation::NONE;
             rVal >>= nVal;
-            eOrient = nVal;
+            m_eOrient = nVal;
         }
         break;
         case MID_HORIORIENT_RELATION:
         {
-            eRelation = lcl_IntToRelation(rVal);
+            m_eRelation = lcl_IntToRelation(rVal);
         }
         break;
         case MID_HORIORIENT_POSITION:
@@ -1521,10 +1521,10 @@ void SwFmtHoriOrient::dumpAsXml(xmlTextWriterPtr pWriter) const
 {
     xmlTextWriterStartElement(pWriter, BAD_CAST("swFmtHoriOrient"));
     xmlTextWriterWriteAttribute(pWriter, BAD_CAST("whichId"), BAD_CAST(OString::number(Which()).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nXPos"), BAD_CAST(OString::number(nXPos).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(eOrient).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eRelation"), BAD_CAST(OString::number(eRelation).getStr()));
-    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bPosToggle"), BAD_CAST(OString::boolean(bPosToggle).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("nXPos"), BAD_CAST(OString::number(m_nXPos).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eOrient"), BAD_CAST(OString::number(m_eOrient).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("eRelation"), BAD_CAST(OString::number(m_eRelation).getStr()));
+    xmlTextWriterWriteAttribute(pWriter, BAD_CAST("bPosToggle"), BAD_CAST(OString::boolean(m_bPosToggle).getStr()));
     xmlTextWriterEndElement(pWriter);
 }