summaryrefslogtreecommitdiff
path: root/sfx2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2018-12-04 15:27:54 +0000
committerCaolán McNamara <caolanm@redhat.com>2018-12-05 09:50:56 +0100
commit16100d8db2398050f9ec10ee55178b2888141818 (patch)
treefca963afb2e932cc6e66acc6f3248cd6a07fbaae /sfx2
parent41088375bac5941dbb0da0489878213d5a928ed3 (diff)
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@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'sfx2')
-rw-r--r--sfx2/source/dialog/dinfdlg.cxx10
1 files changed, 8 insertions, 2 deletions
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;