[openoffice.org/f14/master] Resolves: rhbz#670020 crash in slidesorting

[Caolan McNamara]

commit 46ca95401dc5115df0a3ebc935709b2a9c121e86
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Wed Feb 2 16:08:06 2011 +0000

    Resolves: rhbz#670020 crash in slidesorting

 ...esolves-rhbz-670020-crash-in-slidesorting.patch |   26 ++++++++++++++++++++
 openoffice.org.spec                                |    5 +++-
 2 files changed, 30 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-670020-crash-in-slidesorting.patch b/0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
new file mode 100644
index 0000000..e886a8b
--- /dev/null
+++ b/0001-Resolves-rhbz-670020-crash-in-slidesorting.patch
@@ -0,0 +1,26 @@
+From 48f4f5f4283cb9a58223c6cc6f4d0ebadce53722 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at 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
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index 45348bb..c1fdcb8 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -160,6 +160,7 @@ Patch76: libreoffice-fdo31271.icu.patch
 Patch77: 0001-Related-rhbz-610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 Patch78: 0001-Related-rhbz-672872-cancel-gtk-file-dialog-on-deskto.patch
 Patch79: 0001-Resolves-rhbz-673819-crash-on-changing-position-of-d.patch
+Patch80: 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))")}
 %define instdir %{_libdir}
@@ -1736,6 +1737,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch77 -p1 -b .rhbz610103-more-woes-on-rpm-upgrade-vs-rpm-.patch
 %patch78 -p1 -b .rhbz672872-cancel-gtk-file-dialog-on-deskto.patch
 %patch79 -p1 -b .rhbz673819-crash-on-changing-position-of-d.patch
+%patch80 -p1 -b .rhbz670020-crash-in-slidesorting.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3931,10 +3933,11 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Thu Jan 27 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
+* Wed Feb 02 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
 - Resolves: rhbz#673819 crash on changing position of header/footer drawing object
+- Resolves: rhbz#670020 crash in slidesorting
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )