commit b6764835b4bbd532ba796b48d52f3e87453776a1
author Jan-Marek Glogowski <glogow@fbihome.de> Tue Dec 04 14:26:18 2018 +0000
committer Jan-Marek Glogowski <glogow@fbihome.de> Wed Dec 05 08:53:25 2018 +0100
tree 2e856b19b41b86d98251a30f36d3909812511dd7
parent b347009a4fb12b01100e97d9577b94449966f873

tdf#121815 just use valid cached layout glyphs

I'm not exacly sure when and why the font cache is invalidated,
but as a result this also invalidates the cached layouted glyphs.

So just check the glyph layout cache state before trying to use
it. But actually the status bar should update it's cache, so I'm
not sure where to really put the fix. At least this won't crash
LO anymore.

Change-Id: I5f3ff8b9d56808af74d1419e878819d6019cd893
Reviewed-on: https://gerrit.libreoffice.org/64529
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glogow@fbihome.de>
(cherry picked from commit 9e2e6c27231f916fec349ff60cb0f2c12e0988ad)
Reviewed-on: https://gerrit.libreoffice.org/64572

vcl/source/outdev/text.cxx

diff --git a/vcl/source/outdev/text.cxx b/vcl/source/outdev/text.cxx
index 2bb81ad..ddc8af2 100644
--- a/vcl/source/outdev/text.cxx
+++ b/vcl/source/outdev/text.cxx
@@ -1249,6 +1249,12 @@
         vcl::TextLayoutCache const* pLayoutCache,
         const SalLayoutGlyphs* pGlyphs) const
{
    if (pGlyphs && !pGlyphs->IsValid())
    {
        SAL_WARN("vcl", "Trying to setup invalid cached glyphs - falling back to relayout!");
        pGlyphs = nullptr;
    }

    if (!InitFont())
        return nullptr;