summaryrefslogtreecommitdiff
path: root/sw
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:07:05 +0100
committerMiklos Vajna <vmiklos@collabora.co.uk>2015-11-04 09:11:20 +0100
commit47f1529ca3f193f64929a3f777c578f25f3613a6 (patch)
tree43264454a41df320d7ed15964781b29fe6455399 /sw
parentc93db89a8f025a44ede88d16f01d11f41a818bbb (diff)
sw: prefix members of SwRegionRects
Change-Id: Ib59572c45a1404840c379318e4987f5223edca15
Diffstat (limited to 'sw')
-rw-r--r--sw/inc/swregion.hxx6
-rw-r--r--sw/source/core/bastyp/swregion.cxx6
2 files changed, 6 insertions, 6 deletions
diff --git a/sw/inc/swregion.hxx b/sw/inc/swregion.hxx
index b290e2191aef..5a4d7621a7cd 100644
--- a/sw/inc/swregion.hxx
+++ b/sw/inc/swregion.hxx
@@ -27,7 +27,7 @@ typedef std::vector<SwRect> SwRects;
class SwRegionRects : public SwRects
{
- SwRect aOrigin; // Copy of StartRect.
+ SwRect m_aOrigin; // Copy of StartRect.
inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, bool &rDel);
@@ -44,8 +44,8 @@ public:
// Combine adjacent rectangles.
void Compress( bool bFuzzy = true );
- inline const SwRect &GetOrigin() const { return aOrigin; }
- inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; }
+ inline const SwRect &GetOrigin() const { return m_aOrigin; }
+ inline void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
};
#endif // INCLUDED_SW_INC_SWREGION_HXX
diff --git a/sw/source/core/bastyp/swregion.cxx b/sw/source/core/bastyp/swregion.cxx
index 5e5cc6d76507..922c1c9d91c0 100644
--- a/sw/source/core/bastyp/swregion.cxx
+++ b/sw/source/core/bastyp/swregion.cxx
@@ -23,10 +23,10 @@
SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) :
SwRects(),
- aOrigin( rStartRect )
+ m_aOrigin( rStartRect )
{
reserve(nInit);
- push_back( aOrigin );
+ push_back( m_aOrigin );
}
// If <rDel> is true then this Rect will be overwritten by <rRect> at
@@ -127,7 +127,7 @@ void SwRegionRects::Invert()
// To avoid unnecessary memory requirements, create a "useful" initial size:
// Number of rectangles in this area * 2 + 2 for the special case of a
// single hole (so four Rects in the inverse case).
- SwRegionRects aInvRegion( aOrigin, size()*2+2 );
+ SwRegionRects aInvRegion( m_aOrigin, size()*2+2 );
for( const_iterator it = begin(); it != end(); ++it )
aInvRegion -= *it;