Kaydet (Commit) 6c29dbb7 authored tarafından Caolán McNamara's avatar Caolán McNamara

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: 's avatarCaolán McNamara <caolanm@redhat.com>
Tested-by: 's avatarCaolán McNamara <caolanm@redhat.com>
üst f1c27ccc
...@@ -540,15 +540,19 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet ) ...@@ -540,15 +540,19 @@ void SvxBorderTabPage::Reset( const SfxItemSet* rSet )
if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR)) if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::TLBR))
{ {
sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR); sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_TLBR);
const SvxLineItem& rLineItem(*static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId))); if (const SvxLineItem* pLineItem = static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)))
m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, rLineItem.GetLine()); m_aFrameSel.ShowBorder(svx::FrameBorderType::TLBR, pLineItem->GetLine());
else
m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::TLBR);
} }
if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR)) if (m_aFrameSel.IsBorderEnabled(svx::FrameBorderType::BLTR))
{ {
sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR); sal_uInt16 nBorderDiagId = pPool->GetWhich(SID_ATTR_BORDER_DIAG_BLTR);
const SvxLineItem& rLineItem(*static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId))); if (const SvxLineItem* pLineItem = static_cast<const SvxLineItem*>(rSet->GetItem(nBorderDiagId)))
m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, rLineItem.GetLine()); m_aFrameSel.ShowBorder(svx::FrameBorderType::BLTR, pLineItem->GetLine());
else
m_aFrameSel.SetBorderDontCare(svx::FrameBorderType::BLTR);
} }
if (m_xShadowControls) if (m_xShadowControls)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment