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/source | |
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/source')
-rwxr-xr-x | vcl/source/gdi/outdev3.cxx | 30 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.cxx | 8 | ||||
-rw-r--r-- | vcl/source/gdi/pdfwriter_impl.hxx | 6 |
3 files changed, 22 insertions, 22 deletions
diff --git a/vcl/source/gdi/outdev3.cxx b/vcl/source/gdi/outdev3.cxx index 3cc438cd503b..6cd8e34d8891 100755 --- a/vcl/source/gdi/outdev3.cxx +++ b/vcl/source/gdi/outdev3.cxx @@ -841,7 +841,7 @@ public: const xub_Unicode* mpTargetStyleName; }; -bool ImplFontData::IsBetterMatch( const ImplFontSelectData& rFSD, FontMatchStatus& rStatus ) const +bool ImplFontData::IsBetterMatch( const FontSelectPattern& rFSD, FontMatchStatus& rStatus ) const { int nMatch = 0; @@ -985,7 +985,7 @@ bool ImplFontData::IsBetterMatch( const ImplFontSelectData& rFSD, FontMatchStatu // ======================================================================= -ImplFontEntry::ImplFontEntry( const ImplFontSelectData& rFontSelData ) +ImplFontEntry::ImplFontEntry( const FontSelectPattern& rFontSelData ) : maFontSelData( rFontSelData ), maMetric( rFontSelData ), mpConversion( NULL ), @@ -1198,7 +1198,7 @@ void ImplDevFontListData::InitMatchData( const utl::FontSubstConfiguration& rFon // ----------------------------------------------------------------------- -ImplFontData* ImplDevFontListData::FindBestFontFace( const ImplFontSelectData& rFSD ) const +ImplFontData* ImplDevFontListData::FindBestFontFace( const FontSelectPattern& rFSD ) const { if( !mpFirst ) return NULL; @@ -1414,7 +1414,7 @@ void ImplDevFontList::InitGenericGlyphFallback( void ) const // ----------------------------------------------------------------------- -ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( ImplFontSelectData& rFontSelData, +ImplDevFontListData* ImplDevFontList::GetGlyphFallbackFont( FontSelectPattern& rFontSelData, rtl::OUString& rMissingCodes, int nFallbackLevel ) const { ImplDevFontListData* pFallbackData = NULL; @@ -2184,7 +2184,7 @@ ImplGetDevSizeList* ImplDevFontList::GetDevSizeList( const String& rFontName ) c // ======================================================================= -ImplFontSelectData::ImplFontSelectData( const Font& rFont, +FontSelectPattern::FontSelectPattern( const Font& rFont, const String& rSearchName, const Size& rSize, float fExactHeight) : maSearchName( rSearchName ), mnWidth( rSize.Width() ), @@ -2220,7 +2220,7 @@ ImplFontSelectData::ImplFontSelectData( const Font& rFont, // ----------------------------------------------------------------------- -ImplFontSelectData::ImplFontSelectData( const ImplFontData& rFontData, +FontSelectPattern::FontSelectPattern( const ImplFontData& rFontData, const Size& rSize, float fExactHeight, int nOrientation, bool bVertical ) : ImplFontAttributes( rFontData ), mnWidth( rSize.Width() ), @@ -2240,7 +2240,7 @@ ImplFontSelectData::ImplFontSelectData( const ImplFontData& rFontData, // ======================================================================= -size_t ImplFontCache::IFSD_Hash::operator()( const ImplFontSelectData& rFSD ) const +size_t ImplFontCache::IFSD_Hash::operator()( const FontSelectPattern& rFSD ) const { // TODO: does it pay off to improve this hash function? static FontNameHash aFontNameHash; @@ -2265,7 +2265,7 @@ size_t ImplFontCache::IFSD_Hash::operator()( const ImplFontSelectData& rFSD ) co // ----------------------------------------------------------------------- -bool ImplFontCache::IFSD_Equal::operator()(const ImplFontSelectData& rA, const ImplFontSelectData& rB) const +bool ImplFontCache::IFSD_Equal::operator()(const FontSelectPattern& rA, const FontSelectPattern& rB) const { // check normalized font family name if( rA.maSearchName != rB.maSearchName ) @@ -2366,14 +2366,14 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, } // initialize internal font request object - ImplFontSelectData aFontSelData( rFont, aSearchName, rSize, fExactHeight ); + FontSelectPattern aFontSelData( rFont, aSearchName, rSize, fExactHeight ); return GetFontEntry( pFontList, aFontSelData, pDevSpecific ); } // ----------------------------------------------------------------------- ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, - ImplFontSelectData& aFontSelData, ImplDirectFontSubstitution* pDevSpecific ) + FontSelectPattern& aFontSelData, ImplDirectFontSubstitution* pDevSpecific ) { // check if a directly matching logical font instance is already cached, // the most recently used font usually has a hit rate of >50% @@ -2446,7 +2446,7 @@ ImplFontEntry* ImplFontCache::GetFontEntry( ImplDevFontList* pFontList, // ----------------------------------------------------------------------- -ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD, +ImplDevFontListData* ImplDevFontList::ImplFindByFont( FontSelectPattern& rFSD, bool bPrinter, ImplDirectFontSubstitution* pDevSpecific ) const { // give up if no fonts are available @@ -2761,7 +2761,7 @@ ImplDevFontListData* ImplDevFontList::ImplFindByFont( ImplFontSelectData& rFSD, // ----------------------------------------------------------------------- ImplFontEntry* ImplFontCache::GetGlyphFallbackFont( ImplDevFontList* pFontList, - ImplFontSelectData& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) + FontSelectPattern& rFontSelData, int nFallbackLevel, rtl::OUString& rMissingCodes ) { // get a candidate font for glyph fallback // unless the previously selected font got a device specific substitution @@ -3321,7 +3321,7 @@ void OutputDevice::ImplInitAboveTextLineSize() // ----------------------------------------------------------------------- -ImplFontMetricData::ImplFontMetricData( const ImplFontSelectData& rFontSelData ) +ImplFontMetricData::ImplFontMetricData( const FontSelectPattern& rFontSelData ) : ImplFontAttributes( rFontSelData ) { // initialize the members provided by the font request @@ -6114,7 +6114,7 @@ SalLayout* OutputDevice::ImplLayout( const String& rOrigStr, } void OutputDevice::forceFallbackFontToFit(SalLayout &rFallback, ImplFontEntry &rFallbackFont, - ImplFontSelectData &rFontSelData, int nFallbackLevel, + FontSelectPattern &rFontSelData, int nFallbackLevel, ImplLayoutArgs& rLayoutArgs, const ImplFontMetricData& rOrigMetric) const { Rectangle aBoundRect; @@ -6184,7 +6184,7 @@ SalLayout* OutputDevice::ImplGlyphFallbackLayout( SalLayout* pSalLayout, ImplLay rLayoutArgs.ResetPos(); rtl::OUString aMissingCodes = aMissingCodeBuf.makeStringAndClear(); - ImplFontSelectData aFontSelData = mpFontEntry->maFontSelData; + FontSelectPattern aFontSelData = mpFontEntry->maFontSelData; ImplFontMetricData aOrigMetric( aFontSelData ); // TODO: use cached metric in fontentry diff --git a/vcl/source/gdi/pdfwriter_impl.cxx b/vcl/source/gdi/pdfwriter_impl.cxx index 7a607afb534c..239a5eb5566f 100644 --- a/vcl/source/gdi/pdfwriter_impl.cxx +++ b/vcl/source/gdi/pdfwriter_impl.cxx @@ -2229,7 +2229,7 @@ public: const PDFWriterImpl::BuiltinFont* GetBuiltinFont() const { return &mrBuiltin; } virtual ImplFontData* Clone() const { return new ImplPdfBuiltinFontData(*this); } - virtual ImplFontEntry* CreateFontInstance( ImplFontSelectData& ) const; + virtual ImplFontEntry* CreateFontInstance( FontSelectPattern& ) const; virtual sal_IntPtr GetFontId() const { return reinterpret_cast<sal_IntPtr>(&mrBuiltin); } }; @@ -2266,7 +2266,7 @@ ImplPdfBuiltinFontData::ImplPdfBuiltinFontData( const PDFWriterImpl::BuiltinFont mrBuiltin( rBuiltin ) {} -ImplFontEntry* ImplPdfBuiltinFontData::CreateFontInstance( ImplFontSelectData& rFSD ) const +ImplFontEntry* ImplPdfBuiltinFontData::CreateFontInstance( FontSelectPattern& rFSD ) const { ImplFontEntry* pEntry = new ImplFontEntry( rFSD ); return pEntry; @@ -2293,7 +2293,7 @@ bool PDFWriterImpl::isBuiltinFont( const ImplFontData* pFont ) const return (pFD != NULL); } -void PDFWriterImpl::getFontMetric( ImplFontSelectData* pSelect, ImplFontMetricData* pMetric ) const +void PDFWriterImpl::getFontMetric( FontSelectPattern* pSelect, ImplFontMetricData* pMetric ) const { const ImplPdfBuiltinFontData* pFD = GetPdfFontData( pSelect->mpFontData ); if( !pFD ) @@ -2430,7 +2430,7 @@ void PDFSalLayout::DrawText( SalGraphics& ) const // ----------------------------------------------------------------------- -SalLayout* PDFWriterImpl::GetTextLayout( ImplLayoutArgs& rArgs, ImplFontSelectData* pSelect ) +SalLayout* PDFWriterImpl::GetTextLayout( ImplLayoutArgs& rArgs, FontSelectPattern* pSelect ) { DBG_ASSERT( (pSelect->mpFontData != NULL), "PDFWriterImpl::GetTextLayout mpFontData is NULL" ); diff --git a/vcl/source/gdi/pdfwriter_impl.hxx b/vcl/source/gdi/pdfwriter_impl.hxx index 65fc682b3b75..fd1c2d742706 100644 --- a/vcl/source/gdi/pdfwriter_impl.hxx +++ b/vcl/source/gdi/pdfwriter_impl.hxx @@ -56,7 +56,7 @@ #include <boost/shared_array.hpp> -class ImplFontSelectData; +class FontSelectPattern; class ImplFontMetricData; class FontSubsetInfo; class ZCodec; @@ -1082,8 +1082,8 @@ public: /* for OutputDevice: get layout for builtin fonts */ bool isBuiltinFont( const ImplFontData* ) const; - SalLayout* GetTextLayout( ImplLayoutArgs& rArgs, ImplFontSelectData* pFont ); - void getFontMetric( ImplFontSelectData* pFont, ImplFontMetricData* pMetric ) const; + SalLayout* GetTextLayout( ImplLayoutArgs& rArgs, FontSelectPattern* pFont ); + void getFontMetric( FontSelectPattern* pFont, ImplFontMetricData* pMetric ) const; /* for documentation of public functions please see pdfwriter.hxx */ |