diff options
Diffstat (limited to 'lotuswordpro')
-rw-r--r-- | lotuswordpro/source/filter/lwpfnlayout.cxx | 4 | ||||
-rw-r--r-- | lotuswordpro/source/filter/lwppara.cxx | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lotuswordpro/source/filter/lwpfnlayout.cxx b/lotuswordpro/source/filter/lwpfnlayout.cxx index c2ac01055119..6dc167ff8dda 100644 --- a/lotuswordpro/source/filter/lwpfnlayout.cxx +++ b/lotuswordpro/source/filter/lwpfnlayout.cxx @@ -264,7 +264,7 @@ LwpVirtualLayout* LwpEnSuperTableLayout::GetMainTableLayout() { break; } - if (pLayout && pLayout->GetLayoutType() == LWP_ENDNOTE_LAYOUT) + if (pLayout->GetLayoutType() == LWP_ENDNOTE_LAYOUT) { return pLayout; } @@ -321,7 +321,7 @@ LwpVirtualLayout* LwpFnSuperTableLayout::GetMainTableLayout() { break; } - if (pLayout && pLayout->GetLayoutType() == LWP_FOOTNOTE_LAYOUT) + if (pLayout->GetLayoutType() == LWP_FOOTNOTE_LAYOUT) { return pLayout; } diff --git a/lotuswordpro/source/filter/lwppara.cxx b/lotuswordpro/source/filter/lwppara.cxx index aca3fb934ac3..5b92281b0560 100644 --- a/lotuswordpro/source/filter/lwppara.cxx +++ b/lotuswordpro/source/filter/lwppara.cxx @@ -546,7 +546,7 @@ void LwpPara::RegisterStyle() } else { - if (pNumbering && pNumbering->GetLevel() < nFoundBound && pParaSilverBullet + if (pNumbering->GetLevel() < nFoundBound && (pParaSilverBullet->GetObjectID() != m_pSilverBullet->GetObjectID() || pNumbering->GetPosition() != nPosition)) { |