diff options
| -rw-r--r-- | connectivity/source/drivers/sqlite3/DataAccess.xcu | 19 | ||||
| -rw-r--r-- | connectivity/source/drivers/sqlite3/sqlite_connection.cxx | 16 |
2 files changed, 27 insertions, 8 deletions
diff --git a/connectivity/source/drivers/sqlite3/DataAccess.xcu b/connectivity/source/drivers/sqlite3/DataAccess.xcu new file mode 100644 index 0000000000..45d25867d9 --- /dev/null +++ b/connectivity/source/drivers/sqlite3/DataAccess.xcu @@ -0,0 +1,19 @@ +<?xml version="1.0" encoding="UTF-8"?> +<oor:node xmlns:oor="http://openoffice.org/2001/registry" xmlns:xs="http://www.w3.org/2001/XMLSchema" oor:name="DataAccess" oor:package="org.openoffice.Office"> + <node oor:name="UserDefinedDriverSettings"> + <node oor:name="org.openoffice.comp.connectivity.sqlite.Driver" oor:op="replace"> + <prop oor:name="DriverName"> + <value>org.openoffice.comp.connectivity.sqlite.Driver</value> + </prop> + <prop oor:name="DriverPageDisplayName"> + <value>SQLite</value> + </prop> + <prop oor:name="DriverTypeDisplayName"> + <value>sqlite</value> + </prop> + <prop oor:name="DriverDsnPrefix"> + <value>sdbc:sqlite:</value> + </prop> + </node> + </node> +</oor:node> diff --git a/connectivity/source/drivers/sqlite3/sqlite_connection.cxx b/connectivity/source/drivers/sqlite3/sqlite_connection.cxx index 0f07424b07..0894bf0a5a 100644 --- a/connectivity/source/drivers/sqlite3/sqlite_connection.cxx +++ b/connectivity/source/drivers/sqlite3/sqlite_connection.cxx @@ -125,13 +125,13 @@ public: { that->acquire(); } - + virtual ~ClosableReference() { if (m_conn) m_conn->release(); } - + virtual void SAL_CALL dispose() throw () { if (m_conn) @@ -184,11 +184,11 @@ void Connection::close() ii != m_myStatements.end(); ++ii) { Reference< XCloseable > r = ii->second; - if (r.is()) +/* if (r.is()) // awy 2011-01-26 won't compile, Needs to be fixed? lst.push_back(r); - } +*/ } } - // close all created statements + // close all created statements for (CloseableList::iterator ii = lst.begin(); ii != lst.end(); ++ii) { ii->get()->close(); } @@ -212,7 +212,7 @@ Reference< XStatement > Connection::createStatement() throw (SQLException, Runti Reference< XStatement > ret(stmt); ::rtl::ByteSequence id(16); rtl_createUuid((sal_uInt8*) id.getConstArray(), 0, sal_False); - m_myStatements[id] = Reference< XCloseable > (stmt); +// m_myStatements[id] = Reference< XCloseable > (stmt); // awy 2011-01-26 won't compile - needs to be fixed? stmt->queryAdapter()->addReference(new ClosableReference(id, this)); return ret; } @@ -226,10 +226,10 @@ Reference< XPreparedStatement > Connection::prepareStatement(const ::rtl::OUStri rtl::OString byteSql = OUStringToOString(sql, m_settings.encoding); PreparedStatement *stmt = new PreparedStatement(m_refMutex, this, &m_settings, byteSql); Reference< XPreparedStatement > ret = stmt; - + ::rtl::ByteSequence id(16); rtl_createUuid((sal_uInt8*) id.getConstArray(), 0, sal_False); - m_myStatements[id] = Reference< XCloseable > (stmt); +// m_myStatements[id] = Reference< XCloseable > (stmt); // awy 2011-01-26 won't compile - needs to be fixed? stmt->queryAdapter()->addReference(new ClosableReference(id, this)); return ret; } |