[openoffice.org/f14/master] Resolves: rhbz#681159 crash in writer

[Caolan McNamara]

commit 5bed18cf638211d111f55508eeb12f708b77ab47
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Tue Mar 1 13:39:14 2011 +0000

    Resolves: rhbz#681159 crash in writer

 0001-Resolves-rhbz-681159-bandaid-for-crash.patch |   20 ++++++++++++++++++++
 openoffice.org.spec                               |    5 ++++-
 2 files changed, 24 insertions(+), 1 deletions(-)
---
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..9c88fda
--- /dev/null
+++ b/0001-Resolves-rhbz-681159-bandaid-for-crash.patch
@@ -0,0 +1,20 @@
+--- sw/source/ui/uiview/viewtab.cxx	2011-03-01 11:40:03.728571325 +0000
++++ sw/source/ui/uiview/viewtab.cxx	2011-03-01 11:40:03.728571325 +0000
+@@ -733,7 +733,7 @@
+             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;
+@@ -742,7 +742,7 @@
+ 			}
+ 			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();
diff --git a/openoffice.org.spec b/openoffice.org.spec
index b6df1bc..ea2dd3d 100644
--- a/openoffice.org.spec
+++ b/openoffice.org.spec
@@ -165,6 +165,7 @@ Patch81: 0001-Resolves-rhbz-676539-handle-missing-pWindows-from-xW.patch
 Patch82: 0001-rhbz-649310-don-t-crash-deregistering-diff.-platform.patch
 Patch83: 0001-rhbz-666440-don-t-pushback-and-process-a-corrupt-extension.patch
 Patch84: 0001-Resolves-rhbz-674330-dereference-of-NULL-mpBase.patch
+Patch85: 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}
@@ -1746,6 +1747,7 @@ cp -p %{SOURCE5} external/unowinreg/unowinreg.dll
 %patch82 -p1 -b .rhbz649310-don-t-crash-deregistering-diff.-platform.patch
 %patch83 -p1 -b .rhbz666440-don-t-pushback-and-process-a-corrupt-extension.patch
 %patch84 -p1 -b .rhbz674330-dereference-of-NULL-mpBase.patch
+%patch85 -p0 -b .rhbz681159-bandaid-for-crash.patch
 touch scripting/source/pyprov/delzip
 touch scripting/util/provider/beanshell/delzip
 touch scripting/util/provider/javascript/delzip
@@ -3941,7 +3943,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
 %endif
 
 %changelog
-* Wed Feb 16 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
+* Tue Mar 01 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.3-UNBUILT
 - Related: rhbz#610103 make this even more robust
 - Related: rhbz#672872 cancel gtk file dialog on terminate
 - Resolves: rhbz#673819 crash on changing position of header/footer drawing object
@@ -3951,6 +3953,7 @@ unopkg remove --shared org.openoffice.legacy.ScriptProviderForPython.zip > /dev/
   (dtardon)
 - Resolves: rhbz#666440 don't pushback and process a corrupt extension
 - Resolves: rhbz#674330 dereference of NULL mpBase
+- Resolves: rhbz#681159 crash in writer
 
 * Mon Jan 24 2011 Caolán McNamara <caolanm at redhat.com>- 1:3.3.0-20.2
 - Resolves: rhbz#671540 fix lonely )