Tag: mws_ooo300 User: obo Date: 2008-11-18 09:27:51+0000 Modified: dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx
Log: INTEGRATION: CWS macmozxmlsec (1.5.56); FILE MERGED 2008/09/01 10:22:22 fs 1.5.56.1: #i93206# copy CMCs fix for #i92087# herein, and extend it to be applied on MacOS unconditionally File Changes: Directory: /dba/connectivity/source/drivers/mozab/bootstrap/ ============================================================ File [changed]: MNSProfileDiscover.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx?r1=1.5&r2=1.5.54.1 Delta lines: +19 -3 -------------------- --- MNSProfileDiscover.hxx 2008-04-10 10:12:57+0000 1.5 +++ MNSProfileDiscover.hxx 2008-11-18 09:27:49+0000 1.5.54.1 @@ -31,7 +31,9 @@ #ifndef __MNSProfileDiscover_h___ #define __MNSProfileDiscover_h___ +#ifndef MINIMAL_PROFILEDISCOVER #include "mozilla_profile_discover.h" +#endif #include <sal/types.h> #include <osl/diagnose.h> @@ -68,15 +70,27 @@ class ProfileStruct { public: - ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName,nsILocalFile * aProfilePath); + ProfileStruct(MozillaProductType aProduct,::rtl::OUString aProfileName, +#ifdef MINIMAL_PROFILEDISCOVER + const ::rtl::OUString &aProfilePath +#else + nsILocalFile * aProfilePath +#endif + ); MozillaProductType getProductType() { return product;} ::rtl::OUString getProfileName(){ return profileName;} ::rtl::OUString getProfilePath() ; +#ifndef MINIMAL_PROFILEDISCOVER nsILocalFile *getProfileLocal(){ return profilePath;} +#endif protected: MozillaProductType product; ::rtl::OUString profileName; +#ifdef MINIMAL_PROFILEDISCOVER + ::rtl::OUString profilePath; +#else nsCOMPtr<nsILocalFile> profilePath; +#endif }; class ProductStruct @@ -102,16 +116,18 @@ ::rtl::OUString getDefaultProfile( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL isProfileLocked( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Bool SAL_CALL getProfileExists( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); - protected: ProductStruct m_ProductProfileList[4]; sal_Int32 LoadProductsInfo(); +#ifndef MINIMAL_PROFILEDISCOVER nsresult LoadMozillaProfiles(); +#endif sal_Int32 LoadXPToolkitProfiles(MozillaProductType product); - +#ifndef MINIMAL_PROFILEDISCOVER //used by isProfileLocked nsresult isExistFileOrSymlink(nsILocalFile* aFile,PRBool *bExist); nsresult isLockExist(nsILocalFile* aFile); +#endif }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
