rpms/openoffice.org/devel openoffice.org.spec, 1.2252, 1.2253 workspace.vcl113.patch, 1.1, 1.2 openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv11226

Modified Files:
	openoffice.org.spec workspace.vcl113.patch 
Removed Files:
	openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch 
Log Message:
merge accepted patch into upstream workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2252
retrieving revision 1.2253
diff -u -p -r1.2252 -r1.2253
--- openoffice.org.spec	21 Jun 2010 09:59:38 -0000	1.2252
+++ openoffice.org.spec	21 Jun 2010 11:21:18 -0000	1.2253
@@ -153,7 +153,6 @@ Patch82: openoffice.org-3.3.0.ooo112384.
 Patch83: workspace.gtkfpicker9.patch
 Patch84: workspace.gtk3.patch
 Patch85: openoffice.org-3.3.0.ooo112516.sw.avoid.divbyzero.patch
-Patch86: 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}
@@ -1720,7 +1719,6 @@ cp -p %{SOURCE5} external/unowinreg/unow
 %patch83 -p0 -b .workspace.gtkfpicker9.patch
 %patch84 -p0 -b .workspace.gtk3.patch
 %patch85 -p0 -b .ooo112516.sw.avoid.divbyzero.patch
-%patch86 -p0 -b .ooo112567.vcl.embeddedbitmaps.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl113.patch:
 inc/vcl/salgdi.hxx              |    2 +-
 source/gdi/outdev3.cxx          |   20 ++++++++++++++++++++
 source/glyphs/gcach_ftyp.cxx    |    3 +++
 unx/headless/svpgdi.hxx         |    2 +-
 unx/headless/svppspgraphics.cxx |    2 +-
 unx/headless/svppspgraphics.hxx |    2 +-
 unx/headless/svptext.cxx        |    9 ++++++---
 unx/inc/pspgraphics.h           |    2 +-
 unx/inc/salgdi.h                |    2 +-
 unx/source/gdi/pspgraphics.cxx  |    2 +-
 unx/source/gdi/salgdi3.cxx      |   13 ++++++++-----
 11 files changed, 44 insertions(+), 15 deletions(-)

Index: workspace.vcl113.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl113.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- workspace.vcl113.patch	16 Jun 2010 15:12:31 -0000	1.1
+++ workspace.vcl113.patch	21 Jun 2010 11:21:18 -0000	1.2
@@ -170,3 +170,16 @@ diff -ru vcl.orig/unx/source/gdi/salgdi3
          if ( bFontVertical_ )
              pMetric->mnOrientation = 0;
      }
+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;
+ }
+ 
+ // -----------------------------------------------------------------------


--- openoffice.org-3.3.0.ooo112567.vcl.embeddedbitmaps.patch DELETED ---