diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-25 19:52:09 +0300 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-11-25 20:35:57 +0100 |
| commit | 4ac2f1799f1d6d428c06e5699c246184dd8590ad (patch) | |
| tree | b96b61a7a037074d3155b63f30c01fbf276c491f /lotuswordpro | |
| parent | 1bc269504bc16b188f77204f53f1c34541750da9 (diff) | |
tdf#120703 PVS: V560 A part of conditional expression is always true/false
Change-Id: I2ae298f49ceba8059cd7236431db9a4d9a46b125
Reviewed-on: https://gerrit.libreoffice.org/63992
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
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)) { |