Add GlyphCache instance to GenericUnixSalData

Desktop / LibreOffice - Jan-Marek Glogowski [fbihome.de] - 6 October 2018 10:06 EDT

This gets rid of some statics and drops some duplicate code:- the X11 based GlyphCache => gone- the svp version of the GlyphCache => gone- the "normal" GlyphCache- the PrintFontManager

And while at it move the implementation into its own file gendata.cxx.

Change-Id: I9063139c9482f5f37285505f389cf5f32c02426b Reviewed-on: https://gerrit.libreoffice.org/61454

8fdb37119f6d Add GlyphCache instance to GenericUnixSalData
solenv/clang-format/blacklist | 3 +-
vcl/Library_vcl.mk | 2 +-
vcl/Library_vclplug_gen.mk | 1 -
vcl/headless/svpgdi.cxx | 8 ++
vcl/headless/svpglyphcache.cxx | 62 ------------
vcl/inc/qt5/Qt5Data.hxx | 1 -
vcl/inc/unx/gendata.hxx | 73 ++++++++++-----
vcl/inc/unx/glyphcache.hxx | 2 +-
.../generic/gdi => inc/unx/x11}/xrender_peer.hxx | 6 +-
vcl/qt5/Qt5Data.cxx | 1 -
.../{gdi/gcach_xpeer.hxx => app/gendata.cxx} | 29 ++++--
vcl/unx/generic/app/saldisp.cxx | 25 ++++-
vcl/unx/generic/fontmanager/fontmanager.cxx | 20 +---
vcl/unx/generic/gdi/gcach_xpeer.cxx | 104 ---------------------
vcl/unx/generic/gdi/gdiimpl.cxx | 2 +-
vcl/unx/generic/gdi/salgdi.cxx | 2 +-
vcl/unx/generic/gdi/salgdi2.cxx | 2 +-
vcl/unx/generic/gdi/x11cairotextrender.cxx | 4 +-
vcl/unx/generic/gdi/xrender_peer.cxx | 2 +-
vcl/unx/generic/glyphs/glyphcache.cxx | 9 +-
20 files changed, 119 insertions(+), 239 deletions(-)

Upstream: cgit.freedesktop.org


  • Share