[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 10 07:20:58 PST 2015
lotuswordpro/source/filter/lwptoc.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit b1d710430aa8ea49664cc766504eb6260a2ef7cd
Author: Caolán McNamara <caolanm at 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/20524
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl at 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();
More information about the Libreoffice-commits
mailing list