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

[Caolán McNamara]

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

New commits:
commit 1f052fb8867da4a87f7c3d51eaeae6f680934d19
Author: Caolán McNamara <caol...@redhat.com>
Date:   Wed Dec 9 13:00:24 2015 +0000

    guard against missing BaseStyle
    
    Change-Id: I173b12f0a28f917f24d1923e531da1b798beb1f6
    (cherry picked from commit d34cbe279cc8e1db941a4da1130d5a6d7429357d)
    Reviewed-on: https://gerrit.libreoffice.org/20523
    Reviewed-by: David Tardon <dtar...@redhat.com>
    Tested-by: David Tardon <dtar...@redhat.com>

diff --git a/lotuswordpro/source/filter/lwptoc.cxx 
b/lotuswordpro/source/filter/lwptoc.cxx
index 75b9aa7..16f8737 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -132,7 +132,8 @@ void LwpTocSuperLayout::RegisterStyle()
     // Get font info of default text style and set into tab style
     XFParaStyle* pBaseStyle = 
static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(*m_pFoundry->GetDefaultTextStyle()));
     XFTextStyle*pTextStyle = new XFTextStyle;
-    pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this font?????
+    if (pBaseStyle)
+        pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this 
font?????
     XFStyleManager* pXFStyleManager = 
LwpGlobalMgr::GetInstance()->GetXFStyleManager();
     m_TabStyleName = 
pXFStyleManager->AddStyle(pTextStyle).m_pStyle->GetStyleName();
 

_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits