Resolves: rhbz#670020 crash in slidesorting

f41
Caolán McNamara 14 years ago
parent dc797fee46
commit 4820fc240d

@ -0,0 +1,26 @@
From 48f4f5f4283cb9a58223c6cc6f4d0ebadce53722 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@redhat.com>
Date: Wed, 2 Feb 2011 16:05:01 +0000
Subject: [PATCH] Resolves: rhbz#670020 crash in slidesorting
---
sd/source/ui/view/drviews1.cxx | 3 +++
1 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/sd/source/ui/view/drviews1.cxx b/sd/source/ui/view/drviews1.cxx
index d1acb96..e0b220e 100644
--- a/sd/source/ui/view/drviews1.cxx
+++ b/sd/source/ui/view/drviews1.cxx
@@ -712,6 +712,9 @@ SdPage* DrawViewShell::getCurrentPage() const
void DrawViewShell::ResetActualPage()
{
+ if (!GetDoc())
+ return;
+
USHORT nCurrentPage = maTabControl.GetCurPageId() - 1;
USHORT nPageCount = (meEditMode == EM_PAGE)?GetDoc()->GetSdPageCount(mePageKind):GetDoc()->GetMasterSdPageCount(mePageKind);
if (nPageCount > 0)
--
1.7.4

@ -112,6 +112,7 @@ Patch24: 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch
Patch25: vbahelper.visibility.patch Patch25: vbahelper.visibility.patch
Patch26: 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch Patch26: 0001-Resolves-fdo-33509-i62414-out-by-one-breaks-CTL-spel.patch
Patch27: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch Patch27: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
Patch28: 0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
%{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
%define instdir %{_libdir} %define instdir %{_libdir}
@ -742,6 +743,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch25 -p0 -b .vbahelper.visibility.patch %patch25 -p0 -b .vbahelper.visibility.patch
%patch26 -p1 -b .fdo33509-i62414-out-by-one-breaks-CTL-spel.patch %patch26 -p1 -b .fdo33509-i62414-out-by-one-breaks-CTL-spel.patch
%patch27 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch %patch27 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch
%patch28 -p1 -b .rhbz670020-crash-in-slidesorting.patch
touch scripting/source/pyprov/delzip touch scripting/source/pyprov/delzip
touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/beanshell/delzip
touch scripting/util/provider/javascript/delzip touch scripting/util/provider/javascript/delzip
@ -2087,11 +2089,12 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url %{basisinstdir}/program/kde-open-url
%changelog %changelog
* Sun Jan 30 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-3 * Wed Feb 02 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-3
- Related: rhbz#610103 make this even more robust - Related: rhbz#610103 make this even more robust
- Related: rhbz#672872 cancel gtk file dialog on terminate - Related: rhbz#672872 cancel gtk file dialog on terminate
- Resolves: fdo#33509/ooo#62414 fix CTL spelling popup - Resolves: fdo#33509/ooo#62414 fix CTL spelling popup
- Resolves: rhbz#673819 crash on changing position of header/footer object - Resolves: rhbz#673819 crash on changing position of header/footer object
- Resolves: rhbz#670020 crash in slidesorting
* Mon Jan 24 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-2 * Mon Jan 24 2011 Caolán McNamara <caolanm@redhat.com> 3.3.0.4-2
- Resolves: rhbz#671540 fix lonely ) - Resolves: rhbz#671540 fix lonely )

Loading…
Cancel
Save