diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-02 02:14:21 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2016-12-02 00:59:23 +0000 |
commit | babf6d5e53516e80e8e3f2485796ebfaeb20e9c1 (patch) | |
tree | 777cce951cb665968b88f1b8b09ad8eadc3887f2 /vcl/inc/unx/fontmanager.hxx | |
parent | 33f5bc54aaa7fe7aa9335726e30f9c349155e04d (diff) |
Drop font cache on UNX
On my system reading the ~400 fonts I have takes ~0.07 seconds, which
does not really justify all this complexity. We don’t have such cache on
other platforms as well.
It might have been slower in the past with all PFB and AFM parsing, but
this is gone already.
Killing this ugly fontmanager over engineering one piece at a time.
Change-Id: I41fe3db48dc3de0cf8939c2120403f7d243d6096
Reviewed-on: https://gerrit.libreoffice.org/31511
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Khaled Hosny <khaledhosny@eglug.org>
Diffstat (limited to 'vcl/inc/unx/fontmanager.hxx')
-rw-r--r-- | vcl/inc/unx/fontmanager.hxx | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/vcl/inc/unx/fontmanager.hxx b/vcl/inc/unx/fontmanager.hxx index 86d946a46536..01419dc86b53 100644 --- a/vcl/inc/unx/fontmanager.hxx +++ b/vcl/inc/unx/fontmanager.hxx @@ -118,17 +118,12 @@ struct CharacterMetric { return rOther.width != width || rOther.height != height; } }; -class FontCache; - // a class to manage printable fonts -class FontCache; - class VCL_PLUGIN_PUBLIC PrintFontManager { struct PrintFont; friend struct PrintFont; - friend class FontCache; struct PrintFont { @@ -176,8 +171,6 @@ class VCL_PLUGIN_PUBLIC PrintFontManager std::unordered_map< int, OString > m_aAtomToDir; int m_nNextDirAtom; - mutable FontCache* m_pFontCache; - OString getFontFile( PrintFont* pFont ) const; bool analyzeFontFile( int nDirID, const OString& rFileName, std::list< PrintFont* >& rNewFonts, const char *pFormat=nullptr ) const; |