diff options
author | Caolán McNamara <caolanm@redhat.com> | 2015-12-09 16:21:38 +0000 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2015-12-10 16:14:36 +0100 |
commit | cb2b390ad9e5a96a3b6118a4b263f420d428f7f1 (patch) | |
tree | 257baee52e68691910444f3edcdafef75591772b | |
parent | b3d4db8675f25b9361bc161e14f030e130b9c0f3 (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/20536
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 9498d2023543eba23d047b91ea25d63af41f614f)
-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 7cebb589f0ea..c2f2f2071719 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; |