rpms/openoffice.org/devel workspace.hb32bugs01.patch, NONE, 1.1 openoffice.org.spec, 1.1941, 1.1942 openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.hb32bugs01.patch 
Removed Files:
	openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch 
Log Message:
track as upstream accepted workspace

workspace.hb32bugs01.patch:

--- NEW FILE workspace.hb32bugs01.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.1941
retrieving revision 1.1942
diff -u -p -r1.1941 -r1.1942
--- openoffice.org.spec	15 Jun 2009 20:25:44 -0000	1.1941
+++ openoffice.org.spec	16 Jun 2009 08:58:28 -0000	1.1942
@@ -128,7 +128,7 @@ Patch50: openoffice.org-3.1.0.oooXXXXX.s
 Patch51: workspace.cmcfixes57.patch
 Patch52: openoffice.org-3.1.0.ooo100273.fix-utf8-hyphenation.patch
 Patch53: ooo-build.ooo2497.filter.svg.patch
-Patch54: openoffice.org-3.1.0.ooo100353.svx.rtfbrackets.patch
+Patch54: workspace.hb32bugs01.patch
 Patch55: openoffice.org-3.1.0.ooo61927.sw.ww6.unicodefontencoding.patch
 Patch56: workspace.impress171.patch
 Patch57: workspace.vcl101.patch
@@ -1635,7 +1635,7 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch51 -p0 -b .workspace.cmcfixes57.patch
 %patch52 -p0 -b .ooo100273.fix-utf8-hyphenation.patch
 %patch53 -p1 -b .ooo2497.filter.svg.patch
-%patch54 -p0 -b .ooo100353.svx.rtfbrackets.patch
+%patch54 -p0 -b .workspace.hb32bugs01.patch
 %patch55 -p1 -b .ooo61927.sw.ww6.unicodefontencoding.patch
 %patch56 -p1 -b .workspace.impress171.patch
 %patch57 -p1 -b .workspace.vcl101.patch


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