rpms/openoffice.org/devel openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch, NONE, 1.1 openoffice.org.spec, 1.1876, 1.1877

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv10758

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
Log Message:
Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch

openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch:

--- NEW FILE openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch ---
diff -ru sw.orig/source/filter/ww8/wrtw8esh.cxx sw/source/filter/ww8/wrtw8esh.cxx
--- sw.orig/source/filter/ww8/wrtw8esh.cxx	2009-04-15 11:34:27.000000000 +0100
+++ sw/source/filter/ww8/wrtw8esh.cxx	2009-04-15 12:09:10.000000000 +0100
@@ -1137,11 +1137,11 @@
                 if( nSlotId && nWhich != nSlotId &&
                     0 != ( nWhich = pDstPool->GetWhich( nSlotId ) ) &&
                     nWhich != nSlotId &&
-                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] )
-                    && ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
+                    ( bCharAttr ? ( nWhich >= RES_CHRATR_BEGIN
                                       && nWhich < RES_TXTATR_END)
                                    : (nWhich >= RES_PARATR_BEGIN
-                                      && nWhich < RES_FRMATR_END) ) )
+                                      && nWhich < RES_FRMATR_END) ) &&
+                    0 != ( pOut = aWW8AttrFnTab[ nWhich - RES_CHRATR_BEGIN ] ) )
                 {
                     // use always the SW-Which Id !
                     SfxPoolItem* pI = pItem->Clone();
diff -ru sw.orig/source/filter/ww8/ww8atr.cxx sw/source/filter/ww8/ww8atr.cxx
--- sw.orig/source/filter/ww8/ww8atr.cxx	2009-04-15 11:34:26.000000000 +0100
+++ sw/source/filter/ww8/ww8atr.cxx	2009-04-15 12:34:07.000000000 +0100
@@ -283,10 +283,10 @@
     {
         const SfxPoolItem *pItem = aI->second;
         USHORT nWhich = pItem->Which();
+        if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
+            continue;
         if (FnAttrOut pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN])
         {
-            if (nWhich < RES_CHRATR_BEGIN || nWhich >= RES_TXTATR_END)
-                continue;
             if (SwWW8Writer::CollapseScriptsforWordOk(nScript, nWhich))
                 (*pOut)(*this, *pItem);
         }
@@ -344,17 +344,17 @@
         if (bChpFmt)
             ExportPoolItemsToCHP(aItems, nScript);
 
-        sw::cPoolItemIter aEnd = aItems.end();
-        for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+        if (bPapFmt)
         {
-            pItem = aI->second;
-            USHORT nWhich = pItem->Which();
-            pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
-            if( 0 != pOut && (!bPapFmt || RES_PARATR_NUMRULE != nWhich ))
-            {
-                bool bPap = nWhich >= RES_PARATR_BEGIN
-                            && nWhich < RES_FRMATR_END;
-                if (bPapFmt && bPap)
+            sw::cPoolItemIter aEnd = aItems.end();
+            for (sw::cPoolItemIter aI = aItems.begin(); aI != aEnd; ++aI)
+            {
+                pItem = aI->second;
+                USHORT nWhich = pItem->Which();
+                if (nWhich < RES_PARATR_BEGIN || nWhich >= RES_FRMATR_END || nWhich == RES_PARATR_NUMRULE)
+                    continue;
+                pOut = aWW8AttrFnTab[nWhich - RES_CHRATR_BEGIN];
+                if( 0 != pOut )
                     (*pOut)(*this, *pItem);
             }
         }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1876
retrieving revision 1.1877
diff -u -r1.1876 -r1.1877
--- openoffice.org.spec	14 Apr 2009 10:45:22 -0000	1.1876
+++ openoffice.org.spec	15 Apr 2009 11:45:06 -0000	1.1877
@@ -135,6 +135,7 @@
 Patch60: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch61: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch62: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch63: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,6 +1629,7 @@
 %patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch61 -p1 -b .ooo100991.pyuno-fix.patch
 %patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch63 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4115,8 +4117,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Tue Apr 14 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
+* Wed Apr 15 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.3
 - Resolves: rhbz#495609 openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+- Resolves: rhbz#495868 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
 
 * Thu Apr 09 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-9.2
 - Require hyphen-bn, hyphen-te, hyphen-ta, hyphen-pa, hyphen-or,