Skip to content

C
core
Kaydet (Commit) 10de96bf authored tarafından Caolán McNamara's avatar Caolán McNamara
Dosyalara gözat
Seçenekler

guard against missing spacing property 

Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
üst 08fe513b
Show whitespace changes
Inline Side-by-side
Showing with 7 additions and 5 deletions
lotuswordpro/source/filter/lwppara.cxx
Dosyayı görüntüle @ 10de96bf
...@@ -412,18 +412,20 @@ void LwpPara::RegisterStyle() ...@@ -412,18 +412,20 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_SPACING: case PP_LOCAL_SPACING:
{ {
noSpacing = false; noSpacing = false;
LwpSpacingOverride *pSpacing = static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing();
if (pSpacing)
{
if (!rParaStyle.GetSpacing()) if (!rParaStyle.GetSpacing())
OverrideSpacing(nullptr,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle); OverrideSpacing(nullptr, pSpacing, pOverStyle);
else else
{ {
std::unique_ptr<LwpSpacingOverride> const std::unique_ptr<LwpSpacingOverride> const
pSpacing(rParaStyle.GetSpacing()->clone()); pNewSpacing(rParaStyle.GetSpacing()->clone());
OverrideSpacing(pSpacing.get(), OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle);
static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),
pOverStyle);
} }
} }
break; break;
}
case PP_LOCAL_BORDER: case PP_LOCAL_BORDER:
{ {
OverrideParaBorder(pProps, pOverStyle); 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