lotuswordpro/source/filter/lwppara.cxx | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-)
New commits: commit 3592f0020b3136b17f6b8289f433462563a46759 Author: Caolán McNamara <[email protected]> Date: Wed Dec 9 16:48:29 2015 +0000 guard against missing alignment property (cherry picked from commit 7e341379ecec218c0ff2ff0e8db9f14468b125f6) Reviewed-on: https://gerrit.libreoffice.org/20543 Reviewed-by: Caolán McNamara <[email protected]> Tested-by: Caolán McNamara <[email protected]> (cherry picked from commit 3b9e2bb22e782d073d8e67ae975ebb8ca5eea552) Change-Id: I1d4825c2136e516baf759f4b2c40c911547b93d7 Reviewed-on: https://gerrit.libreoffice.org/20544 Reviewed-by: David Tardon <[email protected]> Tested-by: David Tardon <[email protected]> diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index c2f2f20..ed03231 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -386,18 +386,22 @@ void LwpPara::RegisterStyle() { case PP_LOCAL_ALIGN: { - if (!rParaStyle.GetAlignment()) - OverrideAlignment(NULL,static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(),pOverStyle); - else + LwpAlignmentOverride *pAlignment = static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(); + if (pAlignment) { - boost::scoped_ptr<LwpAlignmentOverride> const pAlign( - rParaStyle.GetAlignment()->clone()); - OverrideAlignment(pAlign.get(), - static_cast<LwpParaAlignProperty*>(pProps)->GetAlignment(), - pOverStyle); + if (!rParaStyle.GetAlignment()) + OverrideAlignment(nullptr, pAlignment, pOverStyle); + else + { + std::unique_ptr<LwpAlignmentOverride> const pAlign( + rParaStyle.GetAlignment()->clone()); + OverrideAlignment(pAlign.get(), + pAlignment, + pOverStyle); + } } - } break; + } case PP_LOCAL_INDENT: { noIndent = false;
_______________________________________________ Libreoffice-commits mailing list [email protected] http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
