diff options
Diffstat (limited to 'vcl/inc/vcl/metric.hxx')
| -rw-r--r-- | vcl/inc/vcl/metric.hxx | 34 |
1 files changed, 17 insertions, 17 deletions
diff --git a/vcl/inc/vcl/metric.hxx b/vcl/inc/vcl/metric.hxx index 6328890c1749..5381e0f14bde 100644 --- a/vcl/inc/vcl/metric.hxx +++ b/vcl/inc/vcl/metric.hxx @@ -53,14 +53,14 @@ public: ~FontInfo(); FontType GetType() const; - BOOL IsDeviceFont() const; - BOOL SupportsLatin() const; - BOOL SupportsCJK() const; - BOOL SupportsCTL() const; + sal_Bool IsDeviceFont() const; + sal_Bool SupportsLatin() const; + sal_Bool SupportsCJK() const; + sal_Bool SupportsCTL() const; FontInfo& operator=( const FontInfo& ); - BOOL operator==( const FontInfo& ) const; - BOOL operator!=( const FontInfo& rInfo ) const + sal_Bool operator==( const FontInfo& ) const; + sal_Bool operator!=( const FontInfo& rInfo ) const { return !operator==( rInfo ); } }; @@ -83,8 +83,8 @@ public: long GetSlant() const; FontMetric& operator=( const FontMetric& rMetric ); - BOOL operator==( const FontMetric& rMetric ) const; - BOOL operator!=( const FontMetric& rMetric ) const + sal_Bool operator==( const FontMetric& rMetric ) const; + sal_Bool operator!=( const FontMetric& rMetric ) const { return !operator==( rMetric ); } }; @@ -101,8 +101,8 @@ public: FontCharMap(); ~FontCharMap(); - BOOL IsDefaultMap() const; - BOOL HasChar( sal_uInt32 ) const; + sal_Bool IsDefaultMap() const; + sal_Bool HasChar( sal_uInt32 ) const; int CountCharsInRange( sal_uInt32 cMin, sal_uInt32 cMax ) const; int GetCharCount() const; @@ -135,21 +135,21 @@ class VCL_DLLPUBLIC TextRectInfo private: long mnMaxWidth; - USHORT mnLineCount; - BOOL mbEllipsis; + sal_uInt16 mnLineCount; + sal_Bool mbEllipsis; public: TextRectInfo(); - USHORT GetLineCount() const { return mnLineCount; } + sal_uInt16 GetLineCount() const { return mnLineCount; } long GetMaxLineWidth() const { return mnMaxWidth; } - BOOL IsEllipses() const { return mbEllipsis; } + sal_Bool IsEllipses() const { return mbEllipsis; } - BOOL operator ==( const TextRectInfo& rInfo ) const + sal_Bool operator ==( const TextRectInfo& rInfo ) const { return ((mnMaxWidth == rInfo.mnMaxWidth) && (mnLineCount == rInfo.mnLineCount) && (mbEllipsis == rInfo.mbEllipsis)); } - BOOL operator !=( const TextRectInfo& rInfo ) const + sal_Bool operator !=( const TextRectInfo& rInfo ) const { return !(TextRectInfo::operator==( rInfo )); } }; @@ -157,7 +157,7 @@ inline TextRectInfo::TextRectInfo() { mnMaxWidth = 0; mnLineCount = 0; - mbEllipsis = FALSE; + mbEllipsis = sal_False; } #endif // _SV_METRIC_HXX |