rpms/openoffice.org/devel openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch, NONE, 1.1 openoffice.org.spec, 1.1320, 1.1321

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv16826

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch 
Log Message:
add openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch to fix (maybe) hidden annotations

openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch:

--- NEW FILE openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch ---
Index: source/filter/ww8/ww8scan.cxx
===================================================================
RCS file: /cvs/sw/sw/source/filter/ww8/ww8scan.cxx,v
retrieving revision 1.132
diff -u -r1.132 ww8scan.cxx
--- openoffice.org.orig/sw/source/filter/ww8/ww8scan.cxx	25 May 2007 13:03:35 -0000	1.132
+++ openoffice.org/sw/source/filter/ww8/ww8scan.cxx	12 Oct 2007 10:06:35 -0000
@@ -4349,13 +4349,15 @@
         pBkm = &aD[1];
         pEdn = &aD[2];
         pFtn = &aD[3];
-        pAnd = &aD[4];
 
-        pPcd = ( pBase->pPLCFx_PCD ) ? &aD[5] : 0;
+        pPcd = ( pBase->pPLCFx_PCD ) ? &aD[4] : 0;
         //pPcdA index == pPcd index + 1
-        pPcdA = ( pBase->pPLCFx_PCDAttrs ) ? &aD[6] : 0;
+        pPcdA = ( pBase->pPLCFx_PCDAttrs ) ? &aD[5] : 0;
+
+        pChp = &aD[6];
+
+        pAnd = &aD[7];
 
-        pChp = &aD[7];
         pPap = &aD[8];
         pSep = &aD[9];
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1320
retrieving revision 1.1321
diff -u -r1.1320 -r1.1321
--- openoffice.org.spec	11 Oct 2007 07:59:15 -0000	1.1320
+++ openoffice.org.spec	12 Oct 2007 10:14:10 -0000	1.1321
@@ -146,6 +146,7 @@
 Patch64: openoffice.org-2.3.0.ooo81321.cppu.silencewarnings.patch
 Patch65: openoffice.org-2.3.0.ooo81323.svtools.sixtyfour.patch
 Patch66: openoffice.org-2.3.0.ooo81936.sc.maketypesagree.patch
+Patch67: openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1087,6 +1088,7 @@
 %patch64 -p1 -b .ooo81321.cppu.silencewarnings.patch
 %patch65 -p1 -b .ooo81323.svtools.sixtyfour.patch
 %patch66 -p1 -b .ooo81936.sc.maketypesagree.patch
+%patch67 -p1 -b .ooo53885.raiseannotationpriority.sw.patch
 
 %if %{linkopt}
 chmod a+x solenv/bin/mklinkscript.pl
@@ -2780,6 +2782,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Fri Oct 12 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.4
+- add openoffice.org-2.3.0.ooo53885.raiseannotationpriority.sw.patch
+
 * Mon Oct 08 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.3.0-6.3
 - reenable prelink-optimized launchers
 - rhbz#326161 make code compiled with icedtea compatible with 1.5.0 so libgcj