[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - lotuswordpro/source

Caolán McNamara caolanm at redhat.com
Thu Dec 10 07:35:40 PST 2015


 lotuswordpro/source/filter/lwptoc.cxx |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 7f3ea5e849356a4f1567121059570ce8ed28fedf
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Dec 10 15:34:35 2015 +0000

    guard against missing Foundry
    
    Change-Id: I7e76589689d2c9e79a8823d594e8f3ca030e26cf
    (cherry picked from commit 6093ba6065ea339c5c6de162294eabf0eebe3c80)

diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 905e379..3f31da2 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -130,7 +130,7 @@ void LwpTocSuperLayout::RegisterStyle()
     LwpSuperTableLayout::RegisterStyle();
 
     // Get font info of default text style and set into tab style
-    const LwpObjectID *pDefaultTextStyle = m_pFoundry->GetDefaultTextStyle();
+    const LwpObjectID *pDefaultTextStyle = m_pFoundry ? m_pFoundry->GetDefaultTextStyle() : nullptr;
     XFParaStyle* pBaseStyle = pDefaultTextStyle ? static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle)) : nullptr;
     XFTextStyle*pTextStyle = new XFTextStyle;
     if (pBaseStyle)


More information about the Libreoffice-commits mailing list