commit 88a10c151a373d5ca2b48bf8c18b3a36b6885961
author Caolán McNamara <caolanm@redhat.com> Thu Nov 12 11:56:31 2020 +0000
committer Caolán McNamara <caolanm@redhat.com> Fri Nov 13 09:42:37 2020 +0100
tree 0e70f14f18582593ee1e6124860d6a2de5943cff
parent 817a06d857bff5be35f8eb7bf830b75871556bc5

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 <caolanm@redhat.com>

cui/source/tabpages/border.cxx

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index c60e2a9..1c39571 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))
        {