[ooo-build-commit] Branch 'ooo/master' - sd/source

[Jan Holesovsky]

 sd/source/ui/app/sdmod.cxx  |    5 +++++
 sd/source/ui/app/sdxfer.cxx |    3 +++
 2 files changed, 8 insertions(+)

New commits:
commit f1090fc26fcfa36314b3c3b299da9429c8b78c89
Author: Ivo Hinkelmann <ihi at openoffice.org>
Date:   Wed Sep 23 11:56:27 2009 +0000

    #i10000# fixed crash cause by dtrans move

diff --git a/sd/source/ui/app/sdmod.cxx b/sd/source/ui/app/sdmod.cxx
index cba8a3c..a51c1c9 100644
--- a/sd/source/ui/app/sdmod.cxx
+++ b/sd/source/ui/app/sdmod.cxx
@@ -131,6 +131,11 @@ 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 )
diff --git a/sd/source/ui/app/sdxfer.cxx b/sd/source/ui/app/sdxfer.cxx
index bff1864..5142539 100644
--- a/sd/source/ui/app/sdxfer.cxx
+++ b/sd/source/ui/app/sdxfer.cxx
@@ -481,6 +481,9 @@ void SdTransferable::AddSupportedFormats()
 
 sal_Bool SdTransferable::GetData( const DataFlavor& rFlavor )
 {
+    if (SD_MOD()==NULL)
+        return sal_False;
+
     sal_uInt32	nFormat = SotExchange::GetFormat( rFlavor );
     sal_Bool	bOK = sal_False;