rpms/openoffice.org/devel openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch, 1.1, 1.2

[Caolan McNamara (caolanm)]

Author: caolanm

Update of /cvs/pkgs/rpms/openoffice.org/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv4082

Modified Files:
	openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch 
Log Message:
tidy to apply

openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch:

Index: openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch
===================================================================
RCS file: /cvs/pkgs/rpms/openoffice.org/devel/openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch	20 Jun 2008 09:28:48 -0000	1.1
+++ openoffice.org-3.0.0.oooXXXXX.connectivity.mozprofilefinder.patch	20 Jun 2008 13:02:46 -0000	1.2
@@ -5,20 +5,20 @@
 diff -u -r1.5 MMozillaBootstrap.cxx
 --- openoffice.org.orig/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	17 Sep 2006 02:58:42 -0000	1.5
 +++ openoffice.org/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx	20 Jun 2008 09:12:58 -0000
-@@ -48,10 +48,12 @@
+@@ -38,8 +38,10 @@
+ using namespace connectivity::mozab;
  #include <MNSFolders.hxx>
- #endif
  #include "MNSProfileDiscover.hxx"
+-#include "MNSProfileManager.hxx"
+-#include "MNSRunnable.hxx"
 +#ifndef MINIMAL_PROFILEDISCOVER
- #include "MNSProfileManager.hxx"
- #ifndef _CONNECTIVITY_MAB_MOZAB_RUNNABLE_HXX_
- #include "MNSRunnable.hxx"
- #endif
++#  include "MNSProfileManager.hxx"
++#  include "MNSRunnable.hxx"
 +#endif
  #include <MNSInit.hxx>
  
  static MozillaBootstrap *pMozillaBootstrap=NULL;
-@@ -84,10 +86,13 @@
+@@ -72,10 +74,13 @@
  void MozillaBootstrap::Init()
  {
  	sal_Bool aProfileExists=sal_False;
@@ -32,7 +32,7 @@
  	m_ProfileAccess = new ProfileAccess();
  	bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,rtl::OUString());
  }
-@@ -169,32 +174,57 @@
+@@ -157,32 +162,57 @@
  // XProfileManager
  ::sal_Int32 SAL_CALL MozillaBootstrap::bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException)
  {
@@ -90,15 +90,16 @@
  	::rtl::OUString profileName = aCode->getProfileName();
  	::rtl::OUString currProfileName = getCurrentProfile();
  	::com::sun::star::mozilla::MozillaProductType currProduct = getCurrentProduct();
-@@ -206,5 +236,105 @@
+@@ -194,5 +224,105 @@
     	MNSRunnable xRunnable;
  	
  	return xRunnable.StartProxy(aCode);;
+-}
 +#else
 +	return -1;
 +#endif
- }
- 
++}
++
 +#ifdef MINIMAL_PROFILEDISCOVER
 +#include <cppuhelper/factory.hxx>
 +using ::com::sun::star::uno::Reference;
@@ -194,7 +195,7 @@
 +
 +        return pRet;
 +};
-+
+ 
 +#endif
 Index: source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx
 ===================================================================
@@ -527,18 +528,7 @@
 diff -ru scp2/source/ooo/file_library_ooo.scp scp2/source/ooo/file_library_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/file_library_ooo.scp	2008-06-19 15:29:16.000000000 +0100
 +++ openoffice.org/scp2/source/ooo/file_library_ooo.scp	2008-06-19 15:31:54.000000000 +0100
-@@ -1438,7 +1438,9 @@
-   #endif
- End
- 
--#if !defined(MACOSX) && ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA) )
-+#if !defined(MACOSX) 
-+
-+#if ( !defined(SYSTEM_MOZILLA) && !defined(WITHOUT_MOZILLA)
- 
- File gid_File_Lib_Mozab_2
-     TXT_FILE_BODY;
-@@ -1452,6 +1454,22 @@
+@@ -1149,6 +1149,20 @@
    #endif
  End
  
@@ -556,11 +546,9 @@
 +  #endif
 +End
 +
-+#endif
-+
  #endif
  
- STD_UNO_LIB_FILE_PATCH(gid_File_Lib_Wpft,wpft)
+ STD_UNO_LIB_FILE(gid_File_Lib_Wpft,wpft)
 diff -ru scp2/source/ooo/module_hidden_ooo.scp scp2/source/ooo/module_hidden_ooo.scp
 --- openoffice.org.orig/scp2/source/ooo/module_hidden_ooo.scp	2008-06-19 15:29:16.000000000 +0100
 +++ openoffice.org/scp2/source/ooo/module_hidden_ooo.scp	2008-06-19 15:31:44.000000000 +0100