summaryrefslogtreecommitdiff
path: root/chart2
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2020-04-05 14:10:55 +0100
committerCaolán McNamara <caolanm@redhat.com>2020-04-05 15:52:53 +0200
commit66b5cbf67b3966ca160a50096d982b3822f08bee (patch)
treeedd8c572368ab300ae2a2a2e302ca2a28216908e /chart2
parentc5b6d2c8db8a3c93d22af3a69336af1d86b74e66 (diff)
tdf#131873 data table fills with extra columns during scroll
Change-Id: Iccdb113a609e0873fb68cfb52405993a0f4362bc Reviewed-on: https://gerrit.libreoffice.org/c/core/+/91704 Tested-by: Jenkins Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'chart2')
-rw-r--r--chart2/source/controller/dialogs/DataBrowser.cxx7
1 files changed, 7 insertions, 0 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx
index 5887d85af217..d0195a5d323b 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"))
@@ -261,6 +266,8 @@ 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();
}