diff options
Diffstat (limited to 'connectivity/source/drivers/kab')
33 files changed, 261 insertions, 261 deletions
diff --git a/connectivity/source/drivers/kab/KCatalog.cxx b/connectivity/source/drivers/kab/KCatalog.cxx index 99148afd5656..44d95d1e85e7 100644 --- a/connectivity/source/drivers/kab/KCatalog.cxx +++ b/connectivity/source/drivers/kab/KCatalog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -105,7 +105,7 @@ Reference< XNameAccess > SAL_CALL KabCatalog::getTables( ) throw(RuntimeExcepti { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - + try { if (!m_pTables) diff --git a/connectivity/source/drivers/kab/KCatalog.hxx b/connectivity/source/drivers/kab/KCatalog.hxx index 27f80caafc73..b24a0a92dbfa 100644 --- a/connectivity/source/drivers/kab/KCatalog.hxx +++ b/connectivity/source/drivers/kab/KCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,7 +39,7 @@ namespace connectivity class KabCatalog : public connectivity::sdbcx::OCatalog { - KabConnection* m_pConnection; // used to get the metadata + KabConnection* m_pConnection; // used to get the metadata ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: diff --git a/connectivity/source/drivers/kab/KColumns.cxx b/connectivity/source/drivers/kab/KColumns.cxx index 398950c192ff..4fd9ca7cb9b7 100644 --- a/connectivity/source/drivers/kab/KColumns.cxx +++ b/connectivity/source/drivers/kab/KColumns.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -90,7 +90,7 @@ void KabColumns::impl_refresh() throw(RuntimeException) m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -KabColumns::KabColumns( KabTable* _pTable, +KabColumns::KabColumns( KabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector), diff --git a/connectivity/source/drivers/kab/KColumns.hxx b/connectivity/source/drivers/kab/KColumns.hxx index 6ab3d32a39ec..c31f0e165993 100644 --- a/connectivity/source/drivers/kab/KColumns.hxx +++ b/connectivity/source/drivers/kab/KColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace connectivity class KabColumns : public sdbcx::OCollection { protected: - KabTable* m_pTable; + KabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - KabColumns( KabTable* _pTable, + KabColumns( KabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector); }; diff --git a/connectivity/source/drivers/kab/KConnection.cxx b/connectivity/source/drivers/kab/KConnection.cxx index b9761ebe9cb8..d612eed46a53 100644 --- a/connectivity/source/drivers/kab/KConnection.cxx +++ b/connectivity/source/drivers/kab/KConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ using namespace com::sun::star::sdbcx; IMPLEMENT_SERVICE_INFO(KabConnection, "com.sun.star.sdbc.drivers.KabConnection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -KabConnection::KabConnection(KabDriver* _pDriver) +KabConnection::KabConnection(KabDriver* _pDriver) : OMetaConnection_BASE(m_aMutex), OSubComponent<KabConnection, KabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_xMetaData(NULL), diff --git a/connectivity/source/drivers/kab/KConnection.hxx b/connectivity/source/drivers/kab/KConnection.hxx index b58460c0a80d..df495478203d 100644 --- a/connectivity/source/drivers/kab/KConnection.hxx +++ b/connectivity/source/drivers/kab/KConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -60,7 +60,7 @@ namespace connectivity class KabDriver; class KabDatabaseMetaData; - typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding + typedef OMetaConnection_BASE KabConnection_BASE; // implements basics and text encoding typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; class KabConnection : public comphelper::OBaseMutex, @@ -75,13 +75,13 @@ namespace connectivity //==================================================================== ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects + OWeakRefArray m_aStatements; // vector containing a list of all the Statement objects // for this Connection - ::KABC::StdAddressBook* m_pAddressBook; // the address book - KabDriver* m_pDriver; // pointer to the owning driver object + ::KABC::StdAddressBook* m_pAddressBook; // the address book + KabDriver* m_pDriver; // pointer to the owning driver object ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> - m_xCatalog; // needed for the SQL interpreter + m_xCatalog; // needed for the SQL interpreter public: virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); @@ -131,8 +131,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors - inline KabDriver* getDriver() const { return m_pDriver;} - ::KABC::AddressBook* getAddressBook() const; + inline KabDriver* getDriver() const { return m_pDriver;} + ::KABC::AddressBook* getAddressBook() const; }; } } diff --git a/connectivity/source/drivers/kab/KDEInit.cxx b/connectivity/source/drivers/kab/KDEInit.cxx index 922b636337d4..7264f6086221 100644 --- a/connectivity/source/drivers/kab/KDEInit.cxx +++ b/connectivity/source/drivers/kab/KDEInit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/KDEInit.h b/connectivity/source/drivers/kab/KDEInit.h index 9a5ea70da211..c1f3963561e2 100644 --- a/connectivity/source/drivers/kab/KDEInit.h +++ b/connectivity/source/drivers/kab/KDEInit.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -30,9 +30,9 @@ #define CONNECTIVITY_KAB_KDEINIT_H // the address book driver's version -#define KAB_DRIVER_VERSION "0.2" -#define KAB_DRIVER_VERSION_MAJOR 0 -#define KAB_DRIVER_VERSION_MINOR 2 +#define KAB_DRIVER_VERSION "0.2" +#define KAB_DRIVER_VERSION_MAJOR 0 +#define KAB_DRIVER_VERSION_MINOR 2 // the minimum KDE version which is required at runtime #define MIN_KDE_VERSION_MAJOR 3 diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx index 8ae1227a0062..a8b3f368f3ae 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.cxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,14 +45,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) +KabDatabaseMetaData::KabDatabaseMetaData(KabConnection* _pCon) : m_xConnection(_pCon), m_bUseCatalog(sal_True) { OSL_ENSURE(_pCon,"KabDatabaseMetaData::KabDatabaseMetaData: No connection set!"); osl_incrementInterlockedCount( &m_refCount ); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- @@ -852,17 +852,17 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getSchemas( ) throw(SQLEx return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumnPrivileges( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( const Any&, const ::rtl::OUString&, - const ::rtl::OUString& tableNamePattern, + const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eColumns); @@ -907,7 +907,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( ::KABC::Field::List aFields = ::KABC::Field::allFields(); ::KABC::Field::List::iterator aField; - for ( aField = aFields.begin(); + for ( aField = aFields.begin(); aField != aFields.end(); ++aField, ++nPosition) { @@ -929,7 +929,7 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, @@ -980,25 +980,25 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedureColumns( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getProcedures( + const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { ::connectivity::ODatabaseMetaDataResultSet* pResult = new ::connectivity::ODatabaseMetaDataResultSet(::connectivity::ODatabaseMetaDataResultSet::eVersionColumns); - + Reference< XResultSet > xRef = pResult; ODatabaseMetaDataResultSet::ORows aRows; @@ -1027,47 +1027,47 @@ Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getVersionColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getExportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getImportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getPrimaryKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getIndexInfo( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Bool, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eIndexInfo ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getBestRowIdentifier( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, sal_Bool ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eBestRowIdentifier ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getTablePrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, +Reference< XResultSet > SAL_CALL KabDatabaseMetaData::getCrossReference( + const Any&, const ::rtl::OUString&, + const ::rtl::OUString&, const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eCrossReference ); diff --git a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx index 2a3e130b6789..00b0bb64145d 100644 --- a/connectivity/source/drivers/kab/KDatabaseMetaData.hxx +++ b/connectivity/source/drivers/kab/KDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,8 +45,8 @@ namespace connectivity class KabDatabaseMetaData : public KabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< KabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + ::com::sun::star::uno::Reference< KabConnection > m_xConnection; + sal_Bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/kab/KDriver.cxx b/connectivity/source/drivers/kab/KDriver.cxx index df050f02812e..22368d60fcfe 100644 --- a/connectivity/source/drivers/kab/KDriver.cxx +++ b/connectivity/source/drivers/kab/KDriver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/KDriver.hxx b/connectivity/source/drivers/kab/KDriver.hxx index e210bd7d5532..aa2d1f252ba4 100644 --- a/connectivity/source/drivers/kab/KDriver.hxx +++ b/connectivity/source/drivers/kab/KDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -158,11 +158,11 @@ namespace connectivity class KabDriver : public KDriver_BASE { protected: - ::osl::Mutex m_aMutex; // mutex is need to control member access - OWeakRefArray m_xConnections; // vector containing a list of all the + ::osl::Mutex m_aMutex; // mutex is need to control member access + OWeakRefArray m_xConnections; // vector containing a list of all the // KabConnection objects for this Driver ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > - m_xMSFactory; // the multi-service factory + m_xMSFactory; // the multi-service factory KabImplModule m_aImplModule; public: diff --git a/connectivity/source/drivers/kab/KPreparedStatement.cxx b/connectivity/source/drivers/kab/KPreparedStatement.cxx index 2b1c13649b01..d82ca654d7ac 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.cxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ void KabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(SQL // ------------------------------------------------------------------------- void KabPreparedStatement::setKabFields() const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -137,7 +137,7 @@ void SAL_CALL KabPreparedStatement::close() throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // Reset last warning message try { clearWarnings (); @@ -165,7 +165,7 @@ sal_Int32 SAL_CALL KabPreparedStatement::executeUpdate() throw(SQLException, Run { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // same as in statement with the difference that this statement also can contain parameter return 0; } @@ -200,64 +200,64 @@ void SAL_CALL KabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int32) // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } @@ -274,96 +274,96 @@ void SAL_CALL KabPreparedStatement::setString(sal_Int32 parameterIndex, const :: // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObject(sal_Int32 parameterIndex, const Any& x) throw(SQLException, RuntimeException) -{ +{ if(!::dbtools::implSetObject(this,parameterIndex,x)) { throw SQLException(); - } + } } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL KabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setArray", NULL); } diff --git a/connectivity/source/drivers/kab/KPreparedStatement.hxx b/connectivity/source/drivers/kab/KPreparedStatement.hxx index dfaf0407e238..876afb1719ec 100644 --- a/connectivity/source/drivers/kab/KPreparedStatement.hxx +++ b/connectivity/source/drivers/kab/KPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,7 +42,7 @@ namespace connectivity { class OBoundParam; - typedef ::cppu::ImplInheritanceHelper4< KabCommonStatement, + typedef ::cppu::ImplInheritanceHelper4< KabCommonStatement, ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -51,12 +51,12 @@ namespace connectivity class KabPreparedStatement : public KabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; ::rtl::Reference< KabResultSetMetaData > m_xMetaData; - sal_Bool m_bPrepared; - mutable sal_Int32 m_nParameterIndex; - OValueRow m_aParameterRow; + sal_Bool m_bPrepared; + mutable sal_Int32 m_nParameterIndex; + OValueRow m_aParameterRow; void checkAndResizeParameters(sal_Int32 nParams) throw(::com::sun::star::sdbc::SQLException); void setKabFields() const throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/kab/KResultSet.cxx b/connectivity/source/drivers/kab/KResultSet.cxx index 7a7043eb34c6..1c1b8f35dc50 100644 --- a/connectivity/source/drivers/kab/KResultSet.cxx +++ b/connectivity/source/drivers/kab/KResultSet.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -54,7 +54,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(KabResultSet, "com.sun.star.sdbc.drivers.KabResultSet", "com.sun.star.sdbc.ResultSet"); // ------------------------------------------------------------------------- -KabResultSet::KabResultSet(KabCommonStatement* pStmt) +KabResultSet::KabResultSet(KabCommonStatement* pStmt) : KabResultSet_BASE(m_aMutex), OPropertySetHelper(KabResultSet_BASE::rBHelper), m_xStatement(pStmt), @@ -164,13 +164,13 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - // find the first column with the name columnName + // find the first column with the name columnName Reference< XResultSetMetaData > xMeta = getMetaData(); sal_Int32 nLen = xMeta->getColumnCount(); for (sal_Int32 i = 1; i <= nLen; ++i) if (xMeta->isCaseSensitive(i) ? - columnName == xMeta->getColumnName(i) : + columnName == xMeta->getColumnName(i) : columnName.equalsIgnoreAsciiCase(xMeta->getColumnName(i))) return i; @@ -180,7 +180,7 @@ sal_Int32 SAL_CALL KabResultSet::findColumn(const ::rtl::OUString& columnName) t "$columnname$",columnName ) ); ::dbtools::throwGenericSQLException(sError,NULL); - + // Unreachable: OSL_ASSERT(false); return 0; @@ -502,7 +502,7 @@ void SAL_CALL KabResultSet::beforeFirst() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // move before the first row m_nRowPos = -1; } @@ -616,7 +616,7 @@ sal_Bool SAL_CALL KabResultSet::rowDeleted() throw(SQLException, RuntimeExceptio } // ------------------------------------------------------------------------- sal_Bool SAL_CALL KabResultSet::rowInserted() throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); @@ -666,7 +666,7 @@ void SAL_CALL KabResultSet::updateRow() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow updates } // ------------------------------------------------------------------------- @@ -686,7 +686,7 @@ void SAL_CALL KabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow inserts } // ------------------------------------------------------------------------- @@ -899,7 +899,7 @@ Sequence< sal_Int32 > SAL_CALL KabResultSet::deleteRows(const Sequence< Any >& { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabResultSet_BASE::rBHelper.bDisposed); - + return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- @@ -908,12 +908,12 @@ IPropertyArrayHelper* KabResultSet::createArrayHelper() const Sequence< Property > aProps(6); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP1IMPL(CURSORNAME, ::rtl::OUString) PropertyAttribute::READONLY); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } diff --git a/connectivity/source/drivers/kab/KResultSet.hxx b/connectivity/source/drivers/kab/KResultSet.hxx index fc7e5f49ce26..209f9a1d6c3f 100644 --- a/connectivity/source/drivers/kab/KResultSet.hxx +++ b/connectivity/source/drivers/kab/KResultSet.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,7 +46,7 @@ namespace connectivity namespace kab { /* - ** KabResultSet + ** KabResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -61,17 +61,17 @@ namespace connectivity ::com::sun::star::sdbc::XColumnLocate, ::com::sun::star::lang::XServiceInfo> KabResultSet_BASE; - class KabResultSet : public comphelper::OBaseMutex, - public KabResultSet_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<KabResultSet> + class KabResultSet : public comphelper::OBaseMutex, + public KabResultSet_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<KabResultSet> { protected: - ::rtl::Reference< KabCommonStatement > m_xStatement; // the statement that has created this result set - ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set - ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query - sal_Int32 m_nRowPos; // the current row within the result set - sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL + ::rtl::Reference< KabCommonStatement > m_xStatement; // the statement that has created this result set + ::rtl::Reference< KabResultSetMetaData > m_xMetaData; // the description of the columns in this result set + ::KABC::Addressee::List m_aKabAddressees; // address book entries matching the query + sal_Int32 m_nRowPos; // the current row within the result set + sal_Bool m_bWasNull; // last entry retrieved from this result set was NULL // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -98,7 +98,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - + KabResultSet(KabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.cxx b/connectivity/source/drivers/kab/KResultSetMetaData.cxx index b4739d632352..c9bc2853f159 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.cxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/KResultSetMetaData.hxx b/connectivity/source/drivers/kab/KResultSetMetaData.hxx index 2e04fa84c8b6..5bf1dd2495a9 100644 --- a/connectivity/source/drivers/kab/KResultSetMetaData.hxx +++ b/connectivity/source/drivers/kab/KResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,14 +40,14 @@ namespace connectivity namespace kab { /* - ** KabResultSetMetaData + ** KabResultSetMetaData */ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> KabResultSetMetaData_BASE; class KabResultSetMetaData : public KabResultSetMetaData_BASE { - KabConnection* m_pConnection; - ::std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number + KabConnection* m_pConnection; + ::std::vector<sal_Int32> m_aKabFields; // for each selected column, contains the number // of the corresponding KAddressBook field protected: diff --git a/connectivity/source/drivers/kab/KServices.cxx b/connectivity/source/drivers/kab/KServices.cxx index b2d4ef8f3da8..640f84d96d8b 100644 --- a/connectivity/source/drivers/kab/KServices.cxx +++ b/connectivity/source/drivers/kab/KServices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,8 +116,8 @@ struct ProviderRequest //--------------------------------------------------------------------------------------- extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/kab/KStatement.cxx b/connectivity/source/drivers/kab/KStatement.cxx index 4121681255fd..655e8ae656e2 100644 --- a/connectivity/source/drivers/kab/KStatement.cxx +++ b/connectivity/source/drivers/kab/KStatement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ namespace IMPLEMENT_SERVICE_INFO(KabStatement, "com.sun.star.sdbc.drivers.KabStatement", "com.sun.star.sdbc.Statement"); //------------------------------------------------------------------------------ -KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) +KabCommonStatement::KabCommonStatement(KabConnection* _pConnection ) : KabCommonStatement_BASE(m_aMutex), OPropertySetHelper(KabCommonStatement_BASE::rBHelper), m_aParser(_pConnection->getDriver()->getMSFactory()), @@ -144,9 +144,9 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { ::rtl::OUString sMatchString; - if (pRight->isToken()) // WHERE Name = 'Doe' + if (pRight->isToken()) // WHERE Name = 'Doe' sMatchString = pRight->getTokenValue(); - else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? + else if (SQL_ISRULE(pRight, parameter)) // WHERE Name = ? getNextParameter(sMatchString); switch (pMiddle->getNodeType()) @@ -189,10 +189,10 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse else if (SQL_ISRULE(pParseNode, test_for_null) || SQL_ISRULE(pParseNode, like_predicate)) { const OSQLParseNode *pLeft = pParseNode->getChild(0); - const OSQLParseNode* pPart2 = pParseNode->getChild(1); + const OSQLParseNode* pPart2 = pParseNode->getChild(1); const OSQLParseNode *pMiddleLeft = pPart2->getChild(0), *pMiddleRight = pPart2->getChild(1), - *pRight = pPart2->getChild(2); + *pRight = pPart2->getChild(2); if (SQL_ISRULE(pParseNode, test_for_null)) { @@ -230,9 +230,9 @@ KabCondition *KabCommonStatement::analyseWhereClause(const OSQLParseNode *pParse { ::rtl::OUString sMatchString; - if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' + if (pMiddleRight->isToken()) // WHERE Name LIKE 'Sm%' sMatchString = pMiddleRight->getTokenValue(); - else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? + else if (SQL_ISRULE(pMiddleRight, parameter)) // WHERE Name LIKE ? getNextParameter(sMatchString); return new KabConditionSimilar(sColumnName, sMatchString); @@ -311,8 +311,8 @@ sal_Bool KabCommonStatement::isTableKnown(KabResultSet *pResult) const //------------------------------------------------------------------------------ void KabCommonStatement::setKabFields(KabResultSet *pResult) const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns - KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + KabResultSetMetaData *pMeta; // meta information - holds the list of KAddressBook fields xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -377,7 +377,7 @@ Any SAL_CALL KabCommonStatement::queryInterface( const Type & rType ) throw(Runt // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL KabCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -397,7 +397,7 @@ void SAL_CALL KabCommonStatement::close( ) throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + } dispose(); } @@ -434,20 +434,20 @@ OSL_TRACE("KDE Address book - SQL Request: %s", OUtoCStr(sql)); switch (m_aSQLIterator.getStatementType()) { case SQL_STATEMENT_SELECT: - if (isTableKnown(pResult)) // FROM which table ? + if (isTableKnown(pResult)) // FROM which table ? { - setKabFields(pResult); // SELECT which columns ? - selectAddressees(pResult); // WHERE which condition ? - sortAddressees(pResult); // ORDER BY which columns ? + setKabFields(pResult); // SELECT which columns ? + selectAddressees(pResult); // WHERE which condition ? + sortAddressees(pResult); // ORDER BY which columns ? // To be continued: DISTINCT -// etc... +// etc... } break; default: // To be continued: UPDATE -// DELETE -// etc... +// DELETE +// etc... lcl_throwError(STR_QUERY_TOO_COMPLEX); } @@ -458,7 +458,7 @@ Reference< XConnection > SAL_CALL KabCommonStatement::getConnection( ) throw(SQ { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - + // just return our connection here return (Reference< XConnection >) m_pConnection; } @@ -467,8 +467,8 @@ sal_Int32 SAL_CALL KabCommonStatement::executeUpdate( const ::rtl::OUString& ) t { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(KabCommonStatement_BASE::rBHelper.bDisposed); - - // the return values gives information about how many rows are affected by executing the sql statement + + // the return values gives information about how many rows are affected by executing the sql statement return 0; } // ------------------------------------------------------------------------- @@ -495,12 +495,12 @@ void SAL_CALL KabCommonStatement::clearWarnings( ) throw(SQLException, RuntimeE Sequence< Property > aProps(10); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -521,7 +521,7 @@ sal_Bool KabCommonStatement::convertFastPropertyValue( const Any&) throw (::com::sun::star::lang::IllegalArgumentException) { sal_Bool bConverted = sal_False; - // here we have to try to convert + // here we have to try to convert return bConverted; } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/kab/KStatement.hxx b/connectivity/source/drivers/kab/KStatement.hxx index dcc141fc9bd2..044c473ee1a4 100644 --- a/connectivity/source/drivers/kab/KStatement.hxx +++ b/connectivity/source/drivers/kab/KStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ namespace connectivity { namespace kab { - typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper4< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::util::XCancellable, ::com::sun::star::sdbc::XCloseable> KabCommonStatement_BASE; @@ -52,20 +52,20 @@ namespace connectivity // Class KabCommonStatement // is a base class for the normal statement and for the prepared statement //************************************************************** - class KabCommonStatement : public comphelper::OBaseMutex, - public KabCommonStatement_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> + class KabCommonStatement : public comphelper::OBaseMutex, + public KabCommonStatement_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<KabCommonStatement> { - ::com::sun::star::sdbc::SQLWarning m_aLastWarning; + ::com::sun::star::sdbc::SQLWarning m_aLastWarning; protected: - ::std::list< ::rtl::OUString> m_aBatchList; - connectivity::OSQLParser m_aParser; - connectivity::OSQLParseTreeIterator m_aSQLIterator; - connectivity::OSQLParseNode* m_pParseTree; - KabConnection* m_pConnection; // The owning Connection object + ::std::list< ::rtl::OUString> m_aBatchList; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParseNode* m_pParseTree; + KabConnection* m_pConnection; // The owning Connection object protected: class KabCondition *analyseWhereClause( diff --git a/connectivity/source/drivers/kab/KTable.cxx b/connectivity/source/drivers/kab/KTable.cxx index f0af9c6c41c5..20247273a535 100644 --- a/connectivity/source/drivers/kab/KTable.cxx +++ b/connectivity/source/drivers/kab/KTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,7 +45,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection) +KabTable::KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection) : KabTable_TYPEDEF(_pTables, sal_True), m_pConnection(_pConnection) { diff --git a/connectivity/source/drivers/kab/KTable.hxx b/connectivity/source/drivers/kab/KTable.hxx index 9ab4fb532143..2b640e4cdbfa 100644 --- a/connectivity/source/drivers/kab/KTable.hxx +++ b/connectivity/source/drivers/kab/KTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -46,8 +46,8 @@ namespace connectivity KabConnection* m_pConnection; public: - KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection); - KabTable( sdbcx::OCollection* _pTables, + KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection); + KabTable( sdbcx::OCollection* _pTables, KabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/kab/KTables.cxx b/connectivity/source/drivers/kab/KTables.cxx index 55f10203b226..31d66547bd24 100644 --- a/connectivity/source/drivers/kab/KTables.cxx +++ b/connectivity/source/drivers/kab/KTables.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/KTables.hxx b/connectivity/source/drivers/kab/KTables.hxx index d2d8179c09cf..438458c8e37c 100644 --- a/connectivity/source/drivers/kab/KTables.hxx +++ b/connectivity/source/drivers/kab/KTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/kab.xcu b/connectivity/source/drivers/kab/kab.xcu index d350014a3017..0cc515e4ee40 100755 --- a/connectivity/source/drivers/kab/kab.xcu +++ b/connectivity/source/drivers/kab/kab.xcu @@ -2,7 +2,7 @@ <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/kab.xml b/connectivity/source/drivers/kab/kab.xml index 943906d6c3e7..115b9f5522d2 100644 --- a/connectivity/source/drivers/kab/kab.xml +++ b/connectivity/source/drivers/kab/kab.xml @@ -1,7 +1,7 @@ <?xml version='1.0' encoding="UTF-8"?> <!DOCTYPE COMPONENTDESCRIPTION PUBLIC "-//W3C//DTD HTML 3.2//EN" "module-description.dtd"> <module-description xmlns:xlink="http://www.w3.org/1999/xlink"> - <module-name> kab1 </module-name> + <module-name> kab1 </module-name> <component-description> <Author>Eric Bischoff</Author> <Name>com.sun.star.comp.sdbc.kab.Driver</Name> @@ -10,68 +10,68 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - <service-dependency> ... </service-dependency> - </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <service-dependency> ... </service-dependency> + </component-description> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.registry.XRegistryKey </type> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.uno.XComponentContext </type> - <type> com.sun.star.beans.PropertyAttribute </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XSingleServiceFactory </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.XSingleComponentFactory </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.DisposedException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.lang.XServiceInfo </type> - <type> com.sun.star.lang.XUnoTunnel </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.FetchDirection </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.SQLWarning </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdbc.ColumnSearch </type> - <type> com.sun.star.sdbc.ColumnValue </type> - <type> com.sun.star.sdbc.DataType </type> - <type> com.sun.star.sdbc.XDriver </type> - <type> com.sun.star.sdbc.TransactionIsolation </type> - <type> com.sun.star.sdbc.ResultSetType </type> - <type> com.sun.star.sdbc.ResultSetConcurrency </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> - <type> com.sun.star.sdbcx.CompareBookmark </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.registry.XRegistryKey </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.uno.XComponentContext </type> + <type> com.sun.star.beans.PropertyAttribute </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XSingleServiceFactory </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.XSingleComponentFactory </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.DisposedException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.lang.XServiceInfo </type> + <type> com.sun.star.lang.XUnoTunnel </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.FetchDirection </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.SQLWarning </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdbc.ColumnSearch </type> + <type> com.sun.star.sdbc.ColumnValue </type> + <type> com.sun.star.sdbc.DataType </type> + <type> com.sun.star.sdbc.XDriver </type> + <type> com.sun.star.sdbc.TransactionIsolation </type> + <type> com.sun.star.sdbc.ResultSetType </type> + <type> com.sun.star.sdbc.ResultSetConcurrency </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.sdbcx.CompareBookmark </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> </module-description> diff --git a/connectivity/source/drivers/kab/kcondition.cxx b/connectivity/source/drivers/kab/kcondition.cxx index 6e44372924e5..2ecdead169f5 100644 --- a/connectivity/source/drivers/kab/kcondition.cxx +++ b/connectivity/source/drivers/kab/kcondition.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -123,7 +123,7 @@ sal_Bool KabConditionEqual::eval(const ::KABC::Addressee &aAddressee) const QString aQtName = valueOfKabField(aAddressee, m_nFieldNumber); // Timestamps should not be compared according to their string value // The syntax for such queries should be like -// {ts '2004-03-29 12:55:00.000000'} +// {ts '2004-03-29 12:55:00.000000'} // They should also support operators like '<' or '>=' if (aQtName.isNull()) return sal_False; diff --git a/connectivity/source/drivers/kab/kcondition.hxx b/connectivity/source/drivers/kab/kcondition.hxx index 34e014c637d6..41873bd420a7 100644 --- a/connectivity/source/drivers/kab/kcondition.hxx +++ b/connectivity/source/drivers/kab/kcondition.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/kfields.cxx b/connectivity/source/drivers/kab/kfields.cxx index 9acae2750e64..cf1632b3cdef 100644 --- a/connectivity/source/drivers/kab/kfields.cxx +++ b/connectivity/source/drivers/kab/kfields.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ sal_uInt32 findKabField(const ::rtl::OUString& columnName) throw(SQLException) ::KABC::Field::List::iterator aField; sal_uInt32 nResult; - for ( aField = aFields.begin(), nResult = KAB_DATA_FIELDS; + for ( aField = aFields.begin(), nResult = KAB_DATA_FIELDS; aField != aFields.end(); ++aField, ++nResult) { diff --git a/connectivity/source/drivers/kab/kfields.hxx b/connectivity/source/drivers/kab/kfields.hxx index 6a79455f906c..2e628cd41363 100644 --- a/connectivity/source/drivers/kab/kfields.hxx +++ b/connectivity/source/drivers/kab/kfields.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,8 +33,8 @@ #include <connectivity/dbexception.hxx> #include <rtl/ustring.hxx> -#define KAB_FIELD_REVISION 0 -#define KAB_DATA_FIELDS 1 +#define KAB_FIELD_REVISION 0 +#define KAB_DATA_FIELDS 1 namespace connectivity { diff --git a/connectivity/source/drivers/kab/korder.cxx b/connectivity/source/drivers/kab/korder.cxx index 6220a2383133..e10d2cfeee38 100644 --- a/connectivity/source/drivers/kab/korder.cxx +++ b/connectivity/source/drivers/kab/korder.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/kab/korder.hxx b/connectivity/source/drivers/kab/korder.hxx index 29fa9637c396..d6df56d3835e 100644 --- a/connectivity/source/drivers/kab/korder.hxx +++ b/connectivity/source/drivers/kab/korder.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |