rpms/openoffice.org/devel openoffice.org.spec, 1.2097, 1.2098 workspace.vcl108.patch, 1.2, 1.3 openoffice.org-3.2.0.ooo107552.vcl.sft.patch, 1.1, NONE

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec workspace.vcl108.patch 
Removed Files:
	openoffice.org-3.2.0.ooo107552.vcl.sft.patch 
Log Message:
openoffice.org-3.2.0.ooo107552.vcl.sft.patch merged into workspace.vcl108.patch


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2097
retrieving revision 1.2098
diff -u -p -r1.2097 -r1.2098
--- openoffice.org.spec	9 Dec 2009 10:26:20 -0000	1.2097
+++ openoffice.org.spec	9 Dec 2009 12:40:34 -0000	1.2098
@@ -133,7 +133,6 @@ Patch55: openoffice.org-3.3.0.ooo102645.
 Patch56: workspace.vcl108.patch
 Patch57: workspace.pythonssldedux.patch
 Patch58: openoffice.org-3.2.0.ooo106502.svx.fixspelltimer.patch
-Patch59: openoffice.org-3.2.0.ooo107552.vcl.sft.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1661,7 +1660,6 @@ cat %{PATCH10} >> svtools/source/dialogs
 %patch56 -p0 -b .workspace.vcl108.patch
 %patch57 -p1 -b .workspace.pythonssldedux.patch
 %patch58 -p1 -b .ooo106502.svx.fixspelltimer.patch
-%patch59 -p0 -b .ooo107552.vcl.sft.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`

workspace.vcl108.patch:
 source/fontsubset/sft.cxx           |   20 +++++++
 source/gdi/pdfwriter_impl.hxx       |    3 +
 unx/source/dtrans/X11_selection.cxx |   92 ++++++++++++++++++++++++++++++++----
 unx/source/dtrans/X11_selection.hxx |   18 ++++++-
 util/makefile.mk                    |    1 
 5 files changed, 120 insertions(+), 14 deletions(-)

Index: workspace.vcl108.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.vcl108.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.vcl108.patch	1 Dec 2009 20:19:22 -0000	1.2
+++ workspace.vcl108.patch	9 Dec 2009 12:40:34 -0000	1.3
@@ -239,3 +239,53 @@ diff -ru vcl/source/gdi/pdfwriter_impl.h
              m_nTransparentPercent	= rState.m_nTransparentPercent;
              m_nFlags				= rState.m_nFlags;
              m_nUpdateFlags          = rState.m_nUpdateFlags;
+--- vcl/source/fontsubset/sft.cxx	2009-12-09 10:16:54.000000000 +0000
++++ vcl/source/fontsubset/sft.cxx	2009-12-09 10:17:54.000000000 +0000
+@@ -1094,6 +1094,14 @@
+ 	const sal_uInt8* table = getTable( t, O_name );
+     int nTableSize = getTableSize(t, O_name);
+ 
++    if (nTableSize < 4)
++    {
++#if OSL_DEBUG_LEVEL > 1
++        fprintf(stderr, "O_name table too small\n");
++#endif
++        return;
++    }
++
+     sal_uInt16 n = GetUInt16(table, 2, 1);
+     int i, r;
+     sal_Bool bPSNameOK = sal_True;
+@@ -1681,7 +1689,6 @@
+         goto cleanup;
+     }
+ 
+-
+     if (((*ttf)->ptr = (sal_uInt8 *) mmap(0, (*ttf)->fsize, PROT_READ, MAP_SHARED, fd, 0)) == MAP_FAILED) {
+         ret = SF_MEMORY;
+         goto cleanup;
+@@ -2702,7 +2709,7 @@
+     }
+ 
+     table = getTable(ttf, O_post);
+-    if (table) {
++    if (table && getTableSize(ttf, O_post) >= 12+sizeof(sal_uInt32)) {
+         info->pitch  = GetUInt32(table, 12, 1);
+         info->italicAngle = GetInt32(table, 4, 1);
+     }
+@@ -2808,6 +2815,15 @@
+ {
+     const sal_uInt8* table = getTable(ttf, O_name);
+     int nTableSize = getTableSize(ttf, O_name );
++
++    if (nTableSize < 6)
++    {
++#if OSL_DEBUG_LEVEL > 1
++        fprintf(stderr, "O_name table too small\n");
++#endif
++        return 0;
++    }
++
+     sal_uInt16 n = GetUInt16(table, 2, 1);
+     int nStrBase = GetUInt16(table, 4, 1);
+     int i;


--- openoffice.org-3.2.0.ooo107552.vcl.sft.patch DELETED ---