rpms/openoffice.org/devel openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch, NONE, 1.1 openoffice.org.spec, 1.2240, 1.2241

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv20406

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch 
Log Message:
Resolves: rhbz#603013/ooo#112363 avoid a11y crash

openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch:
 textwindowaccessibility.cxx |   12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

--- NEW FILE openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch ---
diff -ru accessibility/source/extended/textwindowaccessibility.cxx accessibility/source/extended/textwindowaccessibility.cxx
--- accessibility/source/extended/textwindowaccessibility.cxx	2010-06-14 10:15:09.428805818 +0100
+++ accessibility/source/extended/textwindowaccessibility.cxx	2010-06-14 10:30:38.683798962 +0100
@@ -1992,10 +1992,14 @@
                 determineVisibleRange();
                 notifyVisibleRangeChanges(aOldVisibleBegin, aOldVisibleEnd,
                                           m_xParagraphs->end());
-                Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
-                ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
-                if (xParagraph.is())
-                    xParagraph->textChanged();
+
+                if (n < m_xParagraphs->size())
+                {
+                    Paragraphs::iterator aIt(m_xParagraphs->begin() + n);
+                    ::rtl::Reference< ParagraphImpl > xParagraph(getParagraph(aIt));
+                    if (xParagraph.is())
+                        xParagraph->textChanged();
+                }
                 break;
             }
         default:


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2240
retrieving revision 1.2241
diff -u -p -r1.2240 -r1.2241
--- openoffice.org.spec	14 Jun 2010 08:57:50 -0000	1.2240
+++ openoffice.org.spec	14 Jun 2010 09:39:29 -0000	1.2241
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 19
-%define rh_rpm_release 11
+%define rh_rpm_release 12
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -148,6 +148,7 @@ Patch77: workspace.vcl112.patch
 Patch78: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
 Patch79: openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
 Patch80: openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
+Patch81: openoffice.org-3.3.0.ooo112363.accessibility.badindex.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1707,8 +1708,9 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch76 -p1 -b .workspace.os140.patch
 %patch77 -p1 -b .workspace.vcl112.patch
 %patch78 -p1 -b .ooo107490.cppu.lifecycle.patch
-%patch79 -p0 -b .openoffice.org-3.3.0.ooo100686.wizards.types.not.mediatypes.patch
-%patch80 -p0 -b .openoffice.org-3.3.0.ooo112247.vcl.workaround.overlarge.replacements.patch
+%patch79 -p0 -b .ooo100686.wizards.types.not.mediatypes.patch
+%patch80 -p0 -b .ooo112247.vcl.workaround.overlarge.replacements.patch
+%patch81 -p0 -b .ooo112363.accessibility.badindex.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4199,6 +4201,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.12
+- Resolves: rhbz#603013/ooo#112363 avoid a11y crash
+
 * Mon Jun 14 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-19.11
 - Resolves: rhbz#603298 crash in ImplFontCharMap::GetGlyphIndex