rpms/openoffice.org/devel openoffice.org.spec, 1.2014, 1.2015 workspace.impress169.patch, 1.2, 1.3 openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.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-serv9879

Modified Files:
	openoffice.org.spec workspace.impress169.patch 
Removed Files:
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch 
Log Message:
track openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch workspace


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.2014
retrieving revision 1.2015
diff -u -p -r1.2014 -r1.2015
--- openoffice.org.spec	30 Sep 2009 14:02:40 -0000	1.2014
+++ openoffice.org.spec	2 Oct 2009 10:16:17 -0000	1.2015
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 19
-%define rh_rpm_release 10
+%define rh_rpm_release 11
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -156,12 +156,11 @@ Patch79: openoffice.org-3.1.0.ooo104280.
 Patch80: openoffice.org-3.1.1.ooo104329.dbaccess.primarykeys.patch
 Patch81: workspace.os131.patch
 Patch82: workspace.vcl102.patch
-Patch83: openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
-Patch84: workspace.dr69.patch
-Patch85: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
-Patch86: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
-Patch87: workspace.aw073.patch
-Patch88: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
+Patch83: workspace.dr69.patch
+Patch84: openoffice.org-3.1.1.ooo64671.canvas.add-support-for-font-pitch.patch
+Patch85: openoffice.org-3.1.1.oooXXXXXX.sal.justcoredump.patch
+Patch86: workspace.aw073.patch
+Patch87: openoffice.org-3.1.1.ooo92671.vcl.coverageformat2.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1704,12 +1703,11 @@ cat %{PATCH11} >> svtools/source/dialogs
 %patch80 -p0 -b .ooo104329.dbaccess.primarykeys.patch
 %patch81 -p0 -b .workspace.os131.patch
 %patch82 -p0 -b .workspace.vcl102.patch
-%patch83 -p0 -b .ooo104157.svx.crashonencryptparse.patch
-%patch84 -p0 -b .workspace.dr69.patch
-%patch85 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
-%patch86 -p1 -b .oooXXXXXX.sal.justcoredump.patch
-%patch87 -p0 -b .workspace.aw073.patch
-%patch88 -p0 -b .ooo92671.vcl.coverageformat2.patch
+%patch83 -p0 -b .workspace.dr69.patch
+%patch84 -p0 -b .ooo64671.canvas.add-support-for-font-pitch.patch
+%patch85 -p1 -b .oooXXXXXX.sal.justcoredump.patch
+%patch86 -p0 -b .workspace.aw073.patch
+%patch87 -p0 -b .ooo92671.vcl.coverageformat2.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4243,6 +4241,10 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Fri Oct 02 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.11
+- merge openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
+  into accepted workspace
+
 * Wed Sep 30 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.10
 - Resolves: rhbz#461617 gsub coverage format 2 with greater than 1 ranges (caolanm)
 

workspace.impress169.patch:
 filter.vcl/wmf/enhwmf.cxx |   22 +++++++++++-----------
 svdraw/svdfppt.cxx        |    4 +++-
 ui/view/drtxtob1.cxx      |    4 ++++
 3 files changed, 18 insertions(+), 12 deletions(-)

Index: workspace.impress169.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/workspace.impress169.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -p -r1.2 -r1.3
--- workspace.impress169.patch	20 Apr 2009 21:38:12 -0000	1.2
+++ workspace.impress169.patch	2 Oct 2009 10:16:17 -0000	1.3
@@ -114,3 +114,18 @@ diff -u -r1.39.114.1 enhwmf.cxx
  						}
  						delete[] pnPoints;
  					}
+--- svx.orig/source/svdraw/svdfppt.cxx	2009-08-27 17:13:39.000000000 +0100
++++ svx/source/svdraw/svdfppt.cxx	2009-08-27 17:13:43.000000000 +0100
+@@ -1429,9 +1429,11 @@
+     ePageColorsKind		( PPT_MASTERPAGE ),
+     eAktPageKind		( PPT_MASTERPAGE )
+ {
+-	DffRecordHeader* pHd;
++    if (rParam.aCurrentUserAtom.nMagic == 0xF3D1C4Df) //encrypted                                               │
++        bOk = false;          
+     if ( bOk )
+ 	{
++	    DffRecordHeader* pHd;
+         rStCtrl.Seek( STREAM_SEEK_TO_END );
+         nStreamLen = rStCtrl.Tell();
+ 


--- openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch DELETED ---