rpms/openoffice.org/devel openoffice.org-1.9.128.ooo50792.mutexhang.embeddobj.patch, NONE, 1.1 openoffice.org.spec, 1.452, 1.453

[fedora-cvs-commits at redhat.com]

Author: caolanm

Update of /cvs/dist/rpms/openoffice.org/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv32366

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-1.9.128.ooo50792.mutexhang.embeddobj.patch 
Log Message:
try and fix rh#166950#

openoffice.org-1.9.128.ooo50792.mutexhang.embeddobj.patch:
 embeddedobj/source/commonembedding/embedobj.cxx |    4 ++--
 source/commonembedding/embedobj.cxx             |    0 
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE openoffice.org-1.9.128.ooo50792.mutexhang.embeddobj.patch ---
Index: source/commonembedding/embedobj.cxx
===================================================================
RCS file: /cvs/framework/embeddedobj/source/commonembedding/embedobj.cxx,v
retrieving revision 1.13
diff -u -p -r1.13 embedobj.cxx
--- openoffice.org.orig/embeddedobj/source/commonembedding/embedobj.cxx	4 Apr 2005 08:07:56 -0000	1.13
+++ openoffice.org/embeddedobj/source/commonembedding/embedobj.cxx	7 Sep 2005 13:55:39 -0000
@@ -559,7 +559,7 @@ sal_Int32 SAL_CALL OCommonEmbeddedObject
 		throw ( embed::WrongStateException,
 				uno::RuntimeException )
 {
-	::osl::MutexGuard aGuard( m_aMutex );
+//	::osl::MutexGuard aGuard( m_aMutex );
 	if ( m_bDisposed )
 		throw lang::DisposedException(); // TODO
 
@@ -702,7 +702,7 @@ sal_Int64 SAL_CALL OCommonEmbeddedObject
 		throw ( embed::WrongStateException,
 				uno::RuntimeException )
 {
-	::osl::MutexGuard aGuard( m_aMutex );
+//	::osl::MutexGuard aGuard( m_aMutex );
 	if ( m_bDisposed )
 		throw lang::DisposedException(); // TODO
 


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/dist/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.452
retrieving revision 1.453
diff -u -r1.452 -r1.453
--- openoffice.org.spec	7 Sep 2005 12:26:58 -0000	1.452
+++ openoffice.org.spec	7 Sep 2005 14:00:58 -0000	1.453
@@ -175,6 +175,7 @@
 Patch55: workspace.dmake43p01.patch
 Patch56: workspace.cmcfixes17.patch
 Patch57: openoffice.org-1.9.127.ooo54236.parallel.sysui.patch
+Patch58: openoffice.org-1.9.128.ooo50792.mutexhang.embeddobj.patch
 
 %define instdir %{_libdir}/openoffice.org2.0
 
@@ -840,6 +841,7 @@
 %patch55 -p1 -b .dmake43p01.patch
 %patch56 -p1 -b .workspace.cmcfixes17.patch
 %patch57 -p1 -b .ooo54236.parallel.sysui.patch
+%patch58 -p1 -b .ooo50792.mutexhang.embeddobj.patch
 
 %if %{includeexternals}
 #start ludicrous workaround
@@ -3188,6 +3190,7 @@
 - drop integrated openoffice.org-1.9.114.oooXXXXX.nostlport.patch
 - more translated help documentation
 - new langpack
+- add mutexhang patch for rh#166950#
 
 * Wed Aug 31 2005 Caolan McNamara <caolanm at redhat.com> - 1:1.9.127-1
 - bump to next version