Tag: cws_src680_sqlite User: aklitzing Date: 2006/08/18 11:57:32 Modified: dba/connectivity/source/drivers/sqlite3/sqConnection.cxx dba/connectivity/source/drivers/sqlite3/sqConnection.hxx
Log: * Changed to human-readable code * ErrorNo changed * sqQueryPrepared to sqQueryPreparedCursor File Changes: Directory: /dba/connectivity/source/drivers/sqlite3/ ==================================================== File [changed]: sqConnection.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/sqlite3/sqConnection.cxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +5 -5 ------------------- --- sqConnection.cxx 16 Aug 2006 14:57:09 -0000 1.1.2.1 +++ sqConnection.cxx 18 Aug 2006 18:57:29 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: sqConnection.cxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: aklitzing $ $Date: 2006/08/16 14:57:09 $ + * last change: $Author: aklitzing $ $Date: 2006/08/18 18:57:29 $ * * Original contributor: André Klitzing * @@ -139,7 +139,7 @@ if(m_aTypeInfo.empty()) buildTypeInfo(); - sqQueryPrepared* query = m_dataBase->getQuery(rtl::OUStringToOString(_sSql, RTL_TEXTENCODING_UTF8).getStr()); + sqQueryPreparedCursor* query = m_dataBase->getQueryCursor(rtl::OUStringToOString(_sSql, RTL_TEXTENCODING_UTF8).getStr()); Reference< XPreparedStatement > xReturn = new OPreparedStatement(this, m_aTypeInfo, query); m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; @@ -151,7 +151,7 @@ checkDisposed(OConnection_BASE::rBHelper.bDisposed); throw SQLException(::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("Callable statements are not supported in SQLite")), - Reference< XInterface > (), ::rtl::OUString(), 1, Any()); + Reference< XInterface > (), ::rtl::OUString(), -1, Any()); return NULL; } // -------------------------------------------------------------------------------- File [changed]: sqConnection.hxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/sqlite3/sqConnection.hxx?r1=1.1.2.1&r2=1.1.2.2 Delta lines: +26 -24 --------------------- --- sqConnection.hxx 16 Aug 2006 14:57:09 -0000 1.1.2.1 +++ sqConnection.hxx 18 Aug 2006 18:57:29 -0000 1.1.2.2 @@ -4,9 +4,9 @@ * * $RCSfile: sqConnection.hxx,v $ * - * $Revision: 1.1.2.1 $ + * $Revision: 1.1.2.2 $ * - * last change: $Author: aklitzing $ $Date: 2006/08/16 14:57:09 $ + * last change: $Author: aklitzing $ $Date: 2006/08/18 18:57:29 $ * * Original contributor: André Klitzing * @@ -85,6 +85,8 @@ { namespace sqlite3 { + using ::com::sun::star::sdbc::SQLException; + using ::com::sun::star::uno::RuntimeException; typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XConnection, ::com::sun::star::sdbc::XWarningsSupplier, @@ -149,29 +151,29 @@ // XServiceInfo DECLARE_SERVICE_INFO(); // XConnection - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL getAutoCommit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL commit( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL rollback( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isClosed( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Bool SAL_CALL isReadOnly( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(SQLException, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareStatement( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XPreparedStatement > SAL_CALL prepareCall( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException); + virtual ::rtl::OUString SAL_CALL nativeSQL( const ::rtl::OUString& sql ) throw(SQLException, RuntimeException); + virtual void SAL_CALL setAutoCommit( sal_Bool autoCommit ) throw(SQLException, RuntimeException); + virtual sal_Bool SAL_CALL getAutoCommit( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL commit( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL rollback( ) throw(SQLException, RuntimeException); + virtual sal_Bool SAL_CALL isClosed( ) throw(SQLException, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > SAL_CALL getMetaData( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL setReadOnly( sal_Bool readOnly ) throw(SQLException, RuntimeException); + virtual sal_Bool SAL_CALL isReadOnly( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL setCatalog( const ::rtl::OUString& catalog ) throw(SQLException, RuntimeException); + virtual ::rtl::OUString SAL_CALL getCatalog( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL setTransactionIsolation( sal_Int32 level ) throw(SQLException, RuntimeException); + virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(SQLException, RuntimeException); + virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(SQLException, RuntimeException); // XCloseable - virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual void SAL_CALL close( ) throw(SQLException, RuntimeException); // XWarningsSupplier - virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); + virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(SQLException, RuntimeException); + virtual void SAL_CALL clearWarnings( ) throw(SQLException, RuntimeException); // should we use the catalog on filebased databases inline ::rtl::OUString getUserName() const { return m_sUser; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
