rpms/openoffice.org/F-10 openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch, 1.1, 1.2

[Caolan McNamara]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv23140

Modified Files:
	openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch 
Log Message:
merge in bits of alternative patch

openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch:

Index: openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/F-10/openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch	14 Nov 2008 09:18:22 -0000	1.1
+++ openoffice.org-3.0.0.ooo96203.sfx2.3layer-qstart.patch	14 Nov 2008 10:23:17 -0000	1.2
@@ -18,6 +18,24 @@
  #endif
  
  #include "sfxresid.hxx"
+@@ -83,6 +84,8 @@ using namespace ::vos;
+ using namespace ::rtl;
+ using namespace ::sfx2;
+ 
++extern "C" { static void SAL_CALL thisModule() {} }
++
+ class SfxNotificationListener_Impl : public cppu::WeakImplHelper1< XDispatchResultListener >
+ {
+ public:
+@@ -142,7 +145,7 @@ bool ShutdownIcon::LoadModule( osl::Modu
+ 
+ 	oslGenericFunction pTmpInit = NULL;
+ 	oslGenericFunction pTmpDeInit = NULL;
+-	if ( pPlugin->load( OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
++	if ( pPlugin->loadRelative( &thisModule, OUString (RTL_CONSTASCII_USTRINGPARAM( STRING( PLUGIN_NAME ) ) ) ) )
+ 	{
+ 		pTmpInit = pPlugin->getFunctionSymbol(
+ 			OUString( RTL_CONSTASCII_USTRINGPARAM( "plugin_init_sys_tray" ) ) );
 @@ -826,8 +827,8 @@
  #else // UNX
  		getDotAutostart( true );