[Libreoffice-commits] core.git: Branch 'libreoffice-4-2' - sd/source
Caolán McNamara
caolanm at redhat.com
Wed Aug 20 00:51:02 PDT 2014
sd/source/core/sdpage2.cxx | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
New commits:
commit 69f2e46f5f5bb201137b7212c2e16d64efc8cb30
Author: Caolán McNamara <caolanm at 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/11029
Reviewed-by: David Tardon <dtardon at redhat.com>
Tested-by: David Tardon <dtardon at redhat.com>
diff --git a/sd/source/core/sdpage2.cxx b/sd/source/core/sdpage2.cxx
index 0b9a552..2ab843a 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);
}
More information about the Libreoffice-commits
mailing list