User: hr Date: 2007-11-01 15:22:19+0000 Modified: dba/dbaccess/source/ui/inc/dsntypes.hxx
Log: INTEGRATION: CWS dba24b (1.22.46); FILE MERGED 2007/09/28 11:57:57 oj 1.22.46.4: RESYNC: (1.22-1.23); FILE MERGED 2007/08/29 11:58:47 fs 1.22.46.3: during #i80930#: DST_EMBEDDED -> DST_EMBEDDED_HSQLDB. The approach to read the concrete type of the embedded DB from the configuration does not work, there are enough places where we silently assume 'embedded == embedded HSQLDB' 2007/08/28 13:27:54 fs 1.22.46.2: authentication information now available at the data source meta data 2007/08/27 10:37:52 fs 1.22.46.1: in preparation of #i80930#: some cleanup/re-factoring File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dsntypes.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dsntypes.hxx?r1=1.23&r2=1.24 Delta lines: +30 -45 --------------------- --- dsntypes.hxx 2007-09-13 17:59:07+0000 1.23 +++ dsntypes.hxx 2007-11-01 15:22:17+0000 1.24 @@ -36,15 +36,11 @@ #ifndef _DBAUI_DSNTYPES_HXX_ #define _DBAUI_DSNTYPES_HXX_ -#ifndef _SFXPOOLITEM_HXX +#include <com/sun/star/lang/XMultiServiceFactory.hpp> + #include <svtools/poolitem.hxx> -#endif -#ifndef _COMPHELPER_STLTYPES_HXX_ + #include <comphelper/stl_types.hxx> -#endif -#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_ -#include <com/sun/star/lang/XMultiServiceFactory.hpp> -#endif //......................................................................... namespace dbaui @@ -65,11 +61,9 @@ DST_CALC = 6, DST_DBASE = 7, DST_FLAT = 8, - DST_JDBC = 9, DST_ODBC = 10, DST_ADO = 11, - DST_MOZILLA = 12, DST_THUNDERBIRD = 13, DST_LDAP = 14, @@ -80,7 +74,7 @@ DST_EVOLUTION_LDAP = 19, DST_KAB = 20, DST_MACAB = 21, - DST_EMBEDDED = 22, + DST_EMBEDDED_HSQLDB = 22, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, @@ -97,7 +91,6 @@ DST_UNKNOWN /// unrecognized type }; - //========================================================================= //= ODsnTypeCollection //========================================================================= @@ -141,9 +134,6 @@ void extractHostNamePort(const String& _rDsn,String& _sDatabaseName,String& _rHostname,sal_Int32& _nPortNumber) const; - /// check if the given data source type needs authentication - sal_Bool hasAuthentication(DATASOURCE_TYPE _eType) const; - /// check if the given data source allows creation of tables sal_Bool supportsTableCreation(DATASOURCE_TYPE _eType); @@ -153,17 +143,12 @@ /// check if the given data source tyoe is based on the file system - i.e. the URL is a prefix plus a file URL sal_Bool isFileSystemBased(DATASOURCE_TYPE _eType) const; - /// returns the data source type which should be used as embedded database. - DATASOURCE_TYPE getEmbeddedDatabaseType(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; + /** returns default settings for newly created databases of the given type. - /// returns the URL which should be used as embedded database. - ::rtl::OUString getEmbeddedDatabaseURL(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; - - /// returns the UIName for the embedded database - ::rtl::OUString getEmbeddedDatabaseUIName(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; - - /// returns the settings for the embedded database. - ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> getEmbeddedDatabaseProperties(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB) const; + Currently implemented (and used) for DST_EMBEDDED_HSQLDB only + */ + ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue> + getDefaultDBSettings( DATASOURCE_TYPE _eType ) const; /// get access to the first element of the types collection TypeIterator begin() const; --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
