[Libreoffice-commits] core.git: Branch 'libreoffice-5-0' - lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Wed Dec 9 05:56:19 PST 2015
lotuswordpro/source/filter/lwptoc.cxx | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
New commits:
commit da794ce092673fcfd1311cb9a218098a400682e3
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 9 13:30:02 2015 +0000
guard against no default text style
Change-Id: I7416d709de79ae88cf4a9546d8adfecec9935238
(cherry picked from commit 80297dd0f21bfeaa9bae09cacfa29ab2eee64c09)
Reviewed-on: https://gerrit.libreoffice.org/20529
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/lotuswordpro/source/filter/lwptoc.cxx b/lotuswordpro/source/filter/lwptoc.cxx
index 16f8737..dfb4178 100644
--- a/lotuswordpro/source/filter/lwptoc.cxx
+++ b/lotuswordpro/source/filter/lwptoc.cxx
@@ -130,7 +130,8 @@ void LwpTocSuperLayout::RegisterStyle()
LwpSuperTableLayout::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()));
+ const LwpObjectID *pDefaultTextStyle = m_pFoundry->GetDefaultTextStyle();
+ XFParaStyle* pBaseStyle = pDefaultTextStyle ? static_cast<XFParaStyle*>(m_pFoundry->GetStyleManager()->GetStyle(*pDefaultTextStyle)) : nullptr;
XFTextStyle*pTextStyle = new XFTextStyle;
if (pBaseStyle)
pTextStyle->SetFont(pBaseStyle->GetFont()); // who delete this font?????
More information about the Libreoffice-commits
mailing list