diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2018-12-04 15:27:54 +0000 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2019-01-17 14:03:35 +0100 |
| commit | 5d638550eaf9343a56bee9fa0fe8295f37bd3565 (patch) | |
| tree | 4ff2d2efc8005f6af4892257328a0c27f7d272d1 /sfx2 | |
| parent | b5f3ad23f6c3d5ac56b45c034cc650061788db1c (diff) | |
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@libreoffice.org>
Reviewed-by: Markus Mohrhard <markus.mohrhard@googlemail.com>
(cherry picked from commit 01e263bad891abea9bc671a29c95ea8a8b5fb842)
Diffstat (limited to 'sfx2')
| -rw-r--r-- | sfx2/source/dialog/dinfdlg.cxx | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/sfx2/source/dialog/dinfdlg.cxx b/sfx2/source/dialog/dinfdlg.cxx index 2631e379393c..9dfe5d15c239 100644 --- a/sfx2/source/dialog/dinfdlg.cxx +++ b/sfx2/source/dialog/dinfdlg.cxx @@ -1553,7 +1553,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(); @@ -1786,15 +1793,11 @@ 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_aCustomProperties.clear(); - m_aCustomPropertiesLines.clear(); m_nScrollPos = 0; } |