rpms/openoffice.org/F-9 workspace.vcl98.patch, NONE, 1.1 openoffice.org.spec, 1.1511, 1.1512

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-9
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv21968

Modified Files:
	openoffice.org.spec 
Added Files:
	workspace.vcl98.patch 
Log Message:
Resolves: ooo#97326 vertical text troubles 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/F-9/openoffice.org.spec,v
retrieving revision 1.1511
retrieving revision 1.1512
diff -u -r1.1511 -r1.1512
--- openoffice.org.spec	19 Nov 2008 12:08:37 -0000	1.1511
+++ openoffice.org.spec	18 Dec 2008 12:55:49 -0000	1.1512
@@ -171,6 +171,7 @@
 Patch96: openoffice.org-2.4.1.ooo92217.sal.alloc.patch
 Patch97: openoffice.org-2.4.1.ooo81576.vcl.fixscale.patch
 Patch98: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
+Patch99: workspace.vcl98.patch
 
 %define instdir %{_libdir}/openoffice.org
 
@@ -1156,6 +1157,7 @@
 %patch96 -p1 -b .ooo92217.sal.alloc.patch
 %patch97 -p1 -b .ooo81576.vcl.fixscale.patch
 %patch98 -p1 -b .ooo95533.sw.safertableexport.patch
+%patch99 -p1 -b .workspace.vcl98.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -2951,8 +2953,9 @@
 
 
 %changelog
-* Tue Nov 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.2-18.2
+* Tue Dec 18 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.2-18.2
 - Resolves: rhbz#471103 improve font-settings
+- Resolves: ooo#97326 vertical text troubles add workspace.vcl98.patch
 
 * Wed Oct 29 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.2-18.1
 - Resolves: ooo#94495 Toggle weblayout/normal layout and notes