rpms/openoffice.org/devel workspace.ooo31gsl2.patch, NONE, 1.1 openoffice.org.spec, 1.1805, 1.1806

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.ooo31gsl2.patch 
Log Message:
add workspace.ooo31gsl2.patch

workspace.ooo31gsl2.patch:

--- NEW FILE workspace.ooo31gsl2.patch ---
Index: vcl/source/glyphs/gcach_ftyp.hxx
===================================================================
--- vcl/source/glyphs/gcach_ftyp.hxx	(.../tags/OOO310_m1)	(revision 267828)
+++ vcl/source/glyphs/gcach_ftyp.hxx	(.../cws/ooo31gsl2)	(revision 267828)
@@ -181,7 +181,7 @@
     virtual int                 GetFontFaceNum() const { return mpFontInfo->GetFaceNum(); }
     virtual bool                TestFont() const;
     virtual void*               GetFtFace() const;
-    virtual int               	GetLoadFlags() const { return mnLoadFlags; }
+    virtual int               	GetLoadFlags() const { return (mnLoadFlags & ~FT_LOAD_IGNORE_TRANSFORM); }
     virtual bool                NeedsArtificialBold() const { return mbArtBold; }
     virtual bool                NeedsArtificialItalic() const { return mbArtItalic; }
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1805
retrieving revision 1.1806
diff -u -r1.1805 -r1.1806
--- openoffice.org.spec	16 Feb 2009 12:43:58 -0000	1.1805
+++ openoffice.org.spec	16 Feb 2009 16:35:22 -0000	1.1806
@@ -122,6 +122,7 @@
 Patch49: workspace.gfbcrash.patch
 Patch50: openoffice.org-3.1.0.oooXXXXX.gcc44.buildfixes.patch
 Patch51: openoffice.org-3.1.0.ooo99250.sc.autooutline-reflists.patch
+Patch52: workspace.ooo31gsl2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1573,6 +1574,7 @@
 %patch49 -p0 -b .workspace.gfbcrash.patch
 %patch50 -p1 -b .oooXXXXX.gcc44.buildfixes.patch
 %patch51 -p0 -b .ooo99250.sc.autooutline-reflists.patch
+%patch52 -p0 -b .workspace.ooo31gsl2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`