rpms/openoffice.org/devel openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch, NONE, 1.1 openoffice.org.spec, 1.1887, 1.1888

[Caolan McNamara]

Author: caolanm

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

Modified Files:
	openoffice.org.spec 
Added Files:
	openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch 
Log Message:
ooo#101245 qstarter bustage

openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch:

--- NEW FILE openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch ---
diff -ru sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
--- sfx2.orig/source/appl/shutdownicon.cxx	2009-04-21 12:57:08.000000000 +0100
+++ sfx2/source/appl/shutdownicon.cxx	2009-04-21 15:26:25.000000000 +0100
@@ -192,7 +192,9 @@
 		return;
 	m_bInitialized = true;
 
-	(void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+    if (!m_pPlugin)
+	    (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
+
 	m_bVeto = true;
 	m_pInitSystray();
 }
@@ -201,15 +203,11 @@
 {
 	if (!m_bInitialized)
 		return;
+
     if (m_pDeInitSystray)
 		m_pDeInitSystray();
 
 	m_bVeto = false;
-	m_pInitSystray = 0;
-	m_pDeInitSystray = 0;
-	if (m_pPlugin)
-		delete m_pPlugin;
-	m_pPlugin = 0;
     delete m_pFileDlg;
 	m_pFileDlg = NULL;
 	m_bInitialized = false;
@@ -233,6 +231,11 @@
 ShutdownIcon::~ShutdownIcon()
 {
 	deInitSystray();
+    //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
+    //dlclose gets called and pulls .so from under hack-tower
+#ifndef UNX
+	delete m_pPlugin;
+#endif
 }
 
 // ---------------------------------------------------------------------------


Index: openoffice.org.spec
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org.spec,v
retrieving revision 1.1887
retrieving revision 1.1888
diff -u -r1.1887 -r1.1888
--- openoffice.org.spec	20 Apr 2009 21:38:12 -0000	1.1887
+++ openoffice.org.spec	21 Apr 2009 14:39:55 -0000	1.1888
@@ -1,6 +1,6 @@
 %define oootag OOO310
 %define ooomilestone 10
-%define rh_rpm_release 2
+%define rh_rpm_release 3
 
 # rhbz#465664 jar-repacking breaks help by reordering META-INF/MANIFEST.MF
 %define __jar_repack %{nil}
@@ -137,6 +137,7 @@
 Patch62: openoffice.org-3.1.0.ooo101152.solenv.kn.patch
 Patch63: openoffice.org-3.1.0.ooo101184.vcl.dynamic.monitors.patch
 Patch64: workspace.slideshow1.patch
+Patch65: openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
 
 %define python_py_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(0)")
 %define instdir %{_libdir}
@@ -1632,6 +1633,7 @@
 %patch62 -p1 -b .ooo101152.solenv.kn.patch
 %patch63 -p0 -b .ooo101184.vcl.dynamic.monitors.patch
 %patch64 -p2 -b .workspace.slideshow1.patch
+%patch65 -p0 -b .ooo90439.sfx2.qstart.hackaround.patch
 
 %build
 echo build start time is `date`, diskspace: `df -h . | tail -n 1`
@@ -4125,6 +4127,9 @@
     unopkg list --shared > /dev/null 2>&1 || :
 
 %changelog
+* Tue Apr 21 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-10.3
+- add openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
+
 * Sun Apr 19 2009 Caolán McNamara <caolanm at redhat.com> - 1:3.1.0-10.2
 - Resolves: rhbz#496280 ooo#101184 dynamically detect multiple monitors
 - Resolves: rhbz#496276 ooo#98806 disable audio in presenter screen