/[pkgs]/devel/openoffice.org/openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch
ViewVC logotype

Contents of /devel/openoffice.org/openoffice.org-3.1.0.ooo90439.sfx2.qstart.hackaround.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Tue Apr 21 14:39:55 2009 UTC (7 months ago) by caolanm
Branch: MAIN
CVS Tags: openoffice_org-3_1_1-18_1_fc12, F-12-split, openoffice_org-3_1_1-16_1_fc12, openoffice_org-3_1_1-19_7_fc12, openoffice_org-3_1_1-19_9_fc12, openoffice_org-3_2_0-2_2_fc13, openoffice_org-3_1_1-19_6_fc12, openoffice_org-3_1_1-19_4_fc12, openoffice_org-3_1_1-19_5_fc12, openoffice_org-3_1_1-18_2_fc12, openoffice_org-3_1_1-14_1_fc12, openoffice_org-3_2_0-2_1_fc13, openoffice_org-3_2_0-4_2_fc13, openoffice_org-3_2_0-2_4_fc13, openoffice_org-3_1_1-12_1_fc12, openoffice_org-3_2_0-1_2_fc13, openoffice_org-3_2_0-4_1_fc13, openoffice_org-3_1_1-12_2_fc12, openoffice_org-3_1_1-13_1_fc12, openoffice_org-3_1_1-15_2_fc12, openoffice_org-3_1_1-19_1_fc12, openoffice_org-3_1_1-15_1_fc12, openoffice_org-3_1_0-11_3_fc12, openoffice_org-3_1_1-19_1_fc12_1, openoffice_org-3_1_1-17_1_fc12, openoffice_org-3_1_1-19_8_fc12, openoffice_org-3_2_0-2_3_fc13, openoffice_org-3_2_0-5_1_fc13, openoffice_org-3_2_0-3_1_fc13, openoffice_org-3_1_1-13_2_fc12, openoffice_org-3_2_0-3_2_fc13, openoffice_org-3_1_1-19_2_fc12, openoffice_org-3_2_0-5_2_fc13, openoffice_org-3_2_0-1_1_fc13, openoffice_org-3_1_1-16_2_fc12, openoffice_org-3_1_1-13_3_fc12, openoffice_org-3_2_0-2_5_fc13, openoffice_org-3_2_0-3_4_fc13, HEAD
File MIME type: text/x-patch 
ooo#101245 qstarter bustage
1 diff -ru sfx2/source/appl/shutdownicon.cxx sfx2/source/appl/shutdownicon.cxx
2 --- sfx2.orig/source/appl/shutdownicon.cxx 2009-04-21 12:57:08.000000000 +0100
3 +++ sfx2/source/appl/shutdownicon.cxx 2009-04-21 15:26:25.000000000 +0100
4 @@ -192,7 +192,9 @@
5 return;
6 m_bInitialized = true;
7
8 - (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
9 + if (!m_pPlugin)
10 + (void) LoadModule( &m_pPlugin, &m_pInitSystray, &m_pDeInitSystray );
11 +
12 m_bVeto = true;
13 m_pInitSystray();
14 }
15 @@ -201,15 +203,11 @@
16 {
17 if (!m_bInitialized)
18 return;
19 +
20 if (m_pDeInitSystray)
21 m_pDeInitSystray();
22
23 m_bVeto = false;
24 - m_pInitSystray = 0;
25 - m_pDeInitSystray = 0;
26 - if (m_pPlugin)
27 - delete m_pPlugin;
28 - m_pPlugin = 0;
29 delete m_pFileDlg;
30 m_pFileDlg = NULL;
31 m_bInitialized = false;
32 @@ -233,6 +231,11 @@
33 ShutdownIcon::~ShutdownIcon()
34 {
35 deInitSystray();
36 + //Bustage on dlclosing when: no qstarter, start writer, enable, close writer, choose disable/quit
37 + //dlclose gets called and pulls .so from under hack-tower
38 +#ifndef UNX
39 + delete m_pPlugin;
40 +#endif
41 }
42
43 // ---------------------------------------------------------------------------
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2