commit b89e61976dbf4d990f8cc74d90d6e73aba98a629
author Caolán McNamara <caolanm@redhat.com> Thu Nov 12 11:56:31 2020 +0000
committer Miklos Vajna <vmiklos@collabora.com> Tue Nov 17 11:39:35 2020 +0100
tree 52f214e8fd4529bcd2dd028b8ec4aefcec4c7119
parent a3fbd4903c50496774405bcfa16246ceaa2e1f50

tdf#138156 diagonal borders always set even if in don't care mode

Change-Id: If55ac230c2f591e79a6c90df07870233a46eca5d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105542
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>

cui/source/tabpages/border.cxx

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 8dc87e8..ed6c1ad 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -844,7 +844,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)
    {
        SvxLineItem aLineItem(*static_cast<const SvxLineItem*>(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_TLBR)));
        aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::TLBR));
@@ -852,7 +853,8 @@ bool SvxBorderTabPage::FillItemSet( SfxItemSet* rCoreAttrs )
        bAttrsChanged = true;
    }

    if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
    if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR) &&
        m_aFrameSel.GetFrameBorderState(svx::FrameBorderType::BLTR) != svx::FrameBorderState::DontCare)
    {
        SvxLineItem aLineItem(*static_cast<const SvxLineItem*>(GetOldItem(*rCoreAttrs, SID_ATTR_BORDER_DIAG_BLTR)));
        aLineItem.SetLine(m_aFrameSel.GetFrameBorderStyle(svx::FrameBorderType::BLTR));