diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-12-10 09:35:46 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-12-10 16:14:47 +0100 |
| commit | e97016f46cb4d5119097985c53dc4da62056de39 (patch) | |
| tree | 62c0e0fcc2de35a457f7f095d419db7b4636b58e /lotuswordpro | |
| parent | 5944b2ea8a66d9c613920d65bed85e66264752d2 (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)
Diffstat (limited to 'lotuswordpro')
| -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 ed03231ae794..7ed4d1ae4e38 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); |