diff options
author | Alexandre Fournier <fou@leila.(none)> | 2010-11-06 01:33:05 +0100 |
---|---|---|
committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2010-11-06 18:21:27 -0500 |
commit | a93c9517dc52b1d9c22a0e69f9d92c119983f7fe (patch) | |
tree | 10d0f65563b4c93e9532ad2b2e351f60022a17c4 /starmath/inc/rect.hxx | |
parent | c27759cbf40a99632112cf2e2d21d64f2d3ae749 (diff) |
Removes a fair amount of BOOL variables in starmath
I uses the native bool type instead.
Some signatures containing BOOL have been left untouched when belonging to an inheritance hierarchy beyond the scope of starmath
Diffstat (limited to 'starmath/inc/rect.hxx')
-rw-r--r-- | starmath/inc/rect.hxx | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/starmath/inc/rect.hxx b/starmath/inc/rect.hxx index fdd12dd86669..f1f0f60d19b2 100644 --- a/starmath/inc/rect.hxx +++ b/starmath/inc/rect.hxx @@ -39,10 +39,10 @@ #include "format.hxx" -BOOL SmGetGlyphBoundRect(const OutputDevice &rDev, +bool SmGetGlyphBoundRect(const OutputDevice &rDev, const XubString &rText, Rectangle &rRect); -BOOL SmIsMathAlpha(const XubString &rText); +bool SmIsMathAlpha(const XubString &rText); inline long SmFromTo(long nFrom, long nTo, double fRelDist) @@ -105,7 +105,7 @@ class SmRect nLoAttrFence, nHiAttrFence; USHORT nBorderWidth; - BOOL bHasBaseline, + bool bHasBaseline, bHasAlignInfo; protected: @@ -114,7 +114,7 @@ protected: void Init(const OutputDevice &rDev, const SmFormat *pFormat, const XubString &rText, USHORT nBorderWidth); - void ClearBaseline() { bHasBaseline = FALSE; }; + void ClearBaseline() { bHasBaseline = false; }; inline void CopyMBL(const SmRect& rRect); void CopyAlignInfo(const SmRect& rRect); @@ -164,7 +164,7 @@ public: long GetItalicRight() const { return GetRight() + GetItalicRightSpace(); } long GetItalicWidth() const { return GetWidth() + GetItalicLeftSpace() + GetItalicRightSpace(); } - BOOL HasBaseline() const { return bHasBaseline; } + bool HasBaseline() const { return bHasBaseline; } inline long GetBaseline() const; long GetBaselineOffset() const { return GetBaseline() - GetTop(); } @@ -187,12 +187,12 @@ public: void Move (const Point &rPosition); void MoveTo(const Point &rPosition) { Move(rPosition - GetTopLeft()); } - BOOL IsEmpty() const + bool IsEmpty() const { return GetWidth() == 0 || GetHeight() == 0; } - BOOL HasAlignInfo() const { return bHasAlignInfo; } + bool HasAlignInfo() const { return bHasAlignInfo; } const Point AlignTo(const SmRect &rRect, RectPos ePos, RectHorAlign eHor, RectVerAlign eVer) const; @@ -201,11 +201,11 @@ public: SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode, long nNewAlignM); SmRect & ExtendBy(const SmRect &rRect, RectCopyMBL eCopyMode, - BOOL bKeepVerAlignParams); + bool bKeepVerAlignParams); long OrientedDist(const Point &rPoint) const; - BOOL IsInsideRect(const Point &rPoint) const; - BOOL IsInsideItalicRect(const Point &rPoint) const; + bool IsInsideRect(const Point &rPoint) const; + bool IsInsideItalicRect(const Point &rPoint) const; inline SmRect & operator = (const SmRect &rRect); |