rpms/openoffice.org/devel openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch, NONE, 1.1 openoffice.org.spec, 1.996, 1.997

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv19459

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch 
Log Message:
Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch

openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch:
 glyphs/gcach_layout.cxx            |    0 
 vcl/source/glyphs/gcach_layout.cxx |    5 +++--
 2 files changed, 3 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch ---
Index: glyphs/gcach_layout.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_layout.cxx,v
retrieving revision 1.40
diff -u -r1.40 gcach_layout.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_layout.cxx	17 Sep 2006 12:12:38 -0000	1.40
+++ openoffice.org/vcl/source/glyphs/gcach_layout.cxx	17 Jan 2007 08:08:48 -0000
@@ -529,8 +556,9 @@
         nGlyphCount += nFilteredRunGlyphCount;
     }
 
-    rLayout.SortGlyphItems();
-    
+    // sort glyphs in visual order
+//    rLayout.SortGlyphItems();
+
     // determine need for kashida justification
     if( (rArgs.mpDXArray || rArgs.mnLayoutWidth)
     &&  ((meScriptCode == arabScriptCode) || (meScriptCode == syrcScriptCode)) )


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.996
retrieving revision 1.997
diff -u -r1.996 -r1.997
--- openoffice.org.spec	16 Jan 2007 11:21:14 -0000	1.996
+++ openoffice.org.spec	17 Jan 2007 08:17:29 -0000	1.997
@@ -1,6 +1,6 @@
 %define oootag OOE680
 %define ooomilestone 6
-%define rh_rpm_release 13
+%define rh_rpm_release 14
 
 # gcc#19664#
 %define stlvisibilityfcked 1
@@ -129,6 +129,8 @@
 Patch61: openoffice.org-2.1.0.ooo72349.svx.scriptrange.patch
 Patch62: openoffice.org-2.1.0.ooo73201.sw.a11yloadcrash.patch
 Patch63: openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
+Patch64: openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+
 
 %define instdir %{_libdir}/openoffice.org2.1
 
@@ -1003,6 +1005,7 @@
 %patch61 -p1 -b .ooo72349.svx.scriptrange.patch
 %patch62 -p1 -b .ooo73201.sw.a11yloadcrash.patch
 %patch63 -p1 -b .ooo73481.svx.longnotint32.patch
+%patch64 -p1 -b .oooXXXXX.vcl.dontsortglyphs.patch
 
 %if %{langpacks}
 tar xzf %{SOURCE1}
@@ -2589,6 +2592,9 @@
 %{instdir}/share/registry/modules/org/openoffice/Office/Scripting/Scripting-python.xcu
 
 %changelog
+* Wed Jan 17 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.14
+- Resolves: rhbz#222817 openoffice.org-2.1.0.oooXXXXX.vcl.dontsortglyphs.patch
+
 * Mon Jan 15 2007 Caolan McNamara <caolanm at redhat.com> - 1:2.1.0-6.13
 - Resolves: rhbz#222426 add openoffice.org-2.1.0.ooo73481.svx.longnotint32.patch
 - Resolves: rhbz#222423 openoffice.org-2.1.0.ooo73485.vcl.filterzwatrender.patch