Tag: cws_src680_dba24b User: fs Date: 2007-08-29 11:58:49+0000 Modified: dba/dbaccess/source/ui/inc/dsntypes.hxx
Log: 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' 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.22.46.2&r2=1.22.46.3 Delta lines: +28 -35 --------------------- --- dsntypes.hxx 2007-08-28 13:27:54+0000 1.22.46.2 +++ dsntypes.hxx 2007-08-29 11:58:47+0000 1.22.46.3 @@ -4,9 +4,9 @@ * * $RCSfile: dsntypes.hxx,v $ * - * $Revision: 1.22.46.2 $ + * $Revision: 1.22.46.3 $ * - * last change: $Author: fs $ $Date: 2007/08/28 13:27:54 $ + * last change: $Author: fs $ $Date: 2007/08/29 11:58:47 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -61,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, @@ -75,7 +73,7 @@ DST_EVOLUTION_GROUPWISE = 18, DST_EVOLUTION_LDAP = 19, DST_KAB = 20, - DST_EMBEDDED = 21, + DST_EMBEDDED_HSQLDB = 21, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, @@ -144,17 +142,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 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 default settings for newly created databases of the given type. - /// 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]
