rpms/openoffice.org/devel openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch, NONE, 1.1 openoffice.org.spec, 1.1495, 1.1496

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv19237

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch 
Log Message:
add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch

openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch:

--- NEW FILE openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch ---
Index: source/gdi/outdev3.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/gdi/outdev3.cxx,v
retrieving revision 1.240
diff -u -r1.240 outdev3.cxx
--- openoffice.org.orig/vcl/source/gdi/outdev3.cxx	11 Apr 2008 08:49:58 -0000	1.240
+++ openoffice.org/vcl/source/gdi/outdev3.cxx	4 May 2008 16:43:14 -0000
@@ -2786,6 +2786,17 @@
     if( rA.maStyleName != rB.maStyleName)
         return false;
 
+    // Symbol fonts may recode from one type to another So they are only
+    // safely equivalent for equal targets
+    if (
+        (rA.mpFontData && rA.mpFontData->IsSymbolFont()) ||
+        (rB.mpFontData && rB.mpFontData->IsSymbolFont())
+       )
+    {
+        if (rA.maTargetName != rB.maTargetName)
+            return false;
+    }
+
     return true;
 }
 
Index: source/glyphs/gcach_ftyp.cxx
===================================================================
RCS file: /cvs/gsl/vcl/source/glyphs/gcach_ftyp.cxx,v
retrieving revision 1.149
diff -u -r1.149 gcach_ftyp.cxx
--- openoffice.org.orig/vcl/source/glyphs/gcach_ftyp.cxx	11 Apr 2008 08:57:28 -0000	1.149
+++ openoffice.org/vcl/source/glyphs/gcach_ftyp.cxx	4 May 2008 16:43:33 -0000
@@ -911,11 +914,21 @@
 void FreetypeServerFont::FetchFontMetric( ImplFontMetricData& rTo, long& rFactor ) const
 {
     static_cast<ImplFontAttributes&>(rTo) = mpFontInfo->GetFontAttributes();
+
     rTo.mbScalableFont  = true;
     rTo.mbDevice        = true;
     rTo.mbKernableFont  = (FT_HAS_KERNING( maFaceFT ) != 0) || mpFontInfo->HasExtraKerning();
     rTo.mnOrientation = GetFontSelData().mnOrientation;
 
+    //Always consider [star]symbol as symbol fonts
+    if (
+         (rTo.GetFamilyName().EqualsAscii("OpenSymbol")) ||
+         (rTo.GetFamilyName().EqualsAscii("StarSymbol"))
+       )
+    {
+        rTo.mbSymbolFlag = true;
+    }
+
     if( maSizeFT )
         pFTActivateSize( maSizeFT );
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1495
retrieving revision 1.1496
diff -u -r1.1495 -r1.1496
--- openoffice.org.spec	4 May 2008 11:33:06 -0000	1.1495
+++ openoffice.org.spec	4 May 2008 17:18:27 -0000	1.1496
@@ -138,6 +138,7 @@
 Patch65: openoffice.org-3.0.0.ooo88341.sc.verticalboxes.patch
 Patch66: openoffice.org-3.0.0.ooo6087.sc.sheetnames.patch
 Patch67: workspace.ucpgio1.patch
+Patch68: openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1245,6 +1246,7 @@
 %patch65 -p1 -b .ooo88341.sc.verticalboxes.patch
 %patch66 -p1 -b .ooo6087.sc.sheetnames.patch
 %patch67 -p1 -b .workspace.ucpgio1.patch
+%patch68 -p1 -b .ooo89002.vcl.symbolfonts.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3308,6 +3310,7 @@
 - next version
 - drop integrated workspace.cmcfixes43.patch
 - drop integrated openoffice.org-3.0.0.ooo88375.filter.disablepdf.patch
+- add openoffice.org-3.0.0.ooo89002.vcl.symbolfonts.patch
 
 * Wed Apr 30 2008 Caolan McNamara <caolanm at redhat.com> - 1:3.0.0-0.10.1
 - next version