diff options
| author | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 12:58:19 +1100 |
|---|---|---|
| committer | Chris Sherlock <chris.sherlock79@gmail.com> | 2016-01-09 13:00:11 +1100 |
| commit | eba202b65accc0b4c4e08346c8e579eea58342f4 (patch) | |
| tree | 9ef7ba269c87d7dd4600ad1351e9c83770af8d6c /vcl/inc | |
| parent | 85ac3cd63f6720ff2d3c4b7491f4ad296219fa53 (diff) | |
vcl: rename m_pFontCache to mpFontCache in LogicalFontInstance
This is the only variable in LogicalFontInstance with m_ as the
prefix, so changing to mpFontCache for consistency.
Also small tab cleanup in fontmanager.hxx
Change-Id: Id79392337795259568fbe71efb5200f1e31219a8
Diffstat (limited to 'vcl/inc')
| -rw-r--r-- | vcl/inc/fontinstance.hxx | 2 | ||||
| -rw-r--r-- | vcl/inc/fontmanager.hxx | 20 |
2 files changed, 10 insertions, 12 deletions
diff --git a/vcl/inc/fontinstance.hxx b/vcl/inc/fontinstance.hxx index 01f4c5900f75..892ce15667e2 100644 --- a/vcl/inc/fontinstance.hxx +++ b/vcl/inc/fontinstance.hxx @@ -40,7 +40,7 @@ public: virtual ~LogicalFontInstance(); public: // TODO: make data members private - ImplFontCache * m_pFontCache; + ImplFontCache * mpFontCache; FontSelectPattern maFontSelData; // FontSelectionData ImplFontAttributes maFontAttributes; // Font attributes const ConvertChar* mpConversion; // used e.g. for StarBats->StarSymbol diff --git a/vcl/inc/fontmanager.hxx b/vcl/inc/fontmanager.hxx index bbb7517e9ca1..0e54e9b51855 100644 --- a/vcl/inc/fontmanager.hxx +++ b/vcl/inc/fontmanager.hxx @@ -244,28 +244,26 @@ class VCL_PLUGIN_PUBLIC PrintFontManager }; fontID m_nNextFontID; - std::unordered_map< fontID, PrintFont* > m_aFonts; - std::unordered_map< int, FontFamily > m_aFamilyTypes; - std::list< OString > m_aFontDirectories; + std::unordered_map< fontID, PrintFont* > m_aFonts; + std::unordered_map< int, FontFamily > m_aFamilyTypes; + std::list< OString > m_aFontDirectories; std::list< int > m_aPrivateFontDirectories; - utl::MultiAtomProvider* m_pAtoms; + utl::MultiAtomProvider* m_pAtoms; // for speeding up findFontFileID std::unordered_map< OString, std::set< fontID >, OStringHash > m_aFontFileToFontID; std::unordered_map< OString, int, OStringHash > m_aDirToAtom; - std::unordered_map< int, OString > m_aAtomToDir; - int m_nNextDirAtom; + std::unordered_map< int, OString > m_aAtomToDir; + int m_nNextDirAtom; - std::unordered_multimap< OString, sal_Unicode, OStringHash > - m_aAdobenameToUnicode; - std::unordered_multimap< sal_Unicode, OString > - m_aUnicodeToAdobename; + std::unordered_multimap< OString, sal_Unicode, OStringHash > m_aAdobenameToUnicode; + std::unordered_multimap< sal_Unicode, OString > m_aUnicodeToAdobename; std::unordered_multimap< sal_Unicode, sal_uInt8 > m_aUnicodeToAdobecode; std::unordered_multimap< sal_uInt8, sal_Unicode > m_aAdobecodeToUnicode; - mutable FontCache* m_pFontCache; + mutable FontCache* m_pFontCache; OString getAfmFile( PrintFont* pFont ) const; OString getFontFile( PrintFont* pFont ) const; |