mir/libreoffice
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

td#f119300 crash in Manage BreakPoints dialog

Browse Source 
regression from
    commit 4b5699bff5
    loplugin:useuniqueptr in BreakPointList

Change-Id: Ia95a1a15563b1664de938fad7c6435fc82ebf04c
Reviewed-on: https://gerrit.libreoffice.org/59170
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
This commit is contained in:
Noel Grandin
2018-08-16 14:02:25 +02:00
parent b264c92768
commit 0bafa88ce3
2 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
basctl/source/basicide/brkdlg.cxx
View File

@@ -24,6 +24,7 @@
#include <basidesh.hxx>
#include <sfx2/dispatch.hxx>
#include <vcl/lstbox.hxx>
namespace basctl
{
@@ -153,8 +154,9 @@ void BreakPointDialog::CheckButtons()
IMPL_LINK( BreakPointDialog, CheckBoxHdl, Button *, pButton, void )
{
::CheckBox * pChkBx = static_cast<::CheckBox*>(pButton);
BreakPoint& rBrk = GetSelectedBreakPoint();
rBrk.bEnabled = pChkBx->IsChecked();
BreakPoint* pBrk = GetSelectedBreakPoint();
if (pBrk)
pBrk->bEnabled = pChkBx->IsChecked();
}
IMPL_LINK( BreakPointDialog, ComboBoxHighlightHdl, ComboBox&, rBox, void )
@@ -175,8 +177,9 @@ IMPL_LINK( BreakPointDialog, EditModifyHdl, Edit&, rEdit, void )
CheckButtons();
else if (&rEdit == m_pNumericField)
{
BreakPoint& rBrk = GetSelectedBreakPoint();
rBrk.nStopAfter = rEdit.GetText().toInt32();
BreakPoint* pBrk = GetSelectedBreakPoint();
if (pBrk)
pBrk->nStopAfter = rEdit.GetText().toInt32();
}
}
@@ -234,10 +237,12 @@ void BreakPointDialog::UpdateFields( BreakPoint const & rBrk )
}
BreakPoint& BreakPointDialog::GetSelectedBreakPoint()
BreakPoint* BreakPointDialog::GetSelectedBreakPoint()
{
size_t nEntry = m_pComboBox->GetEntryPos( m_pComboBox->GetText() );
return m_aModifiedBreakPointList.at( nEntry );
sal_Int32 nEntry = m_pComboBox->GetEntryPos( m_pComboBox->GetText() );
if (nEntry == LISTBOX_ENTRY_NOTFOUND)
return nullptr;
return &m_aModifiedBreakPointList.at( nEntry );
}
} // namespace basctl

2
basctl/source/basicide/brkdlg.hxx
View File

@@ -46,7 +46,7 @@ class BreakPointDialog final : public ModalDialog
DECL_LINK( EditModifyHdl, Edit&, void );
DECL_LINK( ButtonHdl, Button*, void );
void UpdateFields( BreakPoint const & rBrk );
BreakPoint& GetSelectedBreakPoint();
BreakPoint* GetSelectedBreakPoint();
public: