User: hr Date: 06/06/19 18:43:41 Modified: /dba/connectivity/source/drivers/mozab/ MDriver.hxx
Log: INTEGRATION: CWS warnings01 (1.7.30); FILE MERGED 2006/05/18 12:06:21 fs 1.7.30.3: #i65444# 2006/03/29 12:39:24 fs 1.7.30.2: getSdbcSceme not reachable for the driver - need to locate symbol on demand 2005/11/21 10:07:51 fs 1.7.30.1: #i57457# warning-free code on unx* File Changes: Directory: /dba/connectivity/source/drivers/mozab/ ================================================== File [changed]: MDriver.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/mozab/MDriver.hxx?r1=1.7&r2=1.8 Delta lines: +14 -21 --------------------- --- MDriver.hxx 8 Sep 2005 06:18:42 -0000 1.7 +++ MDriver.hxx 20 Jun 2006 01:43:38 -0000 1.8 @@ -52,11 +52,6 @@ #endif -#define MOZAB_MOZILLA_SCHEMA "mozilla" -#define MOZAB_THUNDERBIRD_SCHEMA "thunderbird" -#define MOZAB_LDAP_SCHEMA "ldap" -#define MOZAB_OUTLOOK_SCHEMA "outlook" -#define MOZAB_OUTLOOKEXP_SCHEMA "outlookexp" #define MOZAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.MozabDriver" namespace connectivity @@ -67,6 +62,7 @@ typedef void* (SAL_CALL * OMozabConnection_CreateInstanceFunction)(void* _pDriver ); typedef void (SAL_CALL * OSetMozabServiceFactory)( void* _pFactory ); + typedef const void* (SAL_CALL * OGetSdbcScheme_Function)( short ); typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, @@ -91,9 +87,11 @@ connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver - oslModule s_hModule; - OMozabConnection_CreateInstanceFunction s_pCreationFunc; - void registerClient(); + oslModule m_hModule; + OMozabConnection_CreateInstanceFunction m_pCreationFunc; + OGetSdbcScheme_Function m_pSchemeFunction; + + bool ensureInit(); virtual ~MozabDriver(); public: @@ -120,13 +118,8 @@ const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & getMSFactory(void) const { return m_xMSFactory; } - static EDriverType acceptsURL_Stat( const ::rtl::OUString& url ); - // static methods to return the names of the uri - static const sal_Char* getSDBC_SCHEME_MOZILLA(); - static const sal_Char* getSDBC_SCHEME_THUNDERBIRD(); - static const sal_Char* getSDBC_SCHEME_LDAP(); - static const sal_Char* getSDBC_SCHEME_OUTLOOK_MAPI(); - static const sal_Char* getSDBC_SCHEME_OUTLOOK_EXPRESS(); + private: + EDriverType impl_classifyURL( const ::rtl::OUString& url ); }; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
