rpms/openoffice.org/devel openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch, NONE, 1.1 openoffice.org.spec, 1.1863, 1.1864

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch 
Log Message:
Resolves: rhbz#490924 whacked out handling of tlswg custom token

openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch:

--- NEW FILE openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch ---
Index: source/svrtf/rtfitem.cxx
===================================================================
RCS file: /cvs/graphics/svx/source/svrtf/rtfitem.cxx,v
retrieving revision 1.35
diff -u -r1.35 rtfitem.cxx
--- svx.orig/source/svrtf/rtfitem.cxx	11 Apr 2008 03:19:51 -0000	1.35
+++ svx/source/svrtf/rtfitem.cxx	18 Mar 2009 17:17:27 -0000
@@ -1164,12 +1164,16 @@
 								ReadTabAttr( nToken, *pSet );
 
                                 /*
-                                cmc: #i76140, he who reads the { must read the }
+                                cmc: #i76140, he who consumed the { must consume the }
                                 We rewound to a state of { being the current 
-                                token so it is our responsibility to read the } 
-                                token.
+                                token so it is our responsibility to consume the } 
+                                token if we consumed the {. We will not have consumed
+                                the { if it belonged to our caller, i.e. if the { we
+                                are handling is the "firsttoken" passed to us then
+                                the *caller* must consume it, not us. Otherwise *we*
+                                should consume it.
                                 */
-                                if (nToken == BRACELEFT)
+                                if (nToken == BRACELEFT && !bFirstToken)
                                 {
                                     nToken = GetNextToken();
                                     DBG_ASSERT( nToken == BRACERIGHT, 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1863
retrieving revision 1.1864
diff -u -r1.1863 -r1.1864
--- openoffice.org.spec	18 Mar 2009 12:36:27 -0000	1.1863
+++ openoffice.org.spec	19 Mar 2009 09:36:44 -0000	1.1864
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 6
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -131,6 +131,7 @@
 Patch56: workspace.rptfix06.patch
 Patch57: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
 Patch58: ooo-build.ooo2497.filter.svg.patch
+Patch59: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -520,8 +521,8 @@
 Obsoletes: openoffice.org2-graphicfilter < 1:3.0.0
 
 %description graphicfilter
-The graphicfilter module for %{name}, provides additional svg and flash export
-filters.
+The graphicfilter module for %{name}, provides graphic filters, e.g. svg and
+flash filters.
 
 %package xsltfilter
 Summary: Extra xsltfilter module for %{name}
@@ -1620,6 +1621,7 @@
 %patch56 -p0 -b .workspace.rptfix06.patch
 %patch57 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
 %patch58 -p1 -b .ooo2497.filter.svg.patch
+%patch59 -p0 -b .ooo100353.svx.rtfbrackets.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4107,6 +4109,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Thu Mar 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.3
+- Resolves: rhbz#490924 whacked out handling of tlswg custom token
+
 * Tue Mar 17 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-6.2
 - Resolves: ooo#100273 fix utf-8 hyphenation for potential Indic
   hyphenation patterns