rpms/openoffice.org/devel openoffice.org.spec, 1.1417, 1.1418 workspace.cairotext01.patch, 1.3, 1.4

[Caolan McNamara (caolanm)]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.cairotext01.patch 
Log Message:
Resolves: rhbz#431620/ooo#85909 depth mismatch for text


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1417
retrieving revision 1.1418
diff -u -r1.1417 -r1.1418
--- openoffice.org.spec	6 Feb 2008 09:00:25 -0000	1.1417
+++ openoffice.org.spec	6 Feb 2008 12:42:42 -0000	1.1418
@@ -2861,6 +2861,7 @@
 - resync workspace.notes2.patch
 - Resolves: ooo#84209 make letter wizard work with gstreamer changes
 - Resolves: rhbz#431606 require jre not java
+- Resolves: rhbz#431620/ooo#85909 depth mismatch for text
 
 * Mon Feb 04 2008 Caolan McNamara <caolanm at redhat.com> - 1:2.4.0-6.1
 - next milestone

workspace.cairotext01.patch:

Index: workspace.cairotext01.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.cairotext01.patch,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- workspace.cairotext01.patch	5 Feb 2008 16:25:54 -0000	1.3
+++ workspace.cairotext01.patch	6 Feb 2008 12:42:42 -0000	1.4
@@ -280,7 +280,7 @@
 +
 +bool CairoWrapper::isCairoRenderable(const ServerFont& rFont)
 +{
-+    return rFont.GetFtFace() && isValid() && 
++    return rFont.GetFtFace() && isValid() && rFont.GetAntialiasAdvice() &&
 +        (rFont.NeedsArtificialBold() ? canEmbolden() : true);
 +}
 +