diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-10 09:35:46 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2016-03-01 22:17:42 +0100 |
| commit | 6dd430bc42c4dff8f2a369c43b399ba967d6c6f2 (patch) | |
| tree | bec14ffa429baaaaeb85ff5d2cd3c56002cd67d9 | |
| parent | 78728a1baab197bec1f7c6347db701ab0c205a47 (diff) | |
guard against missing spacing property
(cherry picked from commit 10de96bf0fb820b38607b0c25a0d3219ad343819)
Reviewed-on: https://gerrit.libreoffice.org/20569
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit cb6f34b370da1d45e1c2b945b60cbcaf7b9c3a45)
Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
Reviewed-on: https://gerrit.libreoffice.org/20570
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
(cherry picked from commit 50ca71d16e37cb7612dd26172f5c876882cb700d)
| -rw-r--r-- | lotuswordpro/source/filter/lwppara.cxx | 20 |
1 files changed, 11 insertions, 9 deletions
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index f7ad9d667954..7db7f92852a7 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -418,18 +418,20 @@ void LwpPara::RegisterStyle() case PP_LOCAL_SPACING: { noSpacing = false; - if (!rParaStyle.GetSpacing()) - OverrideSpacing(NULL,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle); - else + LwpSpacingOverride *pSpacing = static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(); + if (pSpacing) { - boost::scoped_ptr<LwpSpacingOverride> const - pSpacing(rParaStyle.GetSpacing()->clone()); - OverrideSpacing(pSpacing.get(), - static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(), - pOverStyle); + if (!rParaStyle.GetSpacing()) + OverrideSpacing(nullptr, pSpacing, pOverStyle); + else + { + std::unique_ptr<LwpSpacingOverride> const + pNewSpacing(rParaStyle.GetSpacing()->clone()); + OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle); + } } - } break; + } case PP_LOCAL_BORDER: { OverrideParaBorder(pProps, pOverStyle); |