rpms/openoffice.org/F-11 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch, NONE, 1.1 workspace.cmcfixes57.patch, NONE, 1.1 openoffice.org.spec, 1.1876, 1.1877 openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch, 1.1, NONE openoffice.org-3.1.0.ooo100225.comphelper.vis.patch, 1.1, NONE

Caolan McNamara caolanm at fedoraproject.org
Wed Apr 15 15:59:52 UTC 2009 

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-11
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv20424

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
	workspace.cmcfixes57.patch 
Removed Files:
	openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch 
	openoffice.org-3.1.0.ooo100225.comphelper.vis.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);
             }
         }

workspace.cmcfixes57.patch:

--- NEW FILE workspace.cmcfixes57.patch ---
Fix for svgimport visibility bug

From: Thorsten Behrens <thb at openoffice.org>


---

 comphelper/inc/comphelper/servicedecl.hxx |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)


diff --git comphelper/inc/comphelper/servicedecl.hxx comphelper/inc/comphelper/servicedecl.hxx
index bd114be..1fa97cc 100644
--- comphelper/inc/comphelper/servicedecl.hxx
+++ comphelper/inc/comphelper/servicedecl.hxx
@@ -418,20 +418,20 @@ BOOST_PP_REPEAT_FROM_TO(1, COMPHELPER_SERVICEDECL_COMPONENT_HELPER_MAX_ARGS,
 #define COMPHELPER_SERVICEDECL_make_exports(varargs_ )  \
 extern "C" \
 { \
-    void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
+    SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( const sal_Char**  ppEnvTypeName, \
                                                           uno_Environment** /*ppEnv*/ ) \
     { \
         *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; \
     } \
  \
-    sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
+    SAL_DLLPUBLIC_EXPORT sal_Bool SAL_CALL component_writeInfo( ::com::sun::star::lang::XMultiServiceFactory*    pServiceManager, \
                                            ::com::sun::star::registry::XRegistryKey*        pRegistryKey ) \
     { \
         return component_writeInfoHelper( pServiceManager, pRegistryKey, \
                                           BOOST_PP_SEQ_ENUM(varargs_) ); \
     } \
  \
-    void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
+    SAL_DLLPUBLIC_EXPORT void* SAL_CALL component_getFactory( sal_Char const*                                pImplName, \
                                          ::com::sun::star::lang::XMultiServiceFactory*  pServiceManager, \
                                          ::com::sun::star::registry::XRegistryKey*      pRegistryKey ) \
     { \
diff -ru sw.orig/source/filter/ww8/ww8par2.cxx sw/source/filter/ww8/ww8par2.cxx
--- sw.orig/source/filter/ww8/ww8par2.cxx	2009-03-10 12:59:18.000000000 +0000
+++ sw/source/filter/ww8/ww8par2.cxx	2009-03-10 13:51:17.000000000 +0000
@@ -2509,7 +2509,15 @@
             //ability to set the margin.
             SvxLRSpaceItem aL( RES_LR_SPACE );
             // set right to original DxaLeft (i28656)
+#if 0
+            // Type don't get promoted the intuitive way
             aL.SetLeft( !bIsBiDi ?  GetMinLeft() : pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft);
+#else
+            if (!bIsBiDi)
+                aL.SetLeft( GetMinLeft() );
+            else
+                aL.SetLeft( pIo->maSectionManager.GetTextAreaWidth() - nPreferredWidth  - nOrgDxaLeft );
+#endif
             aItemSet.Put(aL);
         }
     }


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-11/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 15:59:21 -0000	1.1877
@@ -126,15 +126,15 @@
 Patch51: openoffice.org-3.1.0.ooo99529.sw.notrailingnewline.patch
 Patch52: openoffice.org-3.1.0.ooo99541.sw.reopen.flat.addrbooks.patch
 Patch53: openoffice.org-3.1.0.oooXXXXX.solenv.allowmissing.patch
-Patch54: openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch
+Patch54: workspace.cmcfixes57.patch
 Patch55: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
 Patch56: ooo-build.ooo2497.filter.svg.patch
 Patch57: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
-Patch58: openoffice.org-3.1.0.ooo100225.comphelper.vis.patch
-Patch59: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
-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
+Patch58: openoffice.org-3.1.0.ooo100942.svtools.oversafeemf.patch
+Patch59: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
+Patch60: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
+Patch61: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
+Patch62: 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}
@@ -1619,15 +1619,15 @@
 %patch51 -p0 -b .ooo99529.sw.notrailingnewline.patch
 %patch52 -p0 -b .ooo99541.sw.reopen.flat.addrbooks.patch
 %patch53 -p1 -b .oooXXXXX.solenv.allowmissing.patch
-%patch54 -p1 -b .gccXXXXX.sw.typeillness.patch
+%patch54 -p0 -b .workspace.cmcfixes57.patch
 %patch55 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
 %patch56 -p1 -b .ooo2497.filter.svg.patch
 %patch57 -p0 -b .ooo100353.svx.rtfbrackets.patch
-%patch58 -p0 -b .ooo100225.comphelper.vis.patch
-%patch59 -p1 -b .ooo100942.svtools.oversafeemf.patch
-%patch60 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
-%patch61 -p1 -b .ooo100991.pyuno-fix.patch
-%patch62 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch58 -p1 -b .ooo100942.svtools.oversafeemf.patch
+%patch59 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
+%patch60 -p1 -b .ooo100991.pyuno-fix.patch
+%patch61 -p1 -b .ooo101074.sd.bad.nothrow.patch
+%patch62 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4115,8 +4115,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, 


--- openoffice.org-3.1.0.gccXXXXX.sw.typeillness.patch DELETED ---


--- openoffice.org-3.1.0.ooo100225.comphelper.vis.patch DELETED ---

More information about the scm-commits mailing list