diff options
| author | Michael Meeks <michael.meeks@collabora.com> | 2015-05-26 17:53:15 +0100 |
|---|---|---|
| committer | Michael Meeks <michael.meeks@collabora.com> | 2015-05-26 17:54:28 +0100 |
| commit | cc7b8dab7522886f13780950c93033e3369da285 (patch) | |
| tree | 3e5133973beb0850560f83bbf4cb7f0392f03bc7 /chart2 | |
| parent | f849d96463d967214bc063f6de912a082272c395 (diff) | |
tdf#91633 - dispose chart data-table entries correctly.
Change-Id: Ia26df029888f47a0395ea3c8bd7e0e51a1706c2a
Diffstat (limited to 'chart2')
| -rw-r--r-- | chart2/source/controller/dialogs/DataBrowser.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/chart2/source/controller/dialogs/DataBrowser.cxx b/chart2/source/controller/dialogs/DataBrowser.cxx index 1d2eebca3d5f..8f0f979c0eff 100644 --- a/chart2/source/controller/dialogs/DataBrowser.cxx +++ b/chart2/source/controller/dialogs/DataBrowser.cxx @@ -144,6 +144,7 @@ class SeriesHeader { public: explicit SeriesHeader(vcl::Window * pParent, vcl::Window *pColorParent); + ~SeriesHeader(); void SetColor( const Color & rCol ); void SetPos( const Point & rPos ); @@ -217,6 +218,13 @@ SeriesHeader::SeriesHeader( vcl::Window * pParent, vcl::Window *pColorParent ) : Show(); } +SeriesHeader::~SeriesHeader() +{ + m_spSymbol.disposeAndClear(); + m_spSeriesName.disposeAndClear(); + m_spColorBar.disposeAndClear(); +} + void SeriesHeader::notifyChanges() { if( m_aChangeLink.IsSet()) @@ -417,8 +425,7 @@ bool lcl_SeriesHeaderHasFocus( sal_Int32 * pOutIndex = 0 ) { sal_Int32 nIndex = 0; - for( ::std::vector< ::boost::shared_ptr< ::chart::impl::SeriesHeader > >::const_iterator aIt( rSeriesHeader.begin()); - aIt != rSeriesHeader.end(); ++aIt, ++nIndex ) + for( auto aIt = rSeriesHeader.begin(); aIt != rSeriesHeader.end(); ++aIt, ++nIndex ) { if( (*aIt)->HasFocus()) { |