diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2014-08-19 20:49:17 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2014-08-19 20:49:17 +0100 |
| commit | f47baab6d35752b0babba768e299416ea5dd447d (patch) | |
| tree | 9ebf80f87d44923a2a3bbab8797a48571559c418 /sd | |
| parent | a0de5cc93db6153059a0912d5d76d056cf8c595e (diff) | |
Resolves: fdo#82355 crash on loading ppt
regression probably triggered by...
commit 2e3c45afc6c5ea74f1f8b4a7dce806e537870546
Date: Fri Mar 4 07:38:16 2011 -0800
Remove usage of deprecated List container.
but that just stopped at the first NULL by chance
Change-Id: I767e3bc3130d99cedceb4172857d1741c677b19b
Diffstat (limited to 'sd')
| -rw-r--r-- | sd/source/core/sdpage2.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx index d49893a9dbce..b8ef36d62f89 100644 --- a/sd/source/core/sdpage2.cxx +++ b/sd/source/core/sdpage2.cxx @@ -208,9 +208,10 @@ void SdPage::SetPresentationLayout(const OUString& rLayoutName, if (pSheet != pOldSheet) { - pObj->EndListening(*pOldSheet); + if (pOldSheet) + pObj->EndListening(*pOldSheet); - if (!pObj->IsListening(*pSheet)) + if (pSheet && !pObj->IsListening(*pSheet)) pObj->StartListening(*pSheet); } |