1 Index: vcl/inc/svapp.hxx
2 ===================================================================
3 RCS file: /cvs/gsl/vcl/inc/svapp.hxx,v
4 retrieving revision 1.27
5 diff -u -p -u -r1.27 svapp.hxx
6 --- vcl/inc/svapp.hxx 10 Jun 2003 14:29:14 -0000 1.27
7 +++ vcl/inc/svapp.hxx 2 Sep 2003 14:25:16 -0000
8 @@ -347,7 +347,7 @@ public:
9 virtual void FocusChanged();
10 virtual void DataChanged( const DataChangedEvent& rDCEvt );
12 - virtual void Init();
13 + virtual BOOL Init();
14 virtual void DeInit();
16 static void InitAppRes( const ResId& rResId );
17 Index: vcl/source/app/svapp.cxx
18 ===================================================================
19 RCS file: /cvs/gsl/vcl/source/app/svapp.cxx,v
20 retrieving revision 1.44
21 diff -u -p -u -r1.44 svapp.cxx
22 --- vcl/source/app/svapp.cxx 15 Apr 2003 16:05:08 -0000 1.44
23 +++ vcl/source/app/svapp.cxx 2 Sep 2003 14:25:17 -0000
24 @@ -423,8 +423,9 @@ void Application::DataChanged( const Dat
27 // -----------------------------------------------------------------------
28 -void Application::Init()
29 +BOOL Application::Init()
34 // -----------------------------------------------------------------------
35 Index: vcl/source/app/svmain.cxx
36 ===================================================================
37 RCS file: /cvs/gsl/vcl/source/app/svmain.cxx,v
38 retrieving revision 1.41
39 diff -u -p -u -r1.41 svmain.cxx
40 --- vcl/source/app/svmain.cxx 11 Apr 2003 17:28:07 -0000 1.41
41 +++ vcl/source/app/svmain.cxx 2 Sep 2003 14:26:58 -0000
42 @@ -365,7 +365,8 @@ BOOL InitVCL( const ::com::sun::star::un
44 // call init to initialize application class
45 // soffice/sfx implementation creates the global service manager
46 - pSVData->mpApp->Init();
47 + if(! pSVData->mpApp->Init() )
50 #ifdef REMOTE_APPSERVER
52 Index: desktop/inc/app.hxx
53 ===================================================================
54 RCS file: /cvs/framework/desktop/inc/app.hxx,v
55 retrieving revision 1.19
56 diff -u -p -u -r1.19 app.hxx
57 --- desktop/inc/app.hxx 10 Jun 2003 14:37:19 -0000 1.19
58 +++ desktop/inc/app.hxx 2 Sep 2003 14:28:34 -0000
59 @@ -128,7 +128,7 @@ class Desktop : public Application
63 - virtual void Init();
64 + virtual BOOL Init();
65 virtual void DeInit();
66 virtual BOOL QueryExit();
67 virtual USHORT Exception(USHORT nError);
68 Index: desktop/source/app/app.cxx
69 ===================================================================
70 RCS file: /cvs/framework/desktop/source/app/app.cxx,v
71 retrieving revision 1.119
72 diff -u -p -u -r1.119 app.cxx
73 --- desktop/source/app/app.cxx 16 Jul 2003 17:41:22 -0000 1.119
74 +++ desktop/source/app/app.cxx 2 Sep 2003 14:28:36 -0000
75 @@ -555,7 +555,7 @@ Desktop::~Desktop()
82 RTL_LOGFILE_CONTEXT( aLog, "desktop (cd100003) ::Desktop::Init" );
84 @@ -575,7 +575,7 @@ void Desktop::Init()
85 // check whether we need to print cmdline help
86 if ( pCmdLineArgs->IsHelp() ) {
92 // start ipc thread only for non-remote offices
93 @@ -589,7 +589,7 @@ void Desktop::Init()
94 else if ( aStatus == OfficeIPCThread::IPC_STATUS_2ND_OFFICE )
96 // 2nd office startup should terminate after sending cmdlineargs through pipe
100 else if ( pCmdLineArgs->IsHelp() )
102 @@ -599,6 +599,7 @@ void Desktop::Init()
104 pSignalHandler = new SalMainPipeExchangeSignalHandler;
109 void Desktop::DeInit()
110 Index: vcl/unx/source/app/saldisp.cxx
111 ===================================================================
112 RCS file: /cvs/gsl/vcl/unx/source/app/saldisp.cxx,v
113 retrieving revision 1.43.26.2
114 diff -u -p -u -r1.43.26.2 saldisp.cxx
115 --- vcl/unx/source/app/saldisp.cxx 29 Jul 2003 12:45:39 -0000 1.43.26.2
116 +++ vcl/unx/source/app/saldisp.cxx 2 Sep 2003 14:30:04 -0000
117 @@ -792,6 +792,15 @@ SalDisplay::~SalDisplay( )
118 SalBitmap::ImplDestroyCache();
122 + if( m_pSnLauncheeContext )
124 + sn_launchee_context_complete( m_pSnLauncheeContext );
125 + sn_launchee_context_unref( m_pSnLauncheeContext );
127 + sn_display_unref( m_pSnDisplay );
128 +#endif /* HAVE_LIBSN */
132 osl_destroyMutex( hEventGuard_ );
133 @@ -837,12 +846,6 @@ SalDisplay::~SalDisplay( )
134 XCloseDisplay( pDisp_ );
138 - if( m_pSnLauncheeContext )
139 - sn_launchee_context_unref( m_pSnLauncheeContext );
140 - sn_display_unref( m_pSnDisplay );
141 -#endif /* HAVE_LIBSN */
143 pDisp_ = (Display*)ILLEGAL_POINTER;
145 pSalData->Remove( this );
146 Index: vcl/unx/source/app/salinst.cxx
147 ===================================================================
148 RCS file: /cvs/gsl/vcl/unx/source/app/salinst.cxx,v
149 retrieving revision 1.16
150 diff -u -p -u -r1.16 salinst.cxx
151 --- vcl/unx/source/app/salinst.cxx 22 Jul 2003 10:12:20 -0000 1.16
152 +++ vcl/unx/source/app/salinst.cxx 2 Sep 2003 14:55:27 -0000
153 @@ -180,6 +180,15 @@ void InitSalMain()
158 +// Probably not needed - but must test this ...
159 + // Hack: seemingly shutdown doesn't clean these up
161 + if( ( pData = GetSalData() ) ) {
163 + SetSalData( NULL );
168 void SetFilterCallback( void* pCallback, void* pInst )