summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2014-05-31 21:16:26 +0200
committerMiklos Vajna <vmiklos@collabora.co.uk>2014-05-31 21:29:12 +0200
commit6dcc46af5a47cef1f6e52835f3e8ebd17a0be234 (patch)
tree9ad7ae9e4bff21cf8e71758493a64863e7f7249b /sw
parent886a7b6d66e2e1c60f7163e959a537ecc73e9927 (diff)
SwFmtVertOrient: rename member variables missing their prefixes
Change-Id: I83922fa1abe7830b12fcd811c9391ae8fff853c9
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/fmtornt.hxx24
-rw-r--r--sw/source/core/layout/atrfrm.cxx28
2 files changed, 26 insertions, 26 deletions
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 2e7e01b4fca8..bd97badcec9a 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -32,9 +32,9 @@ class IntlWrapper;
class SW_DLLPUBLIC SwFmtVertOrient: public SfxPoolItem
{
- SwTwips nYPos; ///< Contains *always* the current RelPos.
- sal_Int16 eOrient;
- sal_Int16 eRelation;
+ SwTwips m_nYPos; ///< Contains *always* the current RelPos.
+ sal_Int16 m_eOrient;
+ sal_Int16 m_eRelation;
public:
TYPEINFO_OVERRIDE();
SwFmtVertOrient( SwTwips nY = 0, sal_Int16 eVert = com::sun::star::text::VertOrientation::NONE,
@@ -55,13 +55,13 @@ public:
SvStream& Store(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
SfxPoolItem* Create(SvStream &rStream, sal_uInt16 itemVersion) const SAL_OVERRIDE;
- sal_Int16 GetVertOrient() const { return eOrient; }
- sal_Int16 GetRelationOrient() const { return eRelation; }
- void SetVertOrient( sal_Int16 eNew ) { eOrient = eNew; }
- void SetRelationOrient( sal_Int16 eNew ) { eRelation = eNew; }
+ sal_Int16 GetVertOrient() const { return m_eOrient; }
+ sal_Int16 GetRelationOrient() const { return m_eRelation; }
+ void SetVertOrient( sal_Int16 eNew ) { m_eOrient = eNew; }
+ void SetRelationOrient( sal_Int16 eNew ) { m_eRelation = eNew; }
- SwTwips GetPos() const { return nYPos; }
- void SetPos( SwTwips nNew ) { nYPos = nNew; }
+ SwTwips GetPos() const { return m_nYPos; }
+ void SetPos( SwTwips nNew ) { m_nYPos = nNew; }
};
class SW_DLLPUBLIC SwFmtHoriOrient: public SfxPoolItem
@@ -101,9 +101,9 @@ public:
inline SwFmtVertOrient &SwFmtVertOrient::operator=( const SwFmtVertOrient &rCpy )
{
- nYPos = rCpy.GetPos();
- eOrient = rCpy.GetVertOrient();
- eRelation = rCpy.GetRelationOrient();
+ m_nYPos = rCpy.GetPos();
+ m_eOrient = rCpy.GetVertOrient();
+ m_eRelation = rCpy.GetRelationOrient();
return *this;
}
inline SwFmtHoriOrient &SwFmtHoriOrient::operator=( const SwFmtHoriOrient &rCpy )
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index aa40d45c93e1..fa5a4d07ca4a 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -1199,11 +1199,11 @@ bool SwFmtSurround::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
SvStream& SwFmtVertOrient::Store(SvStream &rStream, sal_uInt16 /*version*/) const
{
#if SAL_TYPES_SIZEOFLONG == 8
- rStream.WriteInt64(nYPos);
+ rStream.WriteInt64(m_nYPos);
#else
- rStream.WriteInt32(nYPos);
+ rStream.WriteInt32(m_nYPos);
#endif
- rStream.WriteInt16( eOrient ).WriteInt16( eRelation );
+ rStream.WriteInt16( m_eOrient ).WriteInt16( m_eRelation );
return rStream;
}
@@ -1230,22 +1230,22 @@ SfxPoolItem* SwFmtVertOrient::Create(SvStream &rStream, sal_uInt16 /*itemVersion
SwFmtVertOrient::SwFmtVertOrient( SwTwips nY, sal_Int16 eVert,
sal_Int16 eRel )
: SfxPoolItem( RES_VERT_ORIENT ),
- nYPos( nY ),
- eOrient( eVert ),
- eRelation( eRel )
+ m_nYPos( nY ),
+ m_eOrient( eVert ),
+ m_eRelation( eRel )
{}
bool SwFmtVertOrient::operator==( const SfxPoolItem& rAttr ) const
{
OSL_ENSURE( SfxPoolItem::operator==( rAttr ), "not the same attributes" );
- return ( nYPos == ((SwFmtVertOrient&)rAttr).nYPos &&
- eOrient == ((SwFmtVertOrient&)rAttr).eOrient &&
- eRelation == ((SwFmtVertOrient&)rAttr).eRelation );
+ return ( m_nYPos == ((SwFmtVertOrient&)rAttr).m_nYPos &&
+ m_eOrient == ((SwFmtVertOrient&)rAttr).m_eOrient &&
+ m_eRelation == ((SwFmtVertOrient&)rAttr).m_eRelation );
}
SfxPoolItem* SwFmtVertOrient::Clone( SfxItemPool* ) const
{
- return new SwFmtVertOrient( nYPos, eOrient, eRelation );
+ return new SwFmtVertOrient( m_nYPos, m_eOrient, m_eRelation );
}
bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
@@ -1257,11 +1257,11 @@ bool SwFmtVertOrient::QueryValue( uno::Any& rVal, sal_uInt8 nMemberId ) const
{
case MID_VERTORIENT_ORIENT:
{
- rVal <<= (sal_Int16)eOrient;
+ rVal <<= (sal_Int16)m_eOrient;
}
break;
case MID_VERTORIENT_RELATION:
- rVal <<= (sal_Int16)eRelation;
+ rVal <<= (sal_Int16)m_eRelation;
break;
case MID_VERTORIENT_POSITION:
rVal <<= (sal_Int32)convertTwipToMm100(GetPos());
@@ -1284,12 +1284,12 @@ bool SwFmtVertOrient::PutValue( const uno::Any& rVal, sal_uInt8 nMemberId )
{
sal_uInt16 nVal = text::VertOrientation::NONE;
rVal >>= nVal;
- eOrient = nVal;
+ m_eOrient = nVal;
}
break;
case MID_VERTORIENT_RELATION:
{
- eRelation = lcl_IntToRelation(rVal);
+ m_eRelation = lcl_IntToRelation(rVal);
}
break;
case MID_VERTORIENT_POSITION: