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

[Libreoffice Gerrit user]

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

New commits:
commit 16100d8db2398050f9ec10ee55178b2888141818
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Tue Dec 4 15:27:54 2018 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Wed Dec 5 09:50:56 2018 +0100

    Resolves: tdf#121641 properties invisible after 'reset'
    
    Change-Id: Iedb2b11be0e008501273925d6ae7137b28c3b912
    Reviewed-on: https://gerrit.libreoffice.org/64538
    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 9631fac4358a..296fda7cc639 100644
--- a/sfx2/source/dialog/dinfdlg.cxx
+++ b/sfx2/source/dialog/dinfdlg.cxx
@@ -1481,7 +1481,10 @@ void CustomPropertiesWindow::dispose()
 {
     m_aEditLoseFocusIdle.Stop();
     m_aBoxLoseFocusIdle.Stop();
-    ClearAllLines();
+
+    m_aCustomPropertiesLines.clear();
+    m_pCurrentLine = nullptr;
+
     m_pHeaderBar.clear();
     m_pScrollBar.clear();
     m_pHeaderAccName.clear();
@@ -1713,7 +1716,10 @@ bool CustomPropertiesWindow::AreAllLinesValid() const
 
 void CustomPropertiesWindow::ClearAllLines()
 {
-    m_aCustomPropertiesLines.clear();
+    for (auto& pLine : m_aCustomPropertiesLines)
+    {
+        pLine->Clear();
+    }
     m_pCurrentLine = nullptr;
     m_aCustomProperties.clear();
     m_nScrollPos = 0;