rpms/openoffice.org/devel openoffice.org-3.0.0.ooo95793.goodies.met.patch, NONE, 1.1 openoffice.org.spec, 1.1683, 1.1684

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.0.0.ooo95793.goodies.met.patch 
Log Message:
Resolves: rhbz#469615 openoffice.org-3.0.0.ooo95793.goodies.met.patch

openoffice.org-3.0.0.ooo95793.goodies.met.patch:

--- NEW FILE openoffice.org-3.0.0.ooo95793.goodies.met.patch ---
Index: source/filter.vcl/eos2met/eos2met.cxx
===================================================================
RCS file: /cvs/graphics/goodies/source/filter.vcl/eos2met/eos2met.cxx,v
retrieving revision 1.21
diff -u -r1.21 eos2met.cxx
--- openoffice.org.orig/goodies/source/filter.vcl/eos2met/eos2met.cxx	1 Jul 2008 23:02:39 -0000	1.21
+++ openoffice.org/goodies/source/filter.vcl/eos2met/eos2met.cxx	3 Nov 2008 10:19:45 -0000
@@ -2601,23 +2601,18 @@
 
 extern "C" BOOL SAL_CALL DoExportDialog( FltCallDialogParameter& rPara )
 {
-	BOOL 	bRet = FALSE;
+	BOOL bRet = TRUE;
 
 	if ( rPara.pWindow )
 	{
 		ByteString aResMgrName( "eme" );
-		ResMgr*	pResMgr;
-
-		pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
-
+		ResMgr*	pResMgr = ResMgr::CreateResMgr( aResMgrName.GetBuffer(), Application::GetSettings().GetUILocale() );
 		if( pResMgr )
 		{
 			rPara.pResMgr = pResMgr;
 			bRet = ( DlgExportEMET( rPara ).Execute() == RET_OK );
 			delete pResMgr;
 		}
-		else
-			bRet = TRUE;
 	}
 
 	return bRet;


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1683
retrieving revision 1.1684
diff -u -r1.1683 -r1.1684
--- openoffice.org.spec	2 Nov 2008 16:57:05 -0000	1.1683
+++ openoffice.org.spec	3 Nov 2008 10:30:27 -0000	1.1684
@@ -1,6 +1,6 @@
 %define oootag OOO300
 %define ooomilestone 9
-%define rh_rpm_release 7
+%define rh_rpm_release 8
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -125,6 +125,7 @@
 Patch52: openoffice.org-3.0.0.ooo95392.sysui.csv.patch
 Patch53: openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 Patch54: openoffice.org-3.0.0.ooo95341.cppcanvas.patch
+Patch55: openoffice.org-3.0.0.ooo95793.goodies.met.patch
 
 %define instdir %{_libdir}
 %define baseinstdir %{instdir}/openoffice.org
@@ -1374,6 +1375,7 @@
 %patch52 -p1 -b .ooo95392.sysui.csv.patch
 %patch53 -p1 -b .ooo95533.sw.safertableexport.patch
 %patch54 -p1 -b .ooo95341.cppcanvas.patch
+%patch55 -p1 -b .ooo95793.goodies.met.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -3739,6 +3741,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Mon Nov 03 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.8
+- Resolves: rhbz#469615 openoffice.org-3.0.0.ooo95793.goodies.met.patch
+
 * Wed Oct 29 2008 Caolán McNamara <caolanm at redhat.com> - 1:3.0.0-9.7
 - Resolves: rhbz#468336 openoffice.org-3.0.0.ooo95533.sw.safertableexport.patch
 - workspace.impress163.patch