rpms/openoffice.org/devel openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch, NONE, 1.1 openoffice.org.spec, 1.1996, 1.1997

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch 
Log Message:
add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch

openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch:
 svdfppt.cxx |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

--- NEW FILE openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch ---
--- 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();
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1996
retrieving revision 1.1997
diff -u -p -r1.1996 -r1.1997
--- openoffice.org.spec	27 Aug 2009 07:08:54 -0000	1.1996
+++ openoffice.org.spec	27 Aug 2009 16:17:21 -0000	1.1997
@@ -157,6 +157,7 @@ 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
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1699,6 +1700,7 @@ 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
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4208,8 +4210,9 @@ fi
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
-* Thu Aug 27 2009 Tomas Mraz <tmraz at redhat.com> - 1:3.1.1-19.4
+* Thu Aug 27 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.4
 - rebuilt with new openssl
+- add openoffice.org-3.1.1.ooo104157.svx.crashonencryptparse.patch
 
 * Wed Aug 26 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.1-19.3
 - backport workspace.vcl102.patch to fix xdg support