rpms/openoffice.org/devel openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch, NONE, 1.1 openoffice.org.spec, 1.1751, 1.1752

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch 
Log Message:
Resolves: rhbz#479624 add openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch

openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch:

--- NEW FILE openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.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	13 Jan 2009 10:05:32 -0000
@@ -1241,6 +1269,22 @@
     return nGlyphIndex;
 }
 
+static int lcl_GetCharWidth(FT_FaceRec_* pFaceFT, double fStretch, int nGlyphFlags)
+{
+    int nCharWidth = pFaceFT->glyph->metrics.horiAdvance;
+
+    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
+        const FT_Size_Metrics& rMetrics = pFaceFT->size->metrics;
+#if (FTVERSION < 2000)
+        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * fStretch);
+#else
+        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * fStretch);
+#endif
+    }
+
+    return (nCharWidth + 32) >> 6;
+}
+
 // -----------------------------------------------------------------------
 
 void FreetypeServerFont::InitGlyphData( int nGlyphIndex, GlyphData& rGD ) const
@@ -1282,20 +1327,17 @@
         return;
     }
 
+    bool bOriginallyZeroWidth = false;
     if( mbArtBold && pFTEmbolden )
+    {
+        if (lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) == 0)
+            bOriginallyZeroWidth = true;
         (*pFTEmbolden)( maFaceFT->glyph );
+    }
 
-    int nCharWidth = maFaceFT->glyph->metrics.horiAdvance;
+    int nCharWidth = !bOriginallyZeroWidth ? lcl_GetCharWidth(maFaceFT, mfStretch, nGlyphFlags) : 0;
 
-    if( nGlyphFlags & GF_ROTMASK ) {  // for bVertical rotated glyphs
-        const FT_Size_Metrics& rMetrics = maFaceFT->size->metrics;
-#if (FTVERSION < 2000)
-        nCharWidth = (int)((rMetrics.height - rMetrics.descender) * mfStretch);
-#else
-        nCharWidth = (int)((rMetrics.height + rMetrics.descender) * mfStretch);
-#endif
-    }
-    rGD.SetCharWidth( (nCharWidth + 32) >> 6 );
+    rGD.SetCharWidth( nCharWidth );
 
     FT_Glyph pGlyphFT;
     rc = FT_Get_Glyph( maFaceFT->glyph, &pGlyphFT );


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1751
retrieving revision 1.1752
diff -u -r1.1751 -r1.1752
--- openoffice.org.spec	12 Jan 2009 12:31:23 -0000	1.1751
+++ openoffice.org.spec	13 Jan 2009 10:18:12 -0000	1.1752
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 15
-%define rh_rpm_release 1
+%define rh_rpm_release 2
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -134,6 +134,7 @@
 Patch61: openoffice.org-3.0.1.oooXXXXX.extensions.npapi.patch
 Patch62: openoffice.org-3.0.1.ooo97975.bridges.mainalreadyexited.patch
 Patch63: openoffice.org-3.0.1.ooo97488.sw.ww8toc.patch
+Patch64: openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1415,6 +1416,7 @@
 %patch61 -p1 -b .oooXXXXX.extensions.npapi.patch
 %patch62 -p1 -b .ooo97975.bridges.mainalreadyexited.patch
 %patch63 -p1 -b .ooo97488.sw.ww8toc.patch
+%patch64 -p1 -b .ooo98024.vcl.emboldenoverlap.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3824,6 +3826,10 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Jan 13 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.2
+- Resolves: rhbz#479624 add
+  openoffice.org-3.0.1.ooo98024.vcl.emboldenoverlap.patch
+
 * Mon Jan 12 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.0.1-15.1
 - next milestone
 - rename openoffice.org-3.0.0.ooo90072.sw.undo-longtext.patch to