[Libreoffice-commits] core.git: Branch 'libreoffice-5-0-4' - lotuswordpro/source
Caolán McNamara
caolanm at redhat.com
Thu Dec 10 07:30:35 PST 2015
lotuswordpro/source/filter/lwppara.cxx | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
New commits:
commit 381677690ca0f7f071cb998ec457f7b79e87c0f2
Author: Caolán McNamara <caolanm at redhat.com>
Date: Wed Dec 9 16:21:38 2015 +0000
guard against missing indent property
(cherry picked from commit ae94fc5b28105c920b2e9d336f463b27cae5b0e1)
Reviewed-on: https://gerrit.libreoffice.org/20535
Reviewed-by: Caolán McNamara <caolanm at redhat.com>
Tested-by: Caolán McNamara <caolanm at redhat.com>
(cherry picked from commit d9f6f9063d34f29eb44d82159c411646dc19c83f)
Change-Id: I2d3369aed4b242acc936a71ee9be573c1ebc7a8f
Reviewed-on: https://gerrit.libreoffice.org/20537
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
Reviewed-by: Miklos Vajna <vmiklos at collabora.co.uk>
Reviewed-by: Michael Stahl <mstahl at redhat.com>
diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx
index f6f7c90..13845f4 100644
--- a/lotuswordpro/source/filter/lwppara.cxx
+++ b/lotuswordpro/source/filter/lwppara.cxx
@@ -401,15 +401,16 @@ void LwpPara::RegisterStyle()
case PP_LOCAL_INDENT:
{
noIndent = false;
- if (!rParaStyle.GetIndent())
- OverrideIndent(NULL,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
-
- else
+ LwpIndentOverride *pIndent = static_cast<LwpParaIndentProperty*>(pProps)->GetIndent();
+ if (pIndent)
{
- OverrideIndent(m_pIndentOverride,static_cast<LwpParaIndentProperty*>(pProps)->GetIndent(),pOverStyle);
+ if (!rParaStyle.GetIndent())
+ OverrideIndent(nullptr, pIndent, pOverStyle);
+ else
+ OverrideIndent(m_pIndentOverride, pIndent, pOverStyle);
}
- }
break;
+ }
case PP_LOCAL_SPACING:
{
noSpacing = false;
More information about the Libreoffice-commits
mailing list