Resolves: rhbz#806663 SlideshowImpl can outlive SdModule (somehow)

24b867c1 · Caolán McNamara · adf7d6e1 · 24b867c1
Kaydet (Commit) 24b867c1 authored Mar 26, 2012 tarafından Caolán McNamara
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

slideshowimpl.cxx sd/source/ui/slideshow/slideshowimpl.cxx +4 -1

No files found.
--- a/sd/source/ui/slideshow/slideshowimpl.cxx
+++ b/sd/source/ui/slideshow/slideshowimpl.cxx
@@ -593,7 +593,10 @@ SlideshowImpl::SlideshowImpl( const Reference< XPresentation2 >& xPresentation,

 SlideshowImpl::~SlideshowImpl()
 {
-    SdOptions* pOptions = SD_MOD()->GetSdOptions(DOCUMENT_TYPE_IMPRESS);
+    SdModule *pModule = SD_MOD();
+    //rhbz#806663 SlideshowImpl can outlive SdModule
+    SdOptions* pOptions = pModule ?
+        pModule->GetSdOptions(DOCUMENT_TYPE_IMPRESS) : NULL;
    if( pOptions )
    {
        pOptions->SetPresentationPenColor(mnUserPaintColor);