Kaydet (Commit) cabee397 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

rename ImplDevFontListData to PhysicalFontFamily

following the naming of PhysicalFontFace
in an effort to give more explicit and meaning full
names to the many-many ImplFontforbar classes

Change-Id: I6dcf44e8f9ba312d8293298198b92f283dac0362
üst 18feb733
...@@ -41,12 +41,12 @@ class GetDevSizeList; ...@@ -41,12 +41,12 @@ class GetDevSizeList;
#define IMPL_DEVFONT_NONEITALIC ((sal_uIntPtr)0x00000100) #define IMPL_DEVFONT_NONEITALIC ((sal_uIntPtr)0x00000100)
#define IMPL_DEVFONT_ITALIC ((sal_uIntPtr)0x00000200) #define IMPL_DEVFONT_ITALIC ((sal_uIntPtr)0x00000200)
// TODO: rename ImplDevFontListData to PhysicalFontFamily
class ImplDevFontListData class PhysicalFontFamily
{ {
public: public:
ImplDevFontListData( const OUString& rSearchName ); PhysicalFontFamily( const OUString& rSearchName );
~ImplDevFontListData(); ~PhysicalFontFamily();
const OUString& GetFamilyName() const { return maName; } const OUString& GetFamilyName() const { return maName; }
const OUString& GetSearchName() const { return maSearchName; } const OUString& GetSearchName() const { return maSearchName; }
......
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
#include <boost/unordered_map.hpp> #include <boost/unordered_map.hpp>
class ImplDevFontListData; class PhysicalFontFamily;
class ImplGetDevFontList; class ImplGetDevFontList;
class ImplGetDevSizeList; class ImplGetDevSizeList;
class ImplFontEntry; class ImplFontEntry;
...@@ -150,7 +150,7 @@ protected: ...@@ -150,7 +150,7 @@ protected:
long mnHeight; // Height (in pixels) long mnHeight; // Height (in pixels)
private: private:
friend class ImplDevFontListData; friend class PhysicalFontFamily;
const int mnMagic; // poor man's RTTI const int mnMagic; // poor man's RTTI
PhysicalFontFace* mpNext; PhysicalFontFace* mpNext;
}; };
...@@ -217,7 +217,7 @@ private: ...@@ -217,7 +217,7 @@ private:
mutable bool mbMatchData; // true if matching attributes are initialized mutable bool mbMatchData; // true if matching attributes are initialized
bool mbMapNames; // true if MapNames are available bool mbMapNames; // true if MapNames are available
typedef boost::unordered_map<const OUString, ImplDevFontListData*,FontNameHash> DevFontList; typedef boost::unordered_map<const OUString, PhysicalFontFamily*,FontNameHash> DevFontList;
DevFontList maDevFontList; DevFontList maDevFontList;
ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution ImplPreMatchFontSubstitution* mpPreMatchHook; // device specific prematch substitution
...@@ -233,12 +233,12 @@ public: ...@@ -233,12 +233,12 @@ public:
int Count() const { return maDevFontList.size(); } int Count() const { return maDevFontList.size(); }
// find the device font // find the device font
ImplDevFontListData* FindFontFamily( const OUString& rFontName ) const; PhysicalFontFamily* FindFontFamily( const OUString& rFontName ) const;
ImplDevFontListData* ImplFindByFont( FontSelectPattern& ) const; PhysicalFontFamily* ImplFindByFont( FontSelectPattern& ) const;
ImplDevFontListData* ImplFindBySearchName( const OUString& ) const; PhysicalFontFamily* ImplFindBySearchName( const OUString& ) const;
// suggest fonts for glyph fallback // suggest fonts for glyph fallback
ImplDevFontListData* GetGlyphFallbackFont( FontSelectPattern&, PhysicalFontFamily* GetGlyphFallbackFont( FontSelectPattern&,
OUString& rMissingCodes, int nFallbackLevel ) const; OUString& rMissingCodes, int nFallbackLevel ) const;
// prepare platform specific font substitutions // prepare platform specific font substitutions
...@@ -250,22 +250,22 @@ public: ...@@ -250,22 +250,22 @@ public:
ImplGetDevFontList* GetDevFontList() const; ImplGetDevFontList* GetDevFontList() const;
ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const; ImplGetDevSizeList* GetDevSizeList( const OUString& rFontName ) const;
ImplDevFontListData* ImplFindByTokenNames(const OUString& rTokenStr) const; PhysicalFontFamily* ImplFindByTokenNames(const OUString& rTokenStr) const;
protected: protected:
void InitMatchData() const; void InitMatchData() const;
bool AreMapNamesAvailable() const { return mbMapNames; } bool AreMapNamesAvailable() const { return mbMapNames; }
ImplDevFontListData* ImplFindByAliasName(const OUString& rSearchName, PhysicalFontFamily* ImplFindByAliasName(const OUString& rSearchName,
const OUString& rShortName) const; const OUString& rShortName) const;
ImplDevFontListData* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const; PhysicalFontFamily* ImplFindBySubstFontAttr( const utl::FontNameAttr& ) const;
ImplDevFontListData* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth, PhysicalFontFamily* ImplFindByAttributes(sal_uLong nSearchType, FontWeight, FontWidth,
FontItalic, const OUString& rSearchFamily) const; FontItalic, const OUString& rSearchFamily) const;
ImplDevFontListData* FindDefaultFont() const; PhysicalFontFamily* FindDefaultFont() const;
private: private:
void InitGenericGlyphFallback() const; void InitGenericGlyphFallback() const;
mutable ImplDevFontListData** mpFallbackList; mutable PhysicalFontFamily** mpFallbackList;
mutable int mnFallbackCount; mutable int mnFallbackCount;
}; };
......
This diff is collapsed.
...@@ -514,7 +514,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pF ...@@ -514,7 +514,7 @@ bool WinGlyphFallbackSubstititution::HasMissingChars( const PhysicalFontFace* pF
namespace namespace
{ {
//used by 2-level font fallback //used by 2-level font fallback
ImplDevFontListData* findDevFontListByLocale(const ImplDevFontList &rDevFontList, PhysicalFontFamily* findDevFontListByLocale(const ImplDevFontList &rDevFontList,
const LanguageTag& rLanguageTag ) const LanguageTag& rLanguageTag )
{ {
// get the default font for a specified locale // get the default font for a specified locale
...@@ -552,7 +552,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon ...@@ -552,7 +552,7 @@ bool WinGlyphFallbackSubstititution::FindFontSubstitute( FontSelectPattern& rFon
// first level fallback: // first level fallback:
// try use the locale specific default fonts defined in VCL.xcu // try use the locale specific default fonts defined in VCL.xcu
const ImplDevFontList* pDevFontList = ImplGetSVData()->maGDIData.mpScreenFontList; const ImplDevFontList* pDevFontList = ImplGetSVData()->maGDIData.mpScreenFontList;
/*const*/ ImplDevFontListData* pDevFont = findDevFontListByLocale(*pDevFontList, aLanguageTag); /*const*/ PhysicalFontFamily* pDevFont = findDevFontListByLocale(*pDevFontList, aLanguageTag);
if( pDevFont ) if( pDevFont )
{ {
const PhysicalFontFace* pFace = pDevFont->FindBestFontFace( rFontSelData ); const PhysicalFontFace* pFace = pDevFont->FindBestFontFace( rFontSelData );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment