#i120831#, call dispose() from ChartView dtor to make sure SfxBaseModel object is freed correctly

Found by: zhangjf
Patch by: zhangjf

1 files changed, 6 insertions, 0 deletions

diff --git a/chart2/source/view/main/ChartView.cxx b/chart2/source/view/main/ChartView.cxx
index de96be6eabc0..056e07c45dd5 100644
--- a/chart2/source/view/main/ChartView.cxx
+++ b/chart2/source/view/main/ChartView.cxx
@@ -207,6 +207,12 @@ void SAL_CALL ChartView::initialize( const uno::Sequence< uno::Any >& aArguments
 
 ChartView::~ChartView()
 {
+    // #i120831#. In ChartView::initialize(), m_xShapeFactory is created from SdrModel::getUnoModel() and indirectly
+    //   from SfxBaseModel, it needs call dispose() to make sure SfxBaseModel object is freed correctly.
+    uno::Reference< lang::XComponent > xComp( m_xShapeFactory, uno::UNO_QUERY);
+    if ( xComp.is() )
+        xComp->dispose();
+
     if( m_pDrawModelWrapper.get() )
     {
         EndListening( m_pDrawModelWrapper->getSdrModel(), sal_False /*bAllDups*/ );