rpms/openoffice.org/devel workspace.vcl98.patch, NONE, 1.1 openoffice.org.spec, 1.1725, 1.1726

[Caolan McNamara]

Author: caolanm

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

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

workspace.vcl98.patch:

--- NEW FILE workspace.vcl98.patch ---
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.150.2.1
diff -u -r1.150.2.1 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	26 Aug 2008 12:26:31 -0000	1.150.2.1
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	17 Dec 2008 15:06:40 -0000
@@ -1251,7 +1279,8 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    int nLoadFlags = mnLoadFlags;
+    int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
+;
 
 //  if( mbArtItalic )
 //      nLoadFlags |= FT_LOAD_NO_BITMAP;    
@@ -1339,7 +1368,7 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    FT_Int nLoadFlags = mnLoadFlags;
+    FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
     // #i70930# force mono-hinting for monochrome text
     if( nFTVERSION >= 2110 ) //#i71947# unless it looks worse
     {
@@ -1499,7 +1528,7 @@
     int nGlyphFlags;
     SplitGlyphFlags( *this, nGlyphIndex, nGlyphFlags );
 
-    FT_Int nLoadFlags = mnLoadFlags;
+    FT_Int nLoadFlags = mnLoadFlags | FT_LOAD_IGNORE_TRANSFORM;
 
     if( mbArtItalic )
         nLoadFlags |= FT_LOAD_NO_BITMAP;    


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1725
retrieving revision 1.1726
diff -u -r1.1725 -r1.1726
--- openoffice.org.spec	16 Dec 2008 17:01:35 -0000	1.1725
+++ openoffice.org.spec	17 Dec 2008 16:59:06 -0000	1.1726
@@ -133,6 +133,7 @@
 Patch60: workspace.transogl03.patch
 Patch61: workspace.vcl97.patch
 Patch62: openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
+Patch63: workspace.vcl98.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1404,6 +1405,7 @@
 %patch60 -p0 -b .workspace.transogl03.patch
 %patch61 -p1 -b .workspace.vcl97.patch
 %patch62 -p1 -b .ooo97196.vcl.ensuretheme.whenqttesting.patch
+%patch63 -p1 -b .workspace.vcl98.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2180,7 +2182,7 @@
 %{baseinstdir}/share/uno_packages/cache
 %dir %{baseinstdir}/extensions
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/default.css
 %{basisinstdir}/help/en/err.html
@@ -2934,7 +2936,7 @@
 %files base-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/sdatabase.*
 %dir %{basisinstdir}/program
@@ -3216,7 +3218,7 @@
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
 %dir %{basisinstdir}/help
-%dir %{basisinstdir}/help/en
+%docdir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/scalc.*
 %dir %{basisinstdir}/program
 %{basisinstdir}/program/libanalysis%{SOPOST}.so
@@ -3303,7 +3305,7 @@
 %files draw-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/sdraw.*
 %dir %{basisinstdir}/share
@@ -3384,7 +3386,7 @@
 %files writer-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/swriter.*
 %dir %{basisinstdir}/program
@@ -3488,7 +3490,7 @@
 %files impress-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/simpress.*
 %dir %{basisinstdir}/program
@@ -3564,7 +3566,7 @@
 %files math-core
 %defattr(-,root,root,-)
 %dir %{basisinstdir}
-%dir %{basisinstdir}/help
+%docdir %{basisinstdir}/help
 %dir %{basisinstdir}/help/en
 %{basisinstdir}/help/en/smath.*
 %dir %{basisinstdir}/program
@@ -3800,9 +3802,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Sun Dec 14 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.3
+* Wed Dec 17 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.3
 - Resolves: rhbz#475007 openoffice.org-3.0.1.ooo97196.vcl.ensuretheme.whenqttesting.patch
 - add ga thesaurus
+- add workspace.vcl98.patch
 
 * Thu Dec 11 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-13.2
 - Resolves: rhbz#466680 package OGLTrans 3D OpenGL slide transitions