diff options
| author | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-30 11:06:22 +0200 |
|---|---|---|
| committer | Andrzej J.R. Hunt <andrzej@ahunt.org> | 2013-07-30 11:34:51 +0200 |
| commit | 739226133373960e42416da95216b7c736d572c6 (patch) | |
| tree | 89fa71c1b7ce6ebf8851ee78f3ae5f74c4b25838 | |
| parent | 79d1d1b4405b9f76de10b9c2c5ecdca686b1f7b9 (diff) | |
Fix firebird-sdbc registry details.
Change-Id: I753095ba40b5fb45cfccd10a95bd8eb7b68bd564
| -rw-r--r-- | connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu | 8 | ||||
| -rw-r--r-- | dbaccess/source/core/misc/dsntypes.cxx | 1 | ||||
| -rw-r--r-- | dbaccess/source/inc/dsntypes.hxx | 3 |
3 files changed, 5 insertions, 7 deletions
diff --git a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu index 84ca47c9e18a..1141debc6295 100644 --- a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu +++ b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu @@ -32,13 +32,13 @@ * ************************************************************************ --> <oor:component-data oor:name="Drivers" oor:package="org.openoffice.Office.DataAccess" xmlns:install="http://openoffice.org/2004/installation" xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema"> - <node oor:name="Installed" install:module="firebird_sdbc"> + <node oor:name="Installed" install:module="firebird"> <node oor:name="sdbc:embedded:firebird" oor:op="replace"> <prop oor:name="Driver"> <value>com.sun.star.comp.sdbc.firebird.Driver</value> </prop> <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> - <value xml:lang="en-US">Firebird</value> + <value xml:lang="en-US">Firebird Embedded</value> </prop> <node oor:name="Properties"> <!-- Don't use ODBC syntax for date&time literals and (full) outer joins, @@ -126,7 +126,3 @@ </node> </node> </oor:component-data> - -<!-- Local Variables: --> -<!-- indent-tabs-mode: nil --> -<!-- End: --> diff --git a/dbaccess/source/core/misc/dsntypes.cxx b/dbaccess/source/core/misc/dsntypes.cxx index 6eeec003e014..51113b30f8a7 100644 --- a/dbaccess/source/core/misc/dsntypes.cxx +++ b/dbaccess/source/core/misc/dsntypes.cxx @@ -410,6 +410,7 @@ DATASOURCE_TYPE ODsnTypeCollection::determineType(const OUString& _rDsn) const KnownPrefix( "sdbc:flat:", DST_FLAT, false ), KnownPrefix( "sdbc:odbc:", DST_ODBC, false ), KnownPrefix( "sdbc:dbase:", DST_DBASE, false ), + KnownPrefix( "sdbc:firebird:", DST_FIREBIRD, false ), KnownPrefix( "sdbc:mysql:odbc:", DST_MYSQL_ODBC, false ), KnownPrefix( "sdbc:mysql:jdbc:", DST_MYSQL_JDBC, false ), KnownPrefix( "sdbc:mysql:mysqlc:", DST_MYSQL_NATIVE, false ), diff --git a/dbaccess/source/inc/dsntypes.hxx b/dbaccess/source/inc/dsntypes.hxx index e7c42af97fcb..6802694b68c7 100644 --- a/dbaccess/source/inc/dsntypes.hxx +++ b/dbaccess/source/inc/dsntypes.hxx @@ -61,7 +61,8 @@ enum DATASOURCE_TYPE DST_EMBEDDED_HSQLDB = 23, DST_MYSQL_NATIVE = 24, DST_MYSQL_NATIVE_DIRECT = 25, - DST_EMBEDDED_FIREBIRD = 26, + DST_FIREBIRD = 26, + DST_EMBEDDED_FIREBIRD = 27, DST_USERDEFINE1, /// first user defined driver DST_USERDEFINE2, |