diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-10-16 13:27:27 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-10-20 15:26:57 +0200 |
| commit | 6e355d95614e04282620574c89ff63fd3405c14e (patch) | |
| tree | bee095373431a8dd19db304b09ff1d026d27d386 /sd | |
| parent | 382bab9412b87f82da82276332496eb28b28d4f3 (diff) | |
Revert "at least fix the crash when calling SdXImpressDocument::dispose
... 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
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/unoidl/unomodel.cxx | 2 |
1 files changed, 1 insertions, 1 deletions
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() ) |