[Libreoffice-commits] core.git: vcl/inc vcl/qt5

[Libreoffice Gerrit user]

 vcl/inc/qt5/Qt5Data.hxx |    2 ++
 vcl/qt5/Qt5Data.cxx     |    3 +++
 2 files changed, 5 insertions(+)

New commits:
commit 36d37015519d03d21fb7c6c3127bfa3d049dee58
Author:     Jan-Marek Glogowski <glogow at fbihome.de>
AuthorDate: Thu Aug 23 10:18:43 2018 +0200
Commit:     Jan-Marek Glogowski <glogow at fbihome.de>
CommitDate: Thu Aug 23 14:25:50 2018 +0200

    Qt5 initialize unx glyph cache
    
    Until we implement a Qt based glyph cache, this prevents the crash
    for print preview.
    
    Change-Id: I37dd3f90cc0bcac28ef4ce9fe70fd566a781d903
    Reviewed-on: https://gerrit.libreoffice.org/59489
    Tested-by: Jenkins
    Reviewed-by: Jan-Marek Glogowski <glogow at fbihome.de>

diff --git a/vcl/inc/qt5/Qt5Data.hxx b/vcl/inc/qt5/Qt5Data.hxx
index ef537d0c040f..3cda6037c5e9 100644
--- a/vcl/inc/qt5/Qt5Data.hxx
+++ b/vcl/inc/qt5/Qt5Data.hxx
@@ -26,11 +26,13 @@
 #include <memory>
 #include <vclpluginapi.h>
 
+class GlyphCache;
 class QCursor;
 
 class VCLPLUG_QT5_PUBLIC Qt5Data : public GenericUnixSalData
 {
     o3tl::enumarray<PointerStyle, std::unique_ptr<QCursor>> m_aCursors;
+    std::unique_ptr<GlyphCache> m_pGlyphCache;
 
 public:
     explicit Qt5Data(SalInstance* pInstance);
diff --git a/vcl/qt5/Qt5Data.cxx b/vcl/qt5/Qt5Data.cxx
index 9a2117f91a55..284c1614e100 100644
--- a/vcl/qt5/Qt5Data.cxx
+++ b/vcl/qt5/Qt5Data.cxx
@@ -149,8 +149,11 @@
 #include <unx/x11_cursors/wsshow_curs.h>
 #include <unx/x11_cursors/wsshow_mask.h>
 
+#include <unx/glyphcache.hxx>
+
 Qt5Data::Qt5Data(SalInstance* pInstance)
     : GenericUnixSalData(SAL_DATA_QT5, pInstance)
+    , m_pGlyphCache(new GlyphCache())
 {
     ImplSVData* pSVData = ImplGetSVData();