diff options
| author | Kurt Zenker <kz@openoffice.org> | 2009-11-13 18:48:59 +0100 |
|---|---|---|
| committer | Kurt Zenker <kz@openoffice.org> | 2009-11-13 18:48:59 +0100 |
| commit | 24c4b5e52bc2a8fc26e630bb302c37552df49205 (patch) | |
| tree | 46eb1e78f342f6c6fac92ac92b91b31ac48ba67e /sd/source/ui/app/sdmod.cxx | |
| parent | d45a148e0c593d30e149fee70e7fbbf0958a9f62 (diff) | |
| parent | ef14b7f6ed149465c80884b73b53c729b0286081 (diff) | |
CWS-TOOLING: integrate CWS impress178_DEV300
Diffstat (limited to 'sd/source/ui/app/sdmod.cxx')
| -rw-r--r-- | sd/source/ui/app/sdmod.cxx | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx index f7e74a4817406..957b1aa0475bc 100644 --- a/sd/source/ui/app/sdmod.cxx +++ b/sd/source/ui/app/sdmod.cxx @@ -131,11 +131,6 @@ SdModule::SdModule(SfxObjectFactory* pFact1, SfxObjectFactory* pFact2 ) SdModule::~SdModule() { - // Mark the module in the global AppData structure as deleted. - SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW); - if (ppShellPointer != NULL) - (*ppShellPointer) = NULL; - delete pSearchItem; if( pNumberFormatter ) @@ -152,6 +147,13 @@ SdModule::~SdModule() } } + mpResourceContainer.reset(); + + // Mark the module in the global AppData structure as deleted. + SdModule** ppShellPointer = (SdModule**)GetAppData(SHL_DRAW); + if (ppShellPointer != NULL) + (*ppShellPointer) = NULL; + delete mpErrorHdl; delete static_cast< VirtualDevice* >( mpVirtualRefDevice ); } |