sd/source/core/sdpage2.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 6c3327a0644364dab5c7f8b0a49808ac5555b87d
Author: Caolán McNamara <caol...@redhat.com>
Date: Tue Aug 19 20:49:17 2014 +0100
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
(cherry picked from commit f47baab6d35752b0babba768e299416ea5dd447d)
Reviewed-on: https://gerrit.libreoffice.org/11028
Reviewed-by: David Tardon <dtar...@redhat.com>
Tested-by: David Tardon <dtar...@redhat.com>
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 778bc1f..04e9c10 100644
--- a/sd/source/core/sdpage2.cxx
+++ b/sd/source/core/sdpage2.cxx
@@ -209,9 +209,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);
}
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
