diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 16:21:38 +0000 |
---|---|---|
committer | Michael Stahl <mstahl@redhat.com> | 2015-12-10 15:30:03 +0000 |
commit | 381677690ca0f7f071cb998ec457f7b79e87c0f2 (patch) | |
tree | d4e5339fd7fb45af3ec4ccc8aef497cd16580476 /lotuswordpro | |
parent | cf3acc198c804140e2dab73a0ee4df81a6ae5927 (diff) |
guard against missing indent property
(cherry picked from commit ae94fc5b28105c920b2e9d336f463b27cae5b0e1)
Reviewed-on: https://gerrit.libreoffice.org/20535
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit d9f6f9063d34f29eb44d82159c411646dc19c83f)
Change-Id: I2d3369aed4b242acc936a71ee9be573c1ebc7a8f
Reviewed-on: https://gerrit.libreoffice.org/20537
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwppara.cxx | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index f6f7c90f6ce6..13845f4b610e 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -401,15 +401,16 @@ void LwpPara::RegisterStyle() case PP_LOCAL_INDENT: { noIndent = false; - if (!rParaStyle.GetIndent()) - OverrideIndent(NULL,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle); - - else + LwpIndentOverride *pIndent = static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(); + if (pIndent) { - OverrideIndent(m_pIndentOverride,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle); + if (!rParaStyle.GetIndent()) + OverrideIndent(nullptr, pIndent, pOverStyle); + else + OverrideIndent(m_pIndentOverride, pIndent, pOverStyle); } - } break; + } case PP_LOCAL_SPACING: { noSpacing = false; |