diff options
| author | Justin Luth <justin_luth@sil.org> | 2016-12-17 09:11:25 +0300 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2016-12-17 15:12:40 +0000 |
| commit | 7382c06de7a2c78055279e1a1e7c377f490cccd1 (patch) | |
| tree | 66eb560fa777a6707be0550da124f47cf828dfe4 | |
| parent | a813623240ac9614c8b2b8b890b9eb83663c72c1 (diff) | |
tdf#104613 fix logic error in code replacement: CalcLineSpace
since m_bBorderDist is currently always true, this will not have
any real impact, but it should be ,m_bBorderDist instead of ,true.
Fixes commit 5d9d0f3c979732ade57b9c4c4960dd030ffdc9f9
there is a function for that: CalcLineSpace(xx, bEvenIfNoLine)
Change-Id: Iee4b2e5b112be02573c71ed583ffa8c91457689a
Reviewed-on: https://gerrit.libreoffice.org/32112
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Justin Luth <justin_luth@sil.org>
Reviewed-on: https://gerrit.libreoffice.org/32117
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sw/source/core/layout/frmtool.cxx | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sw/source/core/layout/frmtool.cxx b/sw/source/core/layout/frmtool.cxx index 6c470530adf8..09ffe34bd5a9 100644 --- a/sw/source/core/layout/frmtool.cxx +++ b/sw/source/core/layout/frmtool.cxx @@ -1955,28 +1955,28 @@ long SwBorderAttrs::CalcLeft( const SwFrame *pCaller ) const void SwBorderAttrs::CalcTopLine_() { - m_nTopLine = m_rBox.CalcLineSpace( SvxBoxItemLine::TOP, /*bEvenIfNoLine*/true ); + m_nTopLine = m_rBox.CalcLineSpace( SvxBoxItemLine::TOP, /*bEvenIfNoLine*/m_bBorderDist ); m_nTopLine = m_nTopLine + m_rShadow.CalcShadowSpace(SvxShadowItemSide::TOP); m_bTopLine = false; } void SwBorderAttrs::CalcBottomLine_() { - m_nBottomLine = m_rBox.CalcLineSpace( SvxBoxItemLine::BOTTOM, true ); + m_nBottomLine = m_rBox.CalcLineSpace( SvxBoxItemLine::BOTTOM, m_bBorderDist ); m_nBottomLine = m_nBottomLine + m_rShadow.CalcShadowSpace(SvxShadowItemSide::BOTTOM); m_bBottomLine = false; } void SwBorderAttrs::CalcLeftLine_() { - m_nLeftLine = m_rBox.CalcLineSpace( SvxBoxItemLine::LEFT, true ); + m_nLeftLine = m_rBox.CalcLineSpace( SvxBoxItemLine::LEFT, m_bBorderDist ); m_nLeftLine = m_nLeftLine + m_rShadow.CalcShadowSpace(SvxShadowItemSide::LEFT); m_bLeftLine = false; } void SwBorderAttrs::CalcRightLine_() { - m_nRightLine = m_rBox.CalcLineSpace(SvxBoxItemLine::RIGHT, true ); + m_nRightLine = m_rBox.CalcLineSpace( SvxBoxItemLine::RIGHT, m_bBorderDist ); m_nRightLine = m_nRightLine + m_rShadow.CalcShadowSpace(SvxShadowItemSide::RIGHT); m_bRightLine = false; } |