strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "at least fix the crash when calling SdXImpressDocument::dispose

Browse source 
... for now"

This reverts commit 599473a13e3c5ba669d995c913ad415bd674a16c.

moggi says the unspecified crash happened with the tests following the
comment in chart2import.cxx:75, but the tests run fine in valgrind now.

The commit creates a memory leak in the CppunitTests as
SfxBaseModel::dispose() returns early, because mbDisposed is set.

Change-Id: I987dce6a4090784d166a4a3b2e7f9e2c0cddd289
This commit is contained in:
Michael Stahl 2014-10-16 13:27:27 +02:00
parent 382bab9412
commit 6e355d9561
2 changed files with 1 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
chart2/qa/extras/chart2import.cxx
View file

@ -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);

2
sd/source/ui/unoidl/unomodel.cxx
View file

@ -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() )