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

[Dennis Francis]

 chart2/source/model/main/ChartModel.cxx |    7 +++++++
 1 file changed, 7 insertions(+)

New commits:
commit c9f07d72b6e40ca70ee11f0350fd6e5acfefba89
Author: Dennis Francis <dennis.francis at collabora.co.uk>
Date:   Wed Aug 2 10:38:12 2017 +0530

    tdf#109523: Do not forget to remove the chart model from...
    
    data-provider's listener set when the chart model is
    getting disposed.
    
    Change-Id: Iafbe1426cdb42059cbb4e2955a257a09aa42ec8e
    Reviewed-on: https://gerrit.libreoffice.org/40663
    Reviewed-by: Markus Mohrhard <markus.mohrhard at googlemail.com>
    Tested-by: Jenkins <ci at libreoffice.org>
    (cherry picked from commit 9561e0f392de3b99d8a0374486d4c0575b23180b)
    Reviewed-on: https://gerrit.libreoffice.org/40705
    Reviewed-by: Tomaž Vajngerl <quikee at gmail.com>

diff --git a/chart2/source/model/main/ChartModel.cxx b/chart2/source/model/main/ChartModel.cxx
index 48d38e832850..07bf1ccf4c6b 100644
--- a/chart2/source/model/main/ChartModel.cxx
+++ b/chart2/source/model/main/ChartModel.cxx
@@ -547,6 +547,13 @@ void SAL_CALL ChartModel::dispose()
     if ( m_xDiagram.is() )
         ModifyListenerHelper::removeListener( m_xDiagram, this );
 
+    if ( m_xDataProvider.is() )
+    {
+        Reference<util::XModifyBroadcaster> xModifyBroadcaster( m_xDataProvider, uno::UNO_QUERY );
+        if ( xModifyBroadcaster.is() )
+            xModifyBroadcaster->removeModifyListener( this );
+    }
+
     m_xDataProvider.clear();
     m_xInternalDataProvider.clear();
     m_xNumberFormatsSupplier.clear();