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

Caolán McNamara (via logerrit) logerrit at kemper.freedesktop.org
Sun Apr 5 19:06:37 UTC 2020


 chart2/source/controller/dialogs/DataBrowser.cxx |    4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

New commits:
commit 1e668a4c81f35b646d05b8d168dd5b2785dec6f9
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 5 19:26:59 2020 +0100
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Sun Apr 5 21:06:01 2020 +0200

    default dtor order is sufficient
    
    Change-Id: I360fe03a0e11f8392f56f95b4e2b1d90ba75b813
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91726
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index d0195a5d323b..5702d7dae675 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -265,11 +265,8 @@ SeriesHeader::SeriesHeader(weld::Container* pParent, weld::Container* pColorPare
 SeriesHeader::~SeriesHeader()
 {
     m_aUpdateDataTimer.Stop();
-    m_xDevice.clear();
     m_pParent->move(m_xContainer1.get(), nullptr);
     m_pColorParent->move(m_xContainer2.get(), nullptr);
-    m_xBuilder2.reset();
-    m_xBuilder1.reset();
 }
 
 void SeriesHeader::notifyChanges()
@@ -521,6 +518,7 @@ DataBrowser::~DataBrowser()
 
 void DataBrowser::dispose()
 {
+    m_aSeriesHeaders.clear();
     m_aNumberEditField.disposeAndClear();
     m_aTextEditField.disposeAndClear();
     ::svt::EditBrowseBox::dispose();


More information about the Libreoffice-commits mailing list