summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-10-29 08:36:07 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-10-29 08:38:38 +0100
commite754ed9d8c4535464d9003dcedc43cde6b0fd7b8 (patch)
tree6182f9f0e5adb7940a953d9da1ef5ced4bb084f0
parent82acd281d3326ea051a7ea2dd24af2f93981abf4 (diff)
sw: prefix members of SwPosFlyFrm
Change-Id: I08a2c2bb8ebd8cb2adf25b23fa57a5c5441fcfea
-rw-r--r--sw/inc/flypos.hxx12
-rw-r--r--sw/source/core/layout/flypos.cxx16
2 files changed, 14 insertions, 14 deletions
diff --git a/sw/inc/flypos.hxx b/sw/inc/flypos.hxx
index a92552445691..f4d1a97b1d3f 100644
--- a/sw/inc/flypos.hxx
+++ b/sw/inc/flypos.hxx
@@ -29,16 +29,16 @@ class SwNodeIndex;
/// For querying current flys in document.
class SW_DLLPUBLIC SwPosFlyFrm
{
- const SwFrameFormat* pFrameFormat; ///< FlyFrameFormat
- SwNodeIndex* pNdIdx; ///< Index for node is sufficient.
- sal_uInt32 nOrdNum;
+ const SwFrameFormat* m_pFrameFormat; ///< FlyFrameFormat
+ SwNodeIndex* m_pNodeIndex; ///< Index for node is sufficient.
+ sal_uInt32 m_nOrdNum;
public:
SwPosFlyFrm( const SwNodeIndex& , const SwFrameFormat*, sal_uInt16 nArrPos );
virtual ~SwPosFlyFrm(); ///< Virtual for Writer (DLL !!)
- const SwFrameFormat& GetFormat() const { return *pFrameFormat; }
- const SwNodeIndex& GetNdIndex() const { return *pNdIdx; }
- sal_uInt32 GetOrdNum() const { return nOrdNum; }
+ const SwFrameFormat& GetFormat() const { return *m_pFrameFormat; }
+ const SwNodeIndex& GetNdIndex() const { return *m_pNodeIndex; }
+ sal_uInt32 GetOrdNum() const { return m_nOrdNum; }
};
// define needed classes to safely handle an array of allocated SwPosFlyFrm(s).
diff --git a/sw/source/core/layout/flypos.cxx b/sw/source/core/layout/flypos.cxx
index e1f73d0eaaf8..0582eaaceeb3 100644
--- a/sw/source/core/layout/flypos.cxx
+++ b/sw/source/core/layout/flypos.cxx
@@ -38,13 +38,13 @@ bool SwPosFlyFrmCmp::operator()(const SwPosFlyFrmPtr& rA, const SwPosFlyFrmPtr&
SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
sal_uInt16 nArrPos )
- : pFrameFormat( pFormat ), pNdIdx( const_cast<SwNodeIndex*>(&rIdx) )
+ : m_pFrameFormat( pFormat ), m_pNodeIndex( const_cast<SwNodeIndex*>(&rIdx) )
{
bool bFnd = false;
const SwFormatAnchor& rAnchor = pFormat->GetAnchor();
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- pNdIdx = new SwNodeIndex( rIdx );
+ m_pNodeIndex = new SwNodeIndex( rIdx );
}
else if( pFormat->GetDoc()->getIDocumentLayoutAccess().GetCurrentViewShell() )
{
@@ -54,7 +54,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
SwFlyFrm* pFly = SwIterator<SwFlyFrm,SwFormat>(*pFormat).First();
if( pFly )
{
- nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
+ m_nOrdNum = pFly->GetVirtDrawObj()->GetOrdNum();
bFnd = true;
}
}
@@ -64,7 +64,7 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
SwDrawContact* pContact = SwIterator<SwDrawContact,SwFormat>(*pFormat).First();
if( pContact )
{
- nOrdNum = pContact->GetMaster()->GetOrdNum();
+ m_nOrdNum = pContact->GetMaster()->GetOrdNum();
bFnd = true;
}
}
@@ -72,17 +72,17 @@ SwPosFlyFrm::SwPosFlyFrm( const SwNodeIndex& rIdx, const SwFrameFormat* pFormat,
if( !bFnd )
{
- nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
- nOrdNum += nArrPos;
+ m_nOrdNum = pFormat->GetDoc()->GetSpzFrameFormats()->size();
+ m_nOrdNum += nArrPos;
}
}
SwPosFlyFrm::~SwPosFlyFrm()
{
- const SwFormatAnchor& rAnchor = pFrameFormat->GetAnchor();
+ const SwFormatAnchor& rAnchor = m_pFrameFormat->GetAnchor();
if (FLY_AT_PAGE == rAnchor.GetAnchorId())
{
- delete pNdIdx;
+ delete m_pNodeIndex;
}
}