diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-03-26 13:53:55 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-03-26 13:53:55 +0100 |
| commit | 24b867c1e1d2264ff138d4eafa9791fcd1191160 (patch) | |
| tree | 5904fa49d14a2dee4c5c12e671862f007366c5c7 /sd | |
| parent | adf7d6e17334391459343d1f96c152872ce6e704 (diff) | |
Resolves: rhbz#806663 SlideshowImpl can outlive SdModule (somehow)
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/ui/slideshow/slideshowimpl.cxx | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/sd/source/ui/slideshow/slideshowimpl.cxx b/sd/source/ui/slideshow/slideshowimpl.cxx index 3bc8dc1c8659..ed9d76d29369 100644 --- 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); |