[Libreoffice-commits] core.git: sw/source
Miklos Vajna
vmiklos at collabora.co.uk
Mon Dec 18 20:48:10 UTC 2017
sw/source/core/access/accfrmobjmap.hxx | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
New commits:
commit 877ede68f31a25a76c89d47389a190b75df1757d
Author: Miklos Vajna <vmiklos at collabora.co.uk>
Date: Mon Dec 18 09:11:16 2017 +0100
sw: prefix members of SwAccessibleChildMapKey
Change-Id: I1cf45ca8b0ea10645be30f0a832ea42c763a7c3c
Reviewed-on: https://gerrit.libreoffice.org/46690
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
diff --git a/sw/source/core/access/accfrmobjmap.hxx b/sw/source/core/access/accfrmobjmap.hxx
index ed0b520e8c41..ed4ecafece0f 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -36,34 +36,34 @@ public:
enum LayerId { INVALID, HELL, TEXT, HEAVEN, CONTROLS, XWINDOW };
SwAccessibleChildMapKey()
- : eLayerId( INVALID )
- , nOrdNum( 0 )
- , nPosNum( 0, 0 )
+ : m_eLayerId( INVALID )
+ , m_nOrdNum( 0 )
+ , m_nPosNum( 0, 0 )
{}
SwAccessibleChildMapKey( LayerId eId, sal_uInt32 nOrd )
- : eLayerId( eId )
- , nOrdNum( nOrd )
- , nPosNum( 0, 0 )
+ : m_eLayerId( eId )
+ , m_nOrdNum( nOrd )
+ , m_nPosNum( 0, 0 )
{}
bool operator()( const SwAccessibleChildMapKey& r1,
const SwAccessibleChildMapKey& r2 ) const
{
- if(r1.eLayerId == r2.eLayerId)
+ if(r1.m_eLayerId == r2.m_eLayerId)
{
- if(r1.nPosNum == r2.nPosNum)
- return r1.nOrdNum < r2.nOrdNum;
+ if(r1.m_nPosNum == r2.m_nPosNum)
+ return r1.m_nOrdNum < r2.m_nOrdNum;
else
{
- if(r1.nPosNum.getY() == r2.nPosNum.getY())
- return r1.nPosNum.getX() < r2.nPosNum.getX();
+ if(r1.m_nPosNum.getY() == r2.m_nPosNum.getY())
+ return r1.m_nPosNum.getX() < r2.m_nPosNum.getX();
else
- return r1.nPosNum.getY() < r2.nPosNum.getY();
+ return r1.m_nPosNum.getY() < r2.m_nPosNum.getY();
}
}
else
- return r1.eLayerId < r2.eLayerId;
+ return r1.m_eLayerId < r2.m_eLayerId;
}
/* MT: Need to get this position parameter stuff in dev300 somehow...
@@ -77,9 +77,9 @@ public:
*/
private:
- LayerId eLayerId;
- sal_uInt32 nOrdNum;
- Point nPosNum;
+ LayerId m_eLayerId;
+ sal_uInt32 m_nOrdNum;
+ Point m_nPosNum;
};
More information about the Libreoffice-commits
mailing list