diff options
| -rw-r--r-- | chart2/qa/extras/chart2import.cxx | 6 | ||||
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 |
2 files changed, 1 insertions, 7 deletions
diff --git a/chart2/qa/extras/chart2import.cxx b/chart2/qa/extras/chart2import.cxx index 3b1f1e7fa07f..0a70fc986e02 100644 --- a/chart2/qa/extras/chart2import.cxx +++ b/chart2/qa/extras/chart2import.cxx @@ -71,12 +71,6 @@ public: CPPUNIT_TEST(testODTChartSeries); CPPUNIT_TEST(testDOCChartSeries); CPPUNIT_TEST(testDOCXChartSeries); -/* - * Disabling Impress Uts. - * ChartTest::tearDown() calls dispose of mxComponent - * this causes the UT to crash in sd. - * sd::DrawView::Notify tries to reset by calling sd::DrawViewShell::ResetActualPage - */ CPPUNIT_TEST(testPPTChartSeries); CPPUNIT_TEST(testPPTXChartSeries); CPPUNIT_TEST(testPPTXHiddenDataSeries); diff --git a/sd/source/ui/unoidl/unomodel.cxx b/sd/source/ui/unoidl/unomodel.cxx index be94ae7d6c59..f5e706549cd4 100644 --- a/sd/source/ui/unoidl/unomodel.cxx +++ b/sd/source/ui/unoidl/unomodel.cxx @@ -2399,8 +2399,8 @@ void SAL_CALL SdXImpressDocument::dispose() throw (::com::sun::star::uno::Runtim // that dispose() is called again. It is important to forward this // second dispose() to the base class, too. // As a consequence the following code has to be able to be run twice. - mbDisposed = true; SfxBaseModel::dispose(); + mbDisposed = true; uno::Reference< container::XNameAccess > xStyles(mxStyleFamilies); if( xStyles.is() ) |