From b418748c20fa9cc13770e33de1751d4d7423e177 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= Date: Thu, 2 Jun 2011 11:51:14 +0100 Subject: [PATCH] Resolves: rhbz#710004 band aid for crash --- ...0004-band-aid-for-immediate-crash-in.patch | 29 +++++++++++++++++++ libreoffice.spec | 7 ++++- 2 files changed, 35 insertions(+), 1 deletion(-) create mode 100644 0001-Resolves-rhbz-710004-band-aid-for-immediate-crash-in.patch 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?= +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 97ef501..a0a6fee 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -18,7 +18,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Epoch: 1 Version: 3.4.0.2 -Release: 2%{?dist} +Release: 3%{?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 @@ -92,6 +92,7 @@ Patch14: vbahelper.visibility.patch Patch15: 0001-rhbz-702635-set-correct-page-number-when-exporting-s.patch Patch16: 0001-handle-NULL-display-gracefully.patch Patch17: 0001-Resolves-rhbz-707317-avoid-crash-in-getRowSpan.patch +Patch18: 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} @@ -710,6 +711,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch15 -p1 -b .rhbz702635-set-correct-page-number-when-exporting-s.patch %patch16 -p1 -b .handle-NULL-display-gracefully.patch %patch17 -p1 -b .rhbz707317-avoid-crash-in-getRowSpan.patch +%patch18 -p1 -b .rhbz710004-band-aid-for-immediate-crash-in.patch # these are horribly incomplete--empty translations and copied english # strings with spattering of translated strings @@ -1987,6 +1989,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Thu May 30 2011 Caolán McNamara - 3.4.0.2-3 +- Resolves: rhbz#710004 band aid for crash + * Mon May 30 2011 Caolán McNamara - 3.4.0.2-2 - Resolves: rhbz#707317 avoid crash in getRowSpan