diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-11-23 09:23:34 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2018-11-26 14:38:35 +0100 |
| commit | 0f59ab7aa00232a083f28a52d006b2ea361798e0 (patch) | |
| tree | f97cedd5b70c2fd90881695d2782c220fcb05431 | |
| parent | 8d370bbe3c15706872f8c0258ed1e21741d0228d (diff) | |
Resolves: tdf#121644 clear pointer to customlines when customlines cleared
Change-Id: I09bf6f3c484a2d90a865f0a5743c4e99d2f77b0a
Reviewed-on: https://gerrit.libreoffice.org/63873
Tested-by: Jenkins
Tested-by: Xisco Faulí <xiscofauli@libreoffice.org>
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 937256384486..2e560e73520b 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1618,7 +1618,7 @@ bool CustomPropertiesWindow::IsLineValid( CustomPropertyLine* pLine ) const void CustomPropertiesWindow::ValidateLine( CustomPropertyLine* pLine, bool bIsFromTypeBox ) { - if ( !IsLineValid( pLine ) ) + if (pLine && !IsLineValid(pLine)) { if ( bIsFromTypeBox ) // LoseFocus of TypeBox pLine->m_bTypeLostFocus = true; @@ -1753,6 +1753,7 @@ void CustomPropertiesWindow::ClearAllLines() CustomPropertyLine* pLine = *pIter; delete pLine; } + m_pCurrentLine = nullptr; m_aCustomProperties.clear(); m_aCustomPropertiesLines.clear(); m_nScrollPos = 0; |