[libreoffice/f15/master] Resolves: rhbz#695509 crash in RefreshDocumentLB

[Caolan McNamara]

commit 80dc7d58a8a325925b2ff39fc9e410d42ae25021
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Sun Apr 17 23:02:43 2011 +0100

    Resolves: rhbz#695509 crash in RefreshDocumentLB

 ...es-rhbz-695509-crash-in-RefreshDocumentLB.patch |   26 ++++++++++++++++++++
 libreoffice.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/libreoffice.spec b/libreoffice.spec
index 1847dd0..8c01911 100644
--- a/libreoffice.spec
+++ b/libreoffice.spec
@@ -29,7 +29,7 @@ Summary:        Free Software Productivity Suite
 Name:           libreoffice
 Epoch:          1
 Version:        3.3.2.2
-Release:        6%{?dist}
+Release:        7%{?dist}
 License:        LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain
 Group:          Applications/Productivity
 URL:            http://www.documentfoundation.org/develop
@@ -136,6 +136,7 @@ Patch47: 0001-Resolves-rhbz-684580-X-and-strike-through-escapes-ra.patch
 Patch48: 0001-set-mime-types-on-flat-xml-filters.patch
 Patch49: 0001-add-flat-xml-types-to-.desktop-files-etc.patch
 Patch50: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
+Patch51: 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}
@@ -787,6 +788,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch48 -p1 -b .set-mime-types-on-flat-xml-filters.patch
 %patch49 -p1 -b .add-flat-xml-types-to-.desktop-files-etc.patch
 %patch50 -p1 -b .rhbz655686-get-order-of-shutdown-c.patch
+%patch51 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2136,6 +2138,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Sun Apr 17 2011 Caolán McNamara <caolanm at redhat.com> 3.3.2.2-7-UNBUILT
+- Resolves: rhbz#695509 crash in RefreshDocumentLB
+
 * Tue Apr 05 2011 Caolán McNamara <caolanm at redhat.com> 3.3.2.2-6
 - Resolves: rhbz#655686 get order of shutdown correct