summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-11-23 09:23:34 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-11-23 13:58:00 +0100
commitb3e5d954dccbac85c77d6096ea3be2b59d6288fd (patch)
treeb027c81f802a0ad1532bf9fc37777ff8fdc98ad0 /sfx2
parent981a98af300eb5247e6ecfb6ec54c590acb54538 (diff)
Resolves: tdf#121644 clear pointer to customlines when customlines cleared
Change-Id: I09bf6f3c484a2d90a865f0a5743c4e99d2f77b0a Reviewed-on: https://gerrit.libreoffice.org/63871 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 77909e8f44f0..ec7f55819b53 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1588,7 +1588,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;
@@ -1714,6 +1714,7 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
void CustomPropertiesWindow::ClearAllLines()
{
m_aCustomPropertiesLines.clear();
+ m_pCurrentLine = nullptr;
m_aCustomProperties.clear();
m_nScrollPos = 0;
}