[Libreoffice-commits] core.git: sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/dinfdlg.cxx |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

New commits:
commit b3e5d954dccbac85c77d6096ea3be2b59d6288fd
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Fri Nov 23 09:23:34 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Fri Nov 23 13:58:00 2018 +0100

    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 at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

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;
 }