guard against missing spacing property

Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb

guard against missing spacing property
Change-Id: If5c50cddfee88cc92852737c1459ebe94b7256bb
10de96bf · Caolán McNamara · 08fe513b · 10de96bf
Kaydet (Commit) 10de96bf authored Ara 10, 2015 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 9 deletions

lwppara.cxx lotuswordpro/source/filter/lwppara.cxx +11 -9

No files found.
--- 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())
+                LwpSpacingOverride *pSpacing = static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing();
-                    OverrideSpacing(nullptr,static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),pOverStyle);
+                if (pSpacing)
-                else
                {
-                    std::unique_ptr<LwpSpacingOverride> const
+                    if (!rParaStyle.GetSpacing())
-                        pSpacing(rParaStyle.GetSpacing()->clone());
+                        OverrideSpacing(nullptr, pSpacing, pOverStyle);
-                    OverrideSpacing(pSpacing.get(),
+                    else
-                            static_cast<LwpParaSpacingProperty*>(pProps)->GetSpacing(),
+                    {
-                            pOverStyle);
+                        std::unique_ptr<LwpSpacingOverride> const
+                            pNewSpacing(rParaStyle.GetSpacing()->clone());
+                        OverrideSpacing(pNewSpacing.get(), pSpacing, pOverStyle);
+                    }
                }
-            }
                break;
+            }
            case PP_LOCAL_BORDER:
            {
                OverrideParaBorder(pProps, pOverStyle);