From cb6f34b370da1d45e1c2b945b60cbcaf7b9c3a45 Mon Sep 17 00:00:00 2001 From: Caolán McNamara Date: Thu, 10 Dec 2015 09:35:46 +0000 Subject: guard against missing spacing property MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb (cherry picked from commit 10de96bf0fb820b38607b0c25a0d3219ad343819) Reviewed-on: https://gerrit.libreoffice.org/20569 Reviewed-by: Caolán McNamara Tested-by: Caolán McNamara --- lotuswordpro/source/filter/lwppara.cxx | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index 6226e0d29cb2..17454b648610 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -412,18 +412,20 @@ void LwpPara::RegisterStyle() case PP_LOCAL_SPACING: { noSpacing = false; - if (!rParaStyle.GetSpacing()) - OverrideSpacing(nullptr,static_cast(pProps)->GetSpacing(),pOverStyle); - else + LwpSpacingOverride *pSpacing = static_cast(pProps)->GetSpacing(); + if (pSpacing) { - std::unique_ptr const - pSpacing(rParaStyle.GetSpacing()->clone()); - OverrideSpacing(pSpacing.get(), - static_cast(pProps)->GetSpacing(), - pOverStyle); + if (!rParaStyle.GetSpacing()) + OverrideSpacing(nullptr, pSpacing, pOverStyle); + else + { + std::unique_ptr const + pNewSpacing(rParaStyle.GetSpacing()->clone()); + OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle); + } } - } break; + } case PP_LOCAL_BORDER: { OverrideParaBorder(pProps, pOverStyle); -- cgit v1.2.3