rpms/openoffice.org/devel openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch, 1.1, 1.2 openoffice.org.spec, 1.2208, 1.2209

[David Tardon]

Author: dtardon

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

Modified Files:
	openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch 
	openoffice.org.spec 
Log Message:
Related: rhbz#587419 copy attributes correctly

openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch:
 ndtxt.cxx |   17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

Index: openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch	30 Apr 2010 12:39:05 -0000	1.1
+++ openoffice.org-3.2.0.ooo111286.sw.ignore-null-hint.patch	5 May 2010 10:09:33 -0000	1.2
@@ -1,23 +1,38 @@
 # HG changeset patch
-# Parent 9ed9d47d3b48fc76b349dfb12a2e34197abea276
+# Parent 03902c50d92424e65b930d1c384a97a2655b72e6
 #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 @@
+diff -r 03902c50d924 sw/source/core/txtnode/ndtxt.cxx
+--- a/sw/source/core/txtnode/ndtxt.cxx	Tue May 04 16:15:43 2010 +0200
++++ b/sw/source/core/txtnode/ndtxt.cxx	Wed May 05 10:53:42 2010 +0200
+@@ -1588,6 +1588,7 @@
+ 	// Del-Array fuer alle RefMarks ohne Ausdehnung
+ 	SwpHts aRefMrkArr;
+ 
++    USHORT nDeletedDummyChars(0);
+ 		//Achtung: kann ungueltig sein!!
+     for (USHORT n = 0; ( n < nSize ); ++n)
+     {
+@@ -1681,9 +1682,19 @@
+ 		}
+ 		else
  		{
-             pNewHt = pDest->InsertItem( pHt->GetAttr(), nAttrStt,
-                                 nAttrEnd, nsSetAttrMode::SETATTR_NOTXTATRCHR );
+-            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.
++            pNewHt = pDest->InsertItem( pHt->GetAttr(), nAttrStt - nDeletedDummyChars,
++                                nAttrEnd - nDeletedDummyChars, nsSetAttrMode::SETATTR_NOTXTATRCHR );
 +            if (pNewHt)
 +            {
 +                lcl_CopyHint( nWhich, pHt, pNewHt, pOtherDoc, pDest );
 +            }
++            else if (pHt->HasDummyChar())
++            {
++                // The attribute that has failed to be copied would insert
++                // dummy char, so positions of the following attributes have
++                // to be shifted by one to compensate for that missing char.
++                ++nDeletedDummyChars;
++            }
          }
  
  		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.2208
retrieving revision 1.2209
diff -u -p -r1.2208 -r1.2209
--- openoffice.org.spec	4 May 2010 13:33:35 -0000	1.2208
+++ openoffice.org.spec	5 May 2010 10:09:33 -0000	1.2209
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 16
-%define rh_rpm_release 5
+%define rh_rpm_release 6
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -4168,6 +4168,9 @@ fi
 %endif
 
 %changelog
+* Wed May 05 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-16.6
+- Related: rhbz#587419 copy attributes correctly (dtardon)
+
 * Tue May 04 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.1-16.5
 - rebuild with new poppler