Tag: cws_src680_mozab05 User: windly Date: 05/01/31 00:28:21 Modified: /dba/dbaccess/source/ui/misc/ dsntypes.cxx
Log: RESYNC: (1.22-1.23); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: dsntypes.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/dsntypes.cxx?r1=1.22.8.2&r2=1.22.8.3 Delta lines: +19 -5 -------------------- --- dsntypes.cxx 14 Jan 2005 10:39:08 -0000 1.22.8.2 +++ dsntypes.cxx 31 Jan 2005 08:28:17 -0000 1.22.8.3 @@ -91,6 +91,12 @@ #include <osl/file.hxx> #endif // --- +#ifndef _COM_SUN_STAR_SDBC_XDRIVERACCESS_HPP_ +#include <com/sun/star/sdbc/XDriverAccess.hpp> +#endif +#ifndef DBACCESS_SHARED_DBUSTRINGS_HRC +#include "dbustrings.hrc" +#endif //......................................................................... namespace dbaui { @@ -99,6 +105,7 @@ using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::lang; + using namespace ::com::sun::star::sdbc; namespace { @@ -330,7 +337,7 @@ } if ( _rsHostname.Len() ) _rsHostname = _rsHostname.GetToken(_rsHostname.GetTokenCount('@') - 1,'@'); - _rsHostname = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':'); + _sDatabaseName = sUrl.GetToken(sUrl.GetTokenCount(':') - 1,':'); break; case DST_LDAP: lcl_extractHostAndPort(sUrl,_sDatabaseName,_nPortNumber); @@ -621,7 +628,14 @@ DATASOURCE_TYPE eRet = DST_DBASE; ::utl::OConfigurationNode aEmbeddedDatabase = lcl_getEmbeddedDatabase(_rxORB); if ( aEmbeddedDatabase.isValid() ) + { + ::rtl::OUString sURLPrefix = getEmbeddedDatabaseURL(_rxORB); + Reference< XDriverAccess > xDriverManager(_rxORB->createInstance(SERVICE_SDBC_DRIVERMANAGER), UNO_QUERY); + if ( xDriverManager.is() && xDriverManager->getDriverByURL(sURLPrefix).is() ) + { eRet = DST_EMBEDDED; + } + } return eRet; } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
