rpms/openoffice.org/F-13 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch, NONE, 1.1 openoffice.org.spec, 1.2201, 1.2202

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv4209/F-13

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch 
Log Message:
Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch

openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch:
 gcach_ftyp.cxx |    3 +++
 1 file changed, 3 insertions(+)

--- NEW FILE openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch ---
diff -ru vcl.orig/source/glyphs/gcach_ftyp.cxx vcl/source/glyphs/gcach_ftyp.cxx
--- vcl.orig/source/glyphs/gcach_ftyp.cxx	2010-06-21 09:44:48.000000000 +0100
+++ vcl/source/glyphs/gcach_ftyp.cxx	2010-06-21 10:45:25.000000000 +0100
@@ -892,6 +909,9 @@
        }
     }
 #endif
+
+    if( mnPrioEmbedded <= 0 )
+        mnLoadFlags |= FT_LOAD_NO_BITMAP;
 }
 
 // -----------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-13/openoffice.org.spec,v
retrieving revision 1.2201
retrieving revision 1.2202
diff -u -p -r1.2201 -r1.2202
--- openoffice.org.spec	18 Jun 2010 15:08:58 -0000	1.2201
+++ openoffice.org.spec	21 Jun 2010 09:59:36 -0000	1.2202
@@ -1,6 +1,6 @@
 %define oootag OOO320
 %define ooomilestone 12
-%define rh_rpm_release 25
+%define rh_rpm_release 26
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -163,6 +163,7 @@ Patch92: openoffice.org-3.3.0.ooo112384.
 Patch93: workspace.gtkfpicker9.patch
 Patch94: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
 Patch95: openoffice.org-3.3.0.ooo107490.cppu.lifecycle.patch
+Patch96: openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
 
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib(1))")}
 %define instdir %{_libdir}
@@ -1756,6 +1757,7 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch93 -p0 -b .workspace.gtkfpicker9.patch
 %patch94 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
 %patch95 -p1 -b .ooo107490.cppu.lifecycle.patch
+%patch96 -p0 -b .ooo112567.vcl.embeddedbitmaps.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4241,6 +4243,9 @@ fi
 %endif
 
 %changelog
+* Mon Jun 21 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.26
+- Resolves: rhbz#606021 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch
+
 * Fri Jun 18 2010 Caolán McNamara <caolanm at redhat.com> - 1:3.2.0-12.25
 - Resolves: rhbz#602631 dual head fixes add workspace.ooo321gsl05.patch
 - Resolves: rhbz#603298 crash in ImplFontCharMap::GetGlyphIndex