rpms/openoffice.org/devel openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch, 1.4, 1.5

[fedora-cvs-commits at redhat.com]

Author: caolanm

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

Modified Files:
	openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch 
Log Message:
probably I meant this, I forget, so need to check with glyph-fallback test

openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch:
 inc/outdev.h             |    3 +--
 inc/sallayout.hxx        |    1 +
 source/gdi/outdev3.cxx   |   44 +++++++++++++++++++++++++-------------------
 source/gdi/sallayout.cxx |   46 ++++++++++++++++++++++++++++++++++++++++++++--
 4 files changed, 71 insertions(+), 23 deletions(-)

Index: openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	28 Aug 2006 10:25:30 -0000	1.4
+++ openoffice.org-1.9.129.ooo54603.fontconfig.part3.patch	29 Sep 2006 12:36:11 -0000	1.5
@@ -184,14 +184,14 @@
 +            //If the next character is one which belongs to the next level, then we
 +            //are finished here for now, and we'll pick up after the next level has
 +            //been processed
-+            if ((n+1 < nLevel) && (std::abs(nCharPos[n] - nOrigCharPos)))
++            if ((n+1 < nLevel) && (abs(nCharPos[n] - nOrigCharPos) == 1))
 +            {
 +                if (nOrigCharPos < nCharPos[n])
 +                {
 +                    if (nCharPos[n+1] > nOrigCharPos && (nCharPos[n+1] < nCharPos[n]))
 +                        break;
 +                }
-+                else if (nOrigCharPos < nCharPos[n])
++                else if (nOrigCharPos > nCharPos[n])
 +                {
 +                    if (nCharPos[n+1] > nCharPos[n] && (nCharPos[n+1] < nOrigCharPos))
 +                        break;