[Libreoffice-commits] core.git: sfx2/source

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Tue May 5 14:27:24 UTC 2020


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

New commits:
commit 176b933552bc0d0ded3363462e623fa300d5d892
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue May 5 12:39:13 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Tue May 5 16:26:38 2020 +0200

    use GetFamilyItem_Impl to determine the active family
    
    Change-Id: I1ddb4a0312f87cb549e5a054f79a72210af082a5
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/93475
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/sfx2/source/dialog/templdlg.cxx b/sfx2/source/dialog/templdlg.cxx
index f399545f5249..2cfabba06da1 100644
--- a/sfx2/source/dialog/templdlg.cxx
+++ b/sfx2/source/dialog/templdlg.cxx
@@ -906,7 +906,8 @@ void SfxCommonTemplateDialog_Impl::EnableTreeDrag(bool bEnable)
 {
     if (pStyleSheetPool)
     {
-        SfxStyleSheetBase* pStyle = pStyleSheetPool->First(pStyleSheetPool->GetSearchFamily());
+        const SfxStyleFamilyItem* pItem = GetFamilyItem_Impl();
+        SfxStyleSheetBase* pStyle = pItem ? pStyleSheetPool->First(pItem->GetFamily()) : nullptr;
         bAllowReParentDrop = pStyle && pStyle->HasParentSupport() && bEnable;
     }
     bTreeDrag = bEnable;


More information about the Libreoffice-commits mailing list