[Libreoffice-commits] core.git: Branch 'libreoffice-6-1' - sfx2/source

[Libreoffice Gerrit user]

 sfx2/source/dialog/dinfdlg.cxx |   17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

New commits:
commit 01e263bad891abea9bc671a29c95ea8a8b5fb842
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 4 15:27:54 2018 +0000
Commit:     Markus Mohrhard <markus.mohrhard at googlemail.com>
CommitDate: Tue Jan 1 22:52:27 2019 +0100

    Resolves: tdf#121641 properties invisible after 'reset'
    
    Change-Id: Iedb2b11be0e008501273925d6ae7137b28c3b912
    Reviewed-on: https://gerrit.libreoffice.org/64539
    Tested-by: Jenkins
    Tested-by: Xisco Faulí <xiscofauli at libreoffice.org>
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>

diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx
index 2e560e73520b..6cb3600a491a 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1511,7 +1511,14 @@ void CustomPropertiesWindow::dispose()
 {
     m_aEditLoseFocusIdle.Stop();
     m_aBoxLoseFocusIdle.Stop();
-    ClearAllLines();
+
+    for (CustomPropertyLine* pLine : m_aCustomPropertiesLines)
+    {
+        delete pLine;
+    }
+    m_pCurrentLine = nullptr;
+    m_aCustomPropertiesLines.clear();
+
     m_pHeaderBar.clear();
     m_pScrollBar.clear();
     m_pHeaderAccName.clear();
@@ -1746,16 +1753,12 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
 
 void CustomPropertiesWindow::ClearAllLines()
 {
-    std::vector< CustomPropertyLine* >::iterator pIter;
-    for ( pIter = m_aCustomPropertiesLines.begin();
-          pIter != m_aCustomPropertiesLines.end(); ++pIter )
+    for (CustomPropertyLine* pLine : m_aCustomPropertiesLines)
     {
-        CustomPropertyLine* pLine = *pIter;
-        delete pLine;
+        pLine->Clear();
     }
     m_pCurrentLine = nullptr;
     m_aCustomProperties.clear();
-    m_aCustomPropertiesLines.clear();
     m_nScrollPos = 0;
 }