[openoffice.org/f14/master] Resolves: rhbz#695509 crash in RefreshDocumentLB

[Caolan McNamara]

commit 3df2770b747deacb50cd8a047491abf830678417
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 17 22:59:54 2011 +0100

    Resolves: rhbz#695509 crash in RefreshDocumentLB

 ...es-rhbz-695509-crash-in-RefreshDocumentLB.patch |   26 ++++++++++++++++++++
 openoffice.org.spec                                |    7 ++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch b/0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
new file mode 100644
index 0000000..c6fb27a
--- /dev/null
+++ b/0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
@@ -0,0 +1,26 @@
+From 5cc73f49400f9719ffd5382e64931de6eb8f130c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Sun, 17 Apr 2011 22:57:40 +0100
+Subject: [PATCH] Resolves: rhbz#695509 crash in RefreshDocumentLB
+
+---
+ sd/source/ui/dlg/navigatr.cxx |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/sd/source/ui/dlg/navigatr.cxx b/sd/source/ui/dlg/navigatr.cxx
+index 09426b8..edee709 100644
+--- a/sd/source/ui/dlg/navigatr.cxx
++++ b/sd/source/ui/dlg/navigatr.cxx
+@@ -713,7 +713,8 @@ void SdNavigatorWin::RefreshDocumentLB( const String* pDocName )
+                 NavDocInfo* pInfo = new NavDocInfo();
+                 pInfo->mpDocShell = pDocShell;
+ 
+-                aStr = pDocShell->GetMedium()->GetName();
++                SfxMedium *pMedium = pDocShell->GetMedium();
++                aStr = pMedium ? pMedium->GetName() : String();
+                 if( aStr.Len() )
+                     pInfo->SetName();
+                 else
+-- 
+1.7.4.2
+
diff --git a/openoffice.org.spec b/openoffice.org.spec
index eb62635..49d68a0 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -1,6 +1,6 @@
 %define oootag OOO330
 %define ooomilestone 20
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -171,6 +171,7 @@ Patch87: 0001-Related-rhbz-684477-make-sure-this-is-thread-safe.patch
 Patch88: 0001-Resolves-rhbz-684620-crash-with-NULL-pTableBox.patch
 Patch89: libreoffice-fdo33947.sd.print.crash.patch
 Patch90: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
+Patch91: 0001-Resolves-rhbz-695509-crash-in-RefreshDocumentLB.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1758,6 +1759,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch88 -p1 -b .rhbz684620-crash-with-NULL-pTableBox.patch
 %patch89 -p1 -b .fdo33947.sd.print.crash.patch
 %patch90 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch
+%patch91 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3953,6 +3955,9 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
+* Sun Apr 17 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.6-UNBUILT
+- Resolves: rhbz#695509 crash in RefreshDocumentLB
+
 * Tue Apr 05 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.5
 - Resolves: rhbz#655686 get order of shutdown correct