diff --git a/0001-Resolves-rhbz-681159-bandaid-for-crash.patch b/0001-Resolves-rhbz-681159-bandaid-for-crash.patch new file mode 100644 index 0000000..be66f40 --- /dev/null +++ b/0001-Resolves-rhbz-681159-bandaid-for-crash.patch @@ -0,0 +1,34 @@ +From ff83a4fc52c1ff7603dd2b26593a5231c4a5c2f2 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Caol=C3=A1n=20McNamara?= +Date: Tue, 1 Mar 2011 13:31:10 +0000 +Subject: [PATCH] Resolves: rhbz#681159 bandaid for crash + +--- + sw/source/ui/uiview/viewtab.cxx | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/sw/source/ui/uiview/viewtab.cxx b/sw/source/ui/uiview/viewtab.cxx +index 0307a69..02fede0 100644 +--- a/sw/source/ui/uiview/viewtab.cxx ++++ b/sw/source/ui/uiview/viewtab.cxx +@@ -694,7 +694,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) + if(bIsTableRTL) + { + USHORT nColCount = aColItem.Count() - 1; +- for ( USHORT i = 0; i < nColCount; ++i ) ++ for ( USHORT i = 0; i < nColCount && i < aTabCols.Count(); ++i ) + { + const SvxColumnDescription& rCol = aColItem[nColCount - i]; + aTabCols[i] = aTabCols.GetRight() - rCol.nStart; +@@ -703,7 +703,7 @@ void SwView::ExecTabWin( SfxRequest& rReq ) + } + else + { +- for ( USHORT i = 0; i < aColItem.Count()-1; ++i ) ++ for ( USHORT i = 0; i < aColItem.Count()-1 && i < aTabCols.Count(); ++i ) + { + const SvxColumnDescription& rCol = aColItem[i]; + aTabCols[i] = rCol.nEnd + aTabCols.GetLeft(); +-- +1.7.4.1 + diff --git a/libreoffice.spec b/libreoffice.spec index 6ff7d79..efe336a 100644 --- a/libreoffice.spec +++ b/libreoffice.spec @@ -28,7 +28,7 @@ Summary: Free Software Productivity Suite Name: libreoffice Version: 3.3.1.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 @@ -114,6 +114,7 @@ Patch26: 0001-Resolves-fdo-33750-i94623-use-optimal-border-width-w.patch Patch27: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch Patch28: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch Patch29: 0001-rhbz-678284-Get-correct-current-position-when-shift-page-up-and-.patch +Patch30: 0001-Resolves-rhbz-681159-bandaid-for-crash.patch %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")} %define instdir %{_libdir} @@ -746,6 +747,7 @@ mv -f redhat.soc extras/source/palettes/standard.soc %patch27 -p1 -b .rhbz649310-don-t-crash-deregistering-diff.-platform.patch %patch28 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch %patch29 -p1 -b .rhbz678284-Get-correct-current-position-when-shift-page-up-and-.patch +%patch30 -p1 -b .rhbz681159-bandaid-for-crash.patch touch scripting/source/pyprov/delzip touch scripting/util/provider/beanshell/delzip touch scripting/util/provider/javascript/delzip @@ -2091,6 +2093,9 @@ update-desktop-database %{_datadir}/applications &> /dev/null || : %{basisinstdir}/program/kde-open-url %changelog +* Tue Mar 01 2011 Caolán McNamara 3.3.1.2-3 +- Resolves: rhbz#681159 crash in writer + * Thu Feb 17 2011 Caolán McNamara 3.3.1.2-2 - Resolves: rhbz#678284 Calc crashes during cell select with keys (dtardon)