diff options
| author | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
|---|---|---|
| committer | Philipp Lohmann [pl] <Philipp.Lohmann@Oracle.COM> | 2011-02-14 18:20:23 +0100 |
| commit | db45e5f229c444e481e354863da1d07348ba9d67 (patch) | |
| tree | ada7b20bd8efcfd76f8e169754ddf5bdb774252e /vcl/inc/outfont.hxx | |
| parent | a9aa5e1feff13541cdf725f83c408d5c5d795591 (diff) | |
| parent | ce5f1dd187c3a7d8113c7653fa887b98fd50aaf6 (diff) | |
rebase to DEV300_m100
Diffstat (limited to 'vcl/inc/outfont.hxx')
| -rw-r--r-- | vcl/inc/outfont.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 7ad233449d93..f31e6590a315 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -235,7 +235,7 @@ protected: ImplDevFontListData* ImplFindByTokenNames( const String& ) const; ImplDevFontListData* ImplFindByAliasName( const String& rSearchName, const String& rShortName ) const; ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; - ImplDevFontListData* ImplFindByAttributes( ULONG nSearchType, FontWeight, FontWidth, + ImplDevFontListData* ImplFindByAttributes( sal_uLong nSearchType, FontWeight, FontWidth, FontFamily, FontItalic, const String& rSearchFamily ) const; ImplDevFontListData* FindDefaultFont() const; @@ -254,8 +254,8 @@ private: struct ImplKernPairData { - USHORT mnChar1; - USHORT mnChar2; + sal_uInt16 mnChar1; + sal_uInt16 mnChar2; long mnKern; }; @@ -335,8 +335,8 @@ public: // TODO: make data members private ImplFontMetricData maMetric; // Font Metric const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol long mnLineHeight; - ULONG mnRefCount; - USHORT mnSetFontFlags; // Flags returned by SalGraphics::SetFont() + sal_uLong mnRefCount; + sal_uInt16 mnSetFontFlags; // Flags returned by SalGraphics::SetFont() short mnOwnOrientation; // text angle if lower layers don't rotate text themselves short mnOrientation; // text angle in 3600 system bool mbInit; // true if maMetric member is valid @@ -393,7 +393,7 @@ public: void AddLine( ImplTextLineInfo* pLine ); void Clear(); - ImplTextLineInfo* GetLine( USHORT nLine ) const + ImplTextLineInfo* GetLine( sal_uInt16 nLine ) const { return mpLines[nLine]; } xub_StrLen Count() const { return mnLines; } |