[libreoffice/f15] Resolves: rhbz#710004 band aid for crash

[Caolan McNamara]

commit 6d0842b7e4bcf84db025a94829984a17c883b88e
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jun 2 11:53:07 2011 +0100

    Resolves: rhbz#710004 band aid for crash

 ...bz-710004-band-aid-for-immediate-crash-in.patch |   29 ++++++++++++++++++++
 libreoffice.spec                                   |    7 ++++-
 2 files changed, 35 insertions(+), 1 deletions(-)
---
diff --git a/0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch b/0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch
new file mode 100644
index 0000000..c9648c6
--- /dev/null
+++ b/0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch
@@ -0,0 +1,29 @@
+From 3860483d8cb9e259ca3f68347ba0e35f7bfb1739 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= <caolanm at redhat.com>
+Date: Thu, 2 Jun 2011 11:39:43 +0100
+Subject: [PATCH] Resolves: rhbz#710004 band-aid for immediate crash in
+ IsAlignPossible (cherry picked from commit
+ d6839fa9aaac82892b5af2bc00c9ad196c9ff4bb)
+
+---
+ sw/source/core/frmedt/feshview.cxx |    3 ++-
+ 1 files changed, 2 insertions(+), 1 deletions(-)
+
+diff --git a/sw/source/core/frmedt/feshview.cxx b/sw/source/core/frmedt/feshview.cxx
+index ef9becd..87bc266 100644
+--- a/sw/source/core/frmedt/feshview.cxx
++++ b/sw/source/core/frmedt/feshview.cxx
+@@ -2566,8 +2566,9 @@ sal_Bool SwFEShell::IsAlignPossible() const
+         {
+             SdrObject *pO = Imp()->GetDrawView()->GetMarkedObjectList().GetMark(0)->GetMarkedSdrObj();
+             SwDrawContact *pC = (SwDrawContact*)GetUserCall(pO);
++            OSL_ENSURE( pC, "No SwDrawContact!");
+             //only as character bound drawings can be aligned
+-            bRet = (pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AS_CHAR);
++            bRet = pC ? (pC->GetFmt()->GetAnchor().GetAnchorId() == FLY_AS_CHAR) : sal_False;
+         }
+         if ( bRet )
+             return Imp()->GetDrawView()->IsAlignPossible();
+-- 
+1.7.5.2
+
diff --git a/libreoffice.spec b/libreoffice.spec
index f51d6e3..686d8b9 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:        9%{?dist}
+Release:        10%{?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
@@ -142,6 +142,7 @@ Patch53: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch
 Patch54: 0001-handle-NULL-display-gracefully.patch
 Patch55: 0001-fix-crash-in-fdo-36203-the-referenced-shape-didn-t-c.patch
 Patch56: 0001-Resolves-rhbz-707317-avoid-crash-in-getRowSpan.patch
+Patch57: 0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -799,6 +800,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc
 %patch54 -p1 -b .handle-NULL-display-gracefully.patch
 %patch55 -p1 -b .fix-crash-in-fdo-36203-the-referenced-shape-didn-t-c.patch
 %patch56 -p1 -b .rhbz707317-avoid-crash-in-getRowSpan.patch
+%patch57 -p1 -b .rhbz710004-band-aid-for-immediate-crash-in.patch
 
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
@@ -2143,6 +2145,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || :
 %{basisinstdir}/program/kde-open-url
 
 %changelog
+* Thu Jun 02 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.2.2-10-UNBUILT
+- Resolves: rhbz#710004 band aid for crash
+
 * Mon May 30 2011 Caolán McNamara <caolanm at redhat.com> 1:3.3.2.2-9
 - Resolves: rhbz#702635 set correct page number when exporting selected
   pages