diff options
Diffstat (limited to 'lotuswordpro/source/filter/lwpparastyle.cxx')
| -rw-r--r-- | lotuswordpro/source/filter/lwpparastyle.cxx | 30 |
1 files changed, 12 insertions, 18 deletions
diff --git a/lotuswordpro/source/filter/lwpparastyle.cxx b/lotuswordpro/source/filter/lwpparastyle.cxx index 157dc041adc1..e99ee6a9e603 100644 --- a/lotuswordpro/source/filter/lwpparastyle.cxx +++ b/lotuswordpro/source/filter/lwpparastyle.cxx @@ -436,17 +436,14 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden pTotalIndent.reset(pIndent->clone()); //for bullet only - if (pPara) + if (pPara && pPara->GetBulletFlag()) { - if (pPara->GetBulletFlag()) - { - pTotalIndent->SetMAll(o3tl::saturating_add(pParentIndent->GetMAll(), pTotalIndent->GetMAll())); - pTotalIndent->SetMRight(o3tl::saturating_add(pParentIndent->GetMRight(), pTotalIndent->GetMRight())); - pParaStyle->SetMargins(LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits( - pTotalIndent->GetMAll())), pTotalIndent->GetRight()); - pPara->SetIndent(pTotalIndent.release()); - return; - } + pTotalIndent->SetMAll(o3tl::saturating_add(pParentIndent->GetMAll(), pTotalIndent->GetMAll())); + pTotalIndent->SetMRight(o3tl::saturating_add(pParentIndent->GetMRight(), pTotalIndent->GetMRight())); + pParaStyle->SetMargins(LwpTools::ConvertToMetric(LwpTools::ConvertFromUnits( + pTotalIndent->GetMAll())), pTotalIndent->GetRight()); + pPara->SetIndent(pTotalIndent.release()); + return; } sal_uInt16 relative = pParentIndent->GetRelative(); @@ -467,15 +464,12 @@ void LwpParaStyle::ApplyIndent(LwpPara* pPara, XFParaStyle* pParaStyle, LwpInden else { pTotalIndent.reset(pIndent->clone()); - if (pPara) + if (pPara && pPara->GetBulletFlag()) { - if (pPara->GetBulletFlag()) - { - pParaStyle->SetMargins(LwpTools::ConvertToMetric( - LwpTools::ConvertFromUnits(pIndent->GetMAll())), pIndent->GetRight()); - pPara->SetIndent(pTotalIndent.release()); - return; - } + pParaStyle->SetMargins(LwpTools::ConvertToMetric( + LwpTools::ConvertFromUnits(pIndent->GetMAll())), pIndent->GetRight()); + pPara->SetIndent(pTotalIndent.release()); + return; } pParaStyle->SetIndent(pIndent->GetFirst()); |