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 21:27:47 +0100
commit10c6c35220c0c6e2c0aa7cdf146bff564da95eb7 (patch)
tree6c35cd12f51226b152a952765e6006dfdf3894d8 /sfx2
parentda6c3fe58abdea9aeefd21454b84396ee4f1f1a2 (diff)
Resolves: tdf#121644 clear pointer to customlines when customlines cleared
Change-Id: I09bf6f3c484a2d90a865f0a5743c4e99d2f77b0a Reviewed-on: https://gerrit.libreoffice.org/63872 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 c6e336e0231b..9631fac4358a 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;
}