cui/source/tabpages/border.cxx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
New commits: commit 88a10c151a373d5ca2b48bf8c18b3a36b6885961 Author: Caolán McNamara <[email protected]> AuthorDate: Thu Nov 12 11:56:31 2020 +0000 Commit: Caolán McNamara <[email protected]> CommitDate: Fri Nov 13 09:42:37 2020 +0100 tdf#138156 diagonal borders always set even if in don't care mode Change-Id: If55ac230c2f591e79a6c90df07870233a46eca5d Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105672 Tested-by: Jenkins Reviewed-by: Caolán McNamara <[email protected]> diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx index c60e2a9aba1d..1c39571cccf8 100644 --- a/cui/source/tabpages/border.cxx +++ b/cui/source/tabpages/border.cxx @@ -885,7 +885,8 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) SfxItemPool* pPool = rCoreAttrs->GetPool(); - if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR)) + if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR) && + m_aFrameSel.GetFrameBorderState(svx::FrameBorderType::TLBR) != svx::FrameBorderState::DontCare) { if (const SfxPoolItem* pOldItem = GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_TLBR)) { @@ -896,7 +897,8 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs ) } } - if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR)) + if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR) && + m_aFrameSel.GetFrameBorderState(svx::FrameBorderType::BLTR) != svx::FrameBorderState::DontCare) { if (const SfxPoolItem* pOldItem = GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_BLTR)) { _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
