[Libreoffice-commits] core.git: Branch 'libreoffice-6-4' - chart2/source

[Caolán McNamara (via logerrit)]

 chart2/source/controller/dialogs/DataBrowser.cxx |   11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

New commits:
commit f4dec59b6484e4fc059883d9a1d17a604290e720
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Sun Apr 5 14:10:55 2020 +0100
Commit:     Xisco Faulí <xiscofauli at libreoffice.org>
CommitDate: Thu Apr 16 19:04:00 2020 +0200

    tdf#131873 data table fills with extra columns during scroll
    
    Change-Id: Iccdb113a609e0873fb68cfb52405993a0f4362bc
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91713
    Tested-by: Jenkins
    Reviewed-by: Xisco Faulí <xiscofauli at libreoffice.org>

diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 10c1ecaffe44..86b258dd8158 100644
--- a/chart2/source/controller/dialogs/DataBrowser.cxx
+++ b/chart2/source/controller/dialogs/DataBrowser.cxx
@@ -211,6 +211,9 @@ private:
     std::unique_ptr<weld::Builder> m_xBuilder1;
     std::unique_ptr<weld::Builder> m_xBuilder2;
 
+    weld::Container* m_pParent;
+    weld::Container* m_pColorParent;
+
     std::unique_ptr<weld::Container> m_xContainer1;
     std::unique_ptr<weld::Container> m_xContainer2;
     std::unique_ptr<weld::Image> m_spSymbol;
@@ -238,6 +241,8 @@ SeriesHeader::SeriesHeader(weld::Container* pParent, weld::Container* pColorPare
     : m_aUpdateDataTimer("UpdateDataTimer")
     , m_xBuilder1(Application::CreateBuilder(pParent, "modules/schart/ui/columnfragment.ui"))
     , m_xBuilder2(Application::CreateBuilder(pColorParent, "modules/schart/ui/imagefragment.ui"))
+    , m_pParent(pParent)
+    , m_pColorParent(pColorParent)
     , m_xContainer1(m_xBuilder1->weld_container("container"))
     , m_xContainer2(m_xBuilder2->weld_container("container"))
     , m_spSymbol(m_xBuilder1->weld_image("image"))
@@ -260,9 +265,8 @@ SeriesHeader::SeriesHeader(weld::Container* pParent, weld::Container* pColorPare
 SeriesHeader::~SeriesHeader()
 {
     m_aUpdateDataTimer.Stop();
-    m_xDevice.clear();
-    m_xBuilder2.reset();
-    m_xBuilder1.reset();
+    m_pParent->move(m_xContainer1.get(), nullptr);
+    m_pColorParent->move(m_xContainer2.get(), nullptr);
 }
 
 void SeriesHeader::notifyChanges()
@@ -514,6 +518,7 @@ DataBrowser::~DataBrowser()
 
 void DataBrowser::dispose()
 {
+    m_aSeriesHeaders.clear();
     m_aNumberEditField.disposeAndClear();
     m_aTextEditField.disposeAndClear();
     ::svt::EditBrowseBox::dispose();