Resolves: rhbz#695509 crash in RefreshDocumentLB

f41
Caolán McNamara 14 years ago
parent 019feac763
commit 903c5dac6b

@ -0,0 +1,26 @@
From 5cc73f49400f9719ffd5382e64931de6eb8f130c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm@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

@ -15,7 +15,7 @@ Summary: Free Software Productivity Suite
Name: libreoffice Name: libreoffice
Epoch: 1 Epoch: 1
Version: 3.3.99.1 Version: 3.3.99.1
Release: 1%{?dist} Release: 2%{?dist}
License: LGPLv3 and LGPLv2+ and BSD and (MPLv1.1 or GPLv2 or LGPLv2 or Netscape) and (CDDL or GPLv2) and Public Domain 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 Group: Applications/Productivity
URL: http://www.documentfoundation.org/develop URL: http://www.documentfoundation.org/develop
@ -85,6 +85,7 @@ Patch10: 0001-helgrind-Related-rhbz-655686-get-order-of-shutdown-c.patch
Patch11: kde4configure.patch Patch11: kde4configure.patch
Patch12: 0001-Removed-duplicate-code-block-mis-merge-prolly.patch Patch12: 0001-Removed-duplicate-code-block-mis-merge-prolly.patch
Patch13: 7de0b88ce2dd932915894385b54be1897d5ee053.zip Patch13: 7de0b88ce2dd932915894385b54be1897d5ee053.zip
Patch14: 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))")} %{!?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}
@ -702,6 +703,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
%patch11 -p0 -b .kde4configure.patch %patch11 -p0 -b .kde4configure.patch
%patch12 -p1 -b .Removed-duplicate-code-block-mis-merge-prolly.patch %patch12 -p1 -b .Removed-duplicate-code-block-mis-merge-prolly.patch
unzip -o %{PATCH13} unzip -o %{PATCH13}
%patch14 -p1 -b .rhbz695509-crash-in-RefreshDocumentLB.patch
%build %build
echo build start time is `date`, diskspace: `df -h . | tail -n 1` echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@ -2025,6 +2027,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
%{basisinstdir}/program/kde-open-url %{basisinstdir}/program/kde-open-url
%changelog %changelog
* Sun Apr 17 2011 Caolán McNamara <caolanm@redhat.com> 3.3.99.1-2-UNBUILT
- Resolves: rhbz#695509 crash in RefreshDocumentLB
* Tue Apr 11 2011 Caolán McNamara <caolanm@redhat.com> 3.3.99.1-1 * Tue Apr 11 2011 Caolán McNamara <caolanm@redhat.com> 3.3.99.1-1
- 3.4 beta1 - 3.4 beta1
- drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch - drop openoffice.org-1.9.123.ooo53397.prelinkoptimize.desktop.patch

Loading…
Cancel
Save