diff options
Diffstat (limited to 'vcl/inc/vcl/outfont.hxx')
-rw-r--r-- | vcl/inc/vcl/outfont.hxx | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/vcl/inc/vcl/outfont.hxx b/vcl/inc/vcl/outfont.hxx index 4bbf7176ddb2..86b992e16031 100644 --- a/vcl/inc/vcl/outfont.hxx +++ b/vcl/inc/vcl/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_uIntPtr 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_uIntPtr 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; } |