[Libreoffice-commits] core.git: Branch 'libreoffice-7-0' - sfx2/source

[Noel Grandin (via logerrit)]

 sfx2/source/dialog/templdlg.cxx |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit e25ba916316a88c5652810108e3fdace0ad2f4d5
Author:     Noel Grandin <noelgrandin at gmail.com>
AuthorDate: Thu Oct 29 19:55:37 2020 +0200
Commit:     Noel Grandin <noel.grandin at collabora.co.uk>
CommitDate: Fri Oct 30 09:03:21 2020 +0100

    tdf#137754 Crash in styles tree in sidebar in impress
    
    this is a timing bug - easier to hit on a slow machine,
    or with a debug build - it happens when mouse movement
    triggers a request for a tooltip in the tree, but the tree
    is in a transition state.
    
    Change-Id: Ibed7ffd01483b26f2debb1aa9cc99e23b38ba950
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105025
    Tested-by: Jenkins
    Reviewed-by: Noel Grandin <noel.grandin at collabora.co.uk>
    (cherry picked from commit 9f6fbe36da3d53df0b64c41e9ea51cc20d442a30)
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/104962
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index 4ca4b292cfbf..40851576fe78 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -241,6 +241,8 @@ IMPL_LINK(SfxCommonTemplateDialog_Impl, QueryTooltipHdl, const weld::TreeIter&,
     OUString sQuickHelpText(aTemplName);
 
     const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+    if (!pItem)
+        return sQuickHelpText;
     SfxStyleSheetBase* pStyle = pStyleSheetPool->Find(aTemplName, pItem->GetFamily());
 
     if (pStyle && pStyle->IsUsed())  // pStyle is in use in the document?