diff options
author | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:08:14 +0100 |
---|---|---|
committer | Caolán McNamara <caolanm@redhat.com> | 2011-10-27 16:39:32 +0100 |
commit | bea5e37dd32f30d301aca89ba4875657de7c1025 (patch) | |
tree | b0f0384cdaa9f6ff6d7ce511c7aaa876549fdf30 /vcl/inc/outfont.hxx | |
parent | ac1eb33bfc4ce95779e8a1ed252d928c799afa40 (diff) |
Rename ImplFontSelectData to FontSelectPattern so I know what it does
Rename ImplFontSelectData to FontSelectPattern because I can never remember the
name of the thing. This way I'll be able to remember that its basically the
equivalent of fontconfig's FcPattern
Diffstat (limited to 'vcl/inc/outfont.hxx')
-rw-r--r-- | vcl/inc/outfont.hxx | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/vcl/inc/outfont.hxx b/vcl/inc/outfont.hxx index 8dda453c7492..75871dac4293 100644 --- a/vcl/inc/outfont.hxx +++ b/vcl/inc/outfont.hxx @@ -46,7 +46,7 @@ class ImplFontEntry; class ImplDirectFontSubstitution; class ImplPreMatchFontSubstitution; class ImplGlyphFallbackFontSubstitution; -class ImplFontSelectData; +class FontSelectPattern; class Font; class ConvertChar; struct FontMatchStatus; @@ -122,7 +122,7 @@ public: // by using an ImplFontData object as a factory for its corresponding // ImplFontEntry an ImplFontEntry can be extended to cache device and // font instance specific data - virtual ImplFontEntry* CreateFontInstance( ImplFontSelectData& ) const = 0; + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const = 0; virtual int GetHeight() const { return mnHeight; } virtual int GetWidth() const { return mnWidth; } @@ -133,7 +133,7 @@ public: ImplFontData* GetNextFace() const { return mpNext; } ImplFontData* CreateAlias() const { return Clone(); } - bool IsBetterMatch( const ImplFontSelectData&, FontMatchStatus& ) const; + bool IsBetterMatch( const FontSelectPattern&, FontMatchStatus& ) const; StringCompare CompareWithSize( const ImplFontData& ) const; StringCompare CompareIgnoreSize( const ImplFontData& ) const; virtual ~ImplFontData() {} @@ -153,15 +153,15 @@ friend class ImplDevFontListData; }; // ---------------------- -// - ImplFontSelectData - +// - FontSelectPattern - // ---------------------- -class ImplFontSelectData : public ImplFontAttributes +class FontSelectPattern : public ImplFontAttributes { public: - ImplFontSelectData( const Font&, const String& rSearchName, + FontSelectPattern( const Font&, const String& rSearchName, const Size&, float fExactHeight ); - ImplFontSelectData( const ImplFontData&, const Size&, + FontSelectPattern( const ImplFontData&, const Size&, float fExactHeight, int nOrientation, bool bVertical ); public: // TODO: change to private @@ -212,11 +212,11 @@ public: // find the device font ImplDevFontListData* FindFontFamily( const String& rFontName ) const; - ImplDevFontListData* ImplFindByFont( ImplFontSelectData&, bool bPrinter, ImplDirectFontSubstitution* ) const; + ImplDevFontListData* ImplFindByFont( FontSelectPattern&, bool bPrinter, ImplDirectFontSubstitution* ) const; ImplDevFontListData* ImplFindBySearchName( const String& ) const; // suggest fonts for glyph fallback - ImplDevFontListData* GetGlyphFallbackFont( ImplFontSelectData&, + ImplDevFontListData* GetGlyphFallbackFont( FontSelectPattern&, rtl::OUString& rMissingCodes, int nFallbackLevel ) const; // prepare platform specific font substitutions @@ -270,7 +270,7 @@ struct ImplKernPairData class ImplFontMetricData : public ImplFontAttributes { public: - explicit ImplFontMetricData( const ImplFontSelectData& ); + explicit ImplFontMetricData( const FontSelectPattern& ); void ImplInitTextLineSize( const OutputDevice* pDev ); void ImplInitAboveTextLineSize(); @@ -330,11 +330,11 @@ public: // TODO: hide members behind accessor methods class VCL_PLUGIN_PUBLIC ImplFontEntry { public: - explicit ImplFontEntry( const ImplFontSelectData& ); + explicit ImplFontEntry( const FontSelectPattern& ); virtual ~ImplFontEntry(); public: // TODO: make data members private - ImplFontSelectData maFontSelData; // FontSelectionData + FontSelectPattern maFontSelData; // FontSelectionData ImplFontMetricData maMetric; // Font Metric const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol long mnLineHeight; |