connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu |
8 ++------
dbaccess/source/core/misc/dsntypes.cxx |
1 +
dbaccess/source/inc/dsntypes.hxx |
3 ++-
3 files changed, 5 insertions(+), 7 deletions(-)
New commits:
commit 739226133373960e42416da95216b7c736d572c6
Author: Andrzej J.R. Hunt <andr...@ahunt.org>
Date: Tue Jul 30 11:06:22 2013 +0200
Fix firebird-sdbc registry details.
Change-Id: I753095ba40b5fb45cfccd10a95bd8eb7b68bd564
diff --git
a/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/firebird/org/openoffice/Office/DataAccess/Drivers.xcu
index 84ca47c..1141deb 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 6eeec00..51113b3 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 e7c42af..6802694 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,
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
