diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2015-08-30 20:14:16 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2015-08-30 20:18:26 +0100 |
| commit | 7d4c77e374310bef538465d11980d1d610cbe0f1 (patch) | |
| tree | a688a8ac5c2792dd574025220d98a756ca95afaa | |
| parent | 33d8a094e1f8483abe2bfcfa118997beab034be5 (diff) | |
pClientData can be null
Change-Id: I9375f84affdaef30d9b1ded31525e6b7b8709cbc
| -rw-r--r-- | filter/source/msfilter/svdfppt.cxx | 2 | ||||
| -rw-r--r-- | sd/qa/unit/data/ppt/pass/crash-3.ppt | bin | 0 -> 7681 bytes |
2 files changed, 1 insertions, 1 deletions
diff --git a/filter/source/msfilter/svdfppt.cxx b/filter/source/msfilter/svdfppt.cxx index ad20a860e610..744b5e91553b 100644 --- a/filter/source/msfilter/svdfppt.cxx +++ b/filter/source/msfilter/svdfppt.cxx @@ -2588,7 +2588,7 @@ bool SdrPowerPointImport::GetColorFromPalette( sal_uInt16 nNum, Color& rColor ) bool SdrPowerPointImport::SeekToShape( SvStream& rSt, void* pClientData, sal_uInt32 nId ) const { bool bRet = SvxMSDffManager::SeekToShape( rSt, pClientData, nId ); - if ( !bRet ) + if (!bRet && pClientData) { ProcessData& rData = *static_cast<ProcessData*>(pClientData); PptSlidePersistEntry& rPersistEntry = rData.rPersistEntry; diff --git a/sd/qa/unit/data/ppt/pass/crash-3.ppt b/sd/qa/unit/data/ppt/pass/crash-3.ppt Binary files differnew file mode 100644 index 000000000000..daa0102db45c --- /dev/null +++ b/sd/qa/unit/data/ppt/pass/crash-3.ppt |