rpms/openoffice.org/devel openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch, 1.1, 1.2 openoffice.org.spec, 1.1894, 1.1895 workspace.hb18.patch, 1.2, 1.3 openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch, 1.1, NONE

Fri Apr 24 08:42:54 UTC 2009

Author: caolanm

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

Modified Files:
	openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch 
	openoffice.org.spec workspace.hb18.patch 
Removed Files:
	openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch 
Log Message:
merge into upstream workspace, and extend xslt patch

openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch:

Index: openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2

--- openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	16 Jan 2009 15:34:36 -0000	1.1
+++ openoffice.org-3.1.0.ooo98137.filter.redeclared-variables.patch	24 Apr 2009 08:42:53 -0000	1.2
@@ -1,6 +1,6 @@
-diff -up ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
---- ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl.xhtml	2009-01-16 10:41:31.000000000 +0100
-+++ ./filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-01-16 10:48:01.000000000 +0100
+diff -ru filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl filter/source/xslt/odf2xhtml/export/xhtml/body.xsl
+--- filter.orig/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/odf2xhtml/export/xhtml/body.xsl	2009-04-24 09:31:57.000000000 +0100
 @@ -462,7 +462,7 @@
  	<xsl:template name="create-heading">
  		<xsl:param name="globalData"/>
@@ -27,3 +27,62 @@
  		<xsl:param name="listStyleName" select="@text:style-name"/>
  
  		<!-- To choose list type - get the list style, with the same 'text:style-name' and same 'text:level' -->
+diff -ru filter.orig/source/xslt/export/spreadsheetml/formular.xsl filter/source/xslt/export/spreadsheetml/formular.xsl
+--- filter.orig/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/spreadsheetml/formular.xsl	2009-04-24 09:31:57.000000000 +0100
+@@ -381,7 +381,7 @@
+ 					</xsl:when>
+ 					<xsl:otherwise>
+ 						<xsl:value-of select="$earlierCandidate" />
+-						<xsl:variable name="parameterCandidate">
++						<xsl:variable name="parameterCandidate2">
+ 							<xsl:variable name="formularAfterCandidate" select="substring-after($expressionSuffix, $earlierCandidate)" />
+ 							<xsl:variable name="parameterTillBracket" select="concat(substring-before($formularAfterCandidate,')'),')')" />
+ 							<xsl:variable name="parameterTillComma" select="substring-before(substring-after($expressionSuffix, $parameterTillBracket),',')" />
+@@ -405,8 +405,8 @@
+ 						<xsl:call-template name="getParameter">
+ 							<xsl:with-param name="closingBracketCount" select="$closingBracketCount" />
+ 							<xsl:with-param name="openingBracketCount" select="$openingBracketCount" />
+-							<xsl:with-param name="parameterCandidate" select="$parameterCandidate" />
+-							<xsl:with-param name="earlierCandidate" select="$parameterCandidate" />
++							<xsl:with-param name="parameterCandidate" select="$parameterCandidate2" />
++							<xsl:with-param name="earlierCandidate" select="$parameterCandidate2" />
+ 							<xsl:with-param name="expressionSuffix" select="$expressionSuffix" />
+ 						</xsl:call-template>
+ 					</xsl:otherwise>
+diff -ru filter.orig/source/xslt/export/uof/odf2uof_text.xsl filter/source/xslt/export/uof/odf2uof_text.xsl
+--- filter.orig/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:31:14.000000000 +0100
++++ filter/source/xslt/export/uof/odf2uof_text.xsl	2009-04-24 09:32:29.000000000 +0100
+@@ -4016,26 +4016,26 @@
+ 									<xsl:attribute name="uof:locID">t0122</xsl:attribute>
+ 									<xsl:attribute name="uof:attrList">æ ‡è¯†ç¬¦å¼•ç”¨</xsl:attribute>
+ 								</xsl:element>
+-								<xsl:variable name="stt">
++								<xsl:variable name="stt1">
+ 									<xsl:value-of select="./text:a"/>
+ 								</xsl:variable>
+-								<xsl:variable name="end">
++								<xsl:variable name="end1">
+ 									<xsl:value-of select="."/>
+ 								</xsl:variable>
+ 								<xsl:variable name="bijiao">
+-									<xsl:value-of select="substring-after($end,$stt)"/>
++									<xsl:value-of select="substring-after($end1,$stt1)"/>
+ 								</xsl:variable>
+ 								<xsl:if test="not($bijiao='')">
+ 									<xsl:element name="å—:æ–‡æœ¬ä¸²">
+ 										<xsl:attribute name="uof:locID">t0109</xsl:attribute>
+ 										<xsl:attribute name="uof:attrList">æ ‡è¯†ç¬¦</xsl:attribute>
+-										<xsl:variable name="stt">
++										<xsl:variable name="stt2">
+ 											<xsl:value-of select="./text:a"/>
+ 										</xsl:variable>
+-										<xsl:variable name="end">
++										<xsl:variable name="end2">
+ 											<xsl:value-of select="."/>
+ 										</xsl:variable>
+-										<xsl:value-of select="substring-after($end,$stt)"/>
++										<xsl:value-of select="substring-after($end2,$stt2)"/>
+ 									</xsl:element>
+ 								</xsl:if>
+ 							</å—:å¥>


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1894
retrieving revision 1.1895
diff -u -r1.1894 -r1.1895
--- openoffice.org.spec	24 Apr 2009 07:18:08 -0000	1.1894
+++ openoffice.org.spec	24 Apr 2009 08:42:53 -0000	1.1895
@@ -132,12 +132,11 @@
 Patch57: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch58: openoffice.org-3.1.0.ooo100991.pyuno-fix.patch
 Patch59: openoffice.org-3.1.0.ooo101074.sd.bad.nothrow.patch
-Patch60: openoffice.org-3.1.0.ooo101105.sw.reorder.boundscheck.patch
-Patch61: workspace.vcl101.patch
-Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
-Patch63: workspace.slideshow1.patch
-Patch64: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
-Patch65: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
+Patch60: workspace.vcl101.patch
+Patch61: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
+Patch62: workspace.slideshow1.patch
+Patch63: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+Patch64: openoffice.org-3.1.0.ooo101274.opening-a-directory.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1628,12 +1627,11 @@
 %patch57 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch58 -p1 -b .ooo100991.pyuno-fix.patch
 %patch59 -p1 -b .ooo101074.sd.bad.nothrow.patch
-%patch60 -p0 -b .ooo101105.sw.reorder.boundscheck.patch
-%patch61 -p1 -b .workspace.vcl101.patch
-%patch62 -p1 -b .ooo101152.solenv.kn.patch
-%patch63 -p2 -b .workspace.slideshow1.patch
-%patch64 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
-%patch65 -p0 -b .ooo101274.opening-a-directory.patch
+%patch60 -p1 -b .workspace.vcl101.patch
+%patch61 -p1 -b .ooo101152.solenv.kn.patch
+%patch62 -p2 -b .workspace.slideshow1.patch
+%patch63 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
+%patch64 -p0 -b .ooo101274.opening-a-directory.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.hb18.patch:

Index: workspace.hb18.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.hb18.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- workspace.hb18.patch	22 Apr 2009 10:22:28 -0000	1.2
+++ workspace.hb18.patch	24 Apr 2009 08:42:53 -0000	1.3
@@ -98,3 +98,65 @@
          case TXT_TXTBOX:
              pFldP = pFldTxtBxs;
              break;
+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);
+             }
+         }


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


