[Libreoffice-commits] core.git: Branch 'libreoffice-6-2-3' - cui/source

[Caolán McNamara (via logerrit)]

 cui/source/tabpages/border.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

New commits:
commit 63f8f7c852822a68923092c239cff35a99f448b9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Mar 29 12:05:56 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Mon Apr 1 18:14:26 2019 +0200

    Resolves: tdf#124410 crash cell border page with diagonal borders
    
    Change-Id: I0fd8738d42ad33f029381dae0ec9f41e7912b72c
    Reviewed-on: https://gerrit.libreoffice.org/69918
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>
    (cherry picked from commit 6c29dbb7a1c3a04f3cbaa3dd720db482755538d7)
    Reviewed-on: https://gerrit.libreoffice.org/69919
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    (cherry picked from commit 685c847a00ee653bd0c2bd42a7f7f866885896e8)
    Reviewed-on: https://gerrit.libreoffice.org/69965
    Reviewed-by: Michael Stahl <Michael.Stahl at cib.de>

diff --git a/cui/source/tabpages/border.cxx b/cui/source/tabpages/border.cxx
index 009297050a59..4960f160357f 100644
--- a/cui/source/tabpages/border.cxx
+++ b/cui/source/tabpages/border.cxx
@@ -549,15 +549,19 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
     if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR))
     {
         sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR);
-        const SvxLineItem& rLineItem(*static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)));
-        m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, rLineItem.GetLine());
+        if (const SvxLineItem* pLineItem = static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)))
+            m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, pLineItem->GetLine());
+        else
+            m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::TLBR);
     }
 
     if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
     {
         sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR);
-        const SvxLineItem& rLineItem(*static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)));
-        m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, rLineItem.GetLine());
+        if (const SvxLineItem* pLineItem = static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)))
+            m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, pLineItem->GetLine());
+        else
+            m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::BLTR);
     }
 
     if (m_xShadowControls)