Kaydet (Commit) cb6f34b3 authored tarafından Caolán McNamara's avatar Caolán McNamara

guard against missing spacing property

Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
(cherry picked from commit 10de96bf)
Reviewed-on: https://gerrit.libreoffice.org/20569Reviewed-by: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst 076ec3c4
......@@ -412,18 +412,20 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_SPACING:
{
noSpacing = false;
if (!rParaStyle.GetSpacing())
OverrideSpacing(nullptr,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
else
LwpSpacingOverride *pSpacing = static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing();
if (pSpacing)
{
std::unique_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);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment