rpms/openoffice.org/devel openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch, NONE, 1.1 openoffice.org.spec, 1.2204, 1.2205

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch 
Log Message:
Resolves: 587419 [abrt] crash in SwTxtFtn::CopyFtn

openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch:
 ndtxt.cxx |    9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch ---
# HG changeset patch
# Parent 9ed9d47d3b48fc76b349dfb12a2e34197abea276
#i111286# avoid crash when pasting footnote into frame

diff -r 9ed9d47d3b48 sw/source/core/txtnode/ndtxt.cxx
--- a/sw/source/core/txtnode/ndtxt.cxx	Fri Apr 30 11:59:28 2010 +0200
+++ b/sw/source/core/txtnode/ndtxt.cxx	Fri Apr 30 14:22:11 2010 +0200
@@ -1683,7 +1683,14 @@
 		{
             pNewHt = pDest->InsertItem( pHt->GetAttr(), nAttrStt,
                                 nAttrEnd, nsSetAttrMode::SETATTR_NOTXTATRCHR );
-            lcl_CopyHint( nWhich, pHt, pNewHt, pOtherDoc, pDest );
+            // InsertItem may return 0 if the hint could not be inserted
+            // (for example a footnote field can not appear in another
+            // footnote or in a frame) or if the hint was merged with
+            // another hint. Avoid a crash in this case.
+            if (pNewHt)
+            {
+                lcl_CopyHint( nWhich, pHt, pNewHt, pOtherDoc, pDest );
+            }
         }
 
 		if( RES_TXTATR_REFMARK == nWhich && !pEndIdx && !bCopyRefMark )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2204
retrieving revision 1.2205
diff -u -p -r1.2204 -r1.2205
--- openoffice.org.spec	28 Apr 2010 10:52:30 -0000	1.2204
+++ openoffice.org.spec	30 Apr 2010 12:39:05 -0000	1.2205
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 16
-%define rh_rpm_release 3
+%define rh_rpm_release 4
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -135,6 +135,7 @@ Patch64: openoffice.org-3.3.0.ooo111152.
 Patch65: workspace.vcl111.patch
 Patch66: openoffice.org-3.2.0.ooo101131.sw.size.mismatch.patch
 Patch67: openoffice.org-3.3.0.ooo93818.sw.postitprint.patch
+Patch68: openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1683,6 +1684,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch65 -p1 -b .workspace.vcl111.patch
 %patch66 -p1 -b .ooo101131.sw.size.mismatch.patch
 %patch67 -p1 -b .ooo93818.sw.postitprint.patch
+%patch68 -p1 -b .ooo111286.sw.ignore-null-hint.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4166,6 +4168,9 @@ fi
 %endif
 
 %changelog
+* Fri Apr 30 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-16.4
+- Resolves: 587419 [abrt] crash in SwTxtFtn::CopyFtn (dtardon)
+
 * Wed Apr 28 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-16.3
 - Resolves: rhbz#586446 add openoffice.org-3.3.0.ooo93818.sw.postitprint.patch