Kaydet (Commit) 47f1529c authored tarafından Miklos Vajna's avatar Miklos Vajna

sw: prefix members of SwRegionRects

Change-Id: Ib59572c45a1404840c379318e4987f5223edca15
üst c93db89a
...@@ -27,7 +27,7 @@ typedef std::vector<SwRect> SwRects; ...@@ -27,7 +27,7 @@ typedef std::vector<SwRect> SwRects;
class SwRegionRects : public 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); inline void InsertRect( const SwRect &rRect, const sal_uInt16 nPos, bool &rDel);
...@@ -44,8 +44,8 @@ public: ...@@ -44,8 +44,8 @@ public:
// Combine adjacent rectangles. // Combine adjacent rectangles.
void Compress( bool bFuzzy = true ); void Compress( bool bFuzzy = true );
inline const SwRect &GetOrigin() const { return aOrigin; } inline const SwRect &GetOrigin() const { return m_aOrigin; }
inline void ChangeOrigin( const SwRect &rRect ) { aOrigin = rRect; } inline void ChangeOrigin( const SwRect &rRect ) { m_aOrigin = rRect; }
}; };
#endif // INCLUDED_SW_INC_SWREGION_HXX #endif // INCLUDED_SW_INC_SWREGION_HXX
......
...@@ -23,10 +23,10 @@ ...@@ -23,10 +23,10 @@
SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) : SwRegionRects::SwRegionRects( const SwRect &rStartRect, sal_uInt16 nInit ) :
SwRects(), SwRects(),
aOrigin( rStartRect ) m_aOrigin( rStartRect )
{ {
reserve(nInit); reserve(nInit);
push_back( aOrigin ); push_back( m_aOrigin );
} }
// If <rDel> is true then this Rect will be overwritten by <rRect> at // If <rDel> is true then this Rect will be overwritten by <rRect> at
...@@ -127,7 +127,7 @@ void SwRegionRects::Invert() ...@@ -127,7 +127,7 @@ void SwRegionRects::Invert()
// To avoid unnecessary memory requirements, create a "useful" initial size: // To avoid unnecessary memory requirements, create a "useful" initial size:
// Number of rectangles in this area * 2 + 2 for the special case of a // Number of rectangles in this area * 2 + 2 for the special case of a
// single hole (so four Rects in the inverse case). // 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 ) for( const_iterator it = begin(); it != end(); ++it )
aInvRegion -= *it; aInvRegion -= *it;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment