diff options
Diffstat (limited to 'connectivity/source/drivers/macab')
40 files changed, 288 insertions, 288 deletions
diff --git a/connectivity/source/drivers/macab/MacabAddressBook.cxx b/connectivity/source/drivers/macab/MacabAddressBook.cxx index 346336ae6be8..97469643cf7a 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.cxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.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 @@ -51,7 +51,7 @@ MacabAddressBook::MacabAddressBook( ) m_xMacabRecords = NULL; m_bRetrievedGroups = sal_False; } - + // ----------------------------------------------------------------------------- MacabAddressBook::~MacabAddressBook() { @@ -72,7 +72,7 @@ MacabAddressBook::~MacabAddressBook() m_bRetrievedGroups = sal_False; } - + // ----------------------------------------------------------------------------- /* Get the address book's default table name. This is the table name that * refers to the table containing _all_ records in the address book. diff --git a/connectivity/source/drivers/macab/MacabAddressBook.hxx b/connectivity/source/drivers/macab/MacabAddressBook.hxx index 7ac3f4593d3f..2aefbd8d9ec7 100644 --- a/connectivity/source/drivers/macab/MacabAddressBook.hxx +++ b/connectivity/source/drivers/macab/MacabAddressBook.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 @@ -66,7 +66,7 @@ namespace connectivity MacabGroup *getMacabGroupMatch(::rtl::OUString _groupName); MacabRecords *getMacabRecordsMatch(const ::rtl::OUString _tableName); }; - + } } diff --git a/connectivity/source/drivers/macab/MacabCatalog.cxx b/connectivity/source/drivers/macab/MacabCatalog.cxx index 2e836e1390b9..bd9342b4bd56 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.cxx +++ b/connectivity/source/drivers/macab/MacabCatalog.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 MacabCatalog::getTables( ) throw(RuntimeExcep { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(rBHelper.bDisposed); - + try { if (!m_pTables) diff --git a/connectivity/source/drivers/macab/MacabCatalog.hxx b/connectivity/source/drivers/macab/MacabCatalog.hxx index c63f4187791a..52e4e7782f89 100644 --- a/connectivity/source/drivers/macab/MacabCatalog.hxx +++ b/connectivity/source/drivers/macab/MacabCatalog.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 MacabCatalog : public connectivity::sdbcx::OCatalog { - MacabConnection* m_pConnection; // used to get the metadata + MacabConnection* 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/macab/MacabColumns.cxx b/connectivity/source/drivers/macab/MacabColumns.cxx index 8501aadd2a70..0d78b459692f 100644 --- a/connectivity/source/drivers/macab/MacabColumns.cxx +++ b/connectivity/source/drivers/macab/MacabColumns.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 MacabColumns::impl_refresh() throw(RuntimeException) m_pTable->refreshColumns(); } // ------------------------------------------------------------------------- -MacabColumns::MacabColumns( MacabTable* _pTable, +MacabColumns::MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector) : sdbcx::OCollection(*_pTable, sal_True, _rMutex, _rVector), diff --git a/connectivity/source/drivers/macab/MacabColumns.hxx b/connectivity/source/drivers/macab/MacabColumns.hxx index 3cc87d4bedc8..1d75c8b58515 100644 --- a/connectivity/source/drivers/macab/MacabColumns.hxx +++ b/connectivity/source/drivers/macab/MacabColumns.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 MacabColumns : public sdbcx::OCollection { protected: - MacabTable* m_pTable; + MacabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - MacabColumns( MacabTable* _pTable, + MacabColumns( MacabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector); }; diff --git a/connectivity/source/drivers/macab/MacabConnection.cxx b/connectivity/source/drivers/macab/MacabConnection.cxx index bb9052b463f0..4841430a0721 100644 --- a/connectivity/source/drivers/macab/MacabConnection.cxx +++ b/connectivity/source/drivers/macab/MacabConnection.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(MacabConnection, "com.sun.star.sdbc.drivers.MacabConnection", "com.sun.star.sdbc.Connection") //----------------------------------------------------------------------------- -MacabConnection::MacabConnection(MacabDriver* _pDriver) +MacabConnection::MacabConnection(MacabDriver* _pDriver) : OSubComponent<MacabConnection, MacabConnection_BASE>((::cppu::OWeakObject*)_pDriver, this), m_pAddressBook(NULL), m_pDriver(_pDriver) diff --git a/connectivity/source/drivers/macab/MacabConnection.hxx b/connectivity/source/drivers/macab/MacabConnection.hxx index f149847958b9..65ece28448a5 100644 --- a/connectivity/source/drivers/macab/MacabConnection.hxx +++ b/connectivity/source/drivers/macab/MacabConnection.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 @@ -56,7 +56,7 @@ namespace connectivity class MacabDatabaseMetaData; class MacabAddressBook; - //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding + //typedef OMetaConnection_BASE MacabConnection_BASE; // implements basics and text encoding typedef std::vector< ::com::sun::star::uno::WeakReferenceHelper > OWeakRefArray; typedef connectivity::OMetaConnection MacabConnection_BASE; @@ -70,10 +70,10 @@ namespace connectivity //==================================================================== // Data attributes //==================================================================== - MacabAddressBook* m_pAddressBook; // the address book - MacabDriver* m_pDriver; // pointer to the owning driver object + MacabAddressBook* m_pAddressBook; // the address book + MacabDriver* 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); @@ -123,8 +123,8 @@ namespace connectivity ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > SAL_CALL createCatalog(); // accessors - inline MacabDriver* getDriver() const { return m_pDriver;} - MacabAddressBook* getAddressBook() const; + inline MacabDriver* getDriver() const { return m_pDriver;} + MacabAddressBook* getAddressBook() const; }; } } diff --git a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx index a7217c6bd666..3392d0f208e5 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.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 @@ -50,14 +50,14 @@ using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; -MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon) +MacabDatabaseMetaData::MacabDatabaseMetaData(MacabConnection* _pCon) : m_xConnection(_pCon), m_bUseCatalog(sal_True) { OSL_ENSURE(_pCon,"MacabDatabaseMetaData::MacabDatabaseMetaData: No connection set!"); osl_incrementInterlockedCount( &m_refCount ); - m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); + m_bUseCatalog = !(usesLocalFiles() || usesLocalFilePerTable()); osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- @@ -868,17 +868,17 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getSchemas( ) throw(SQL return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eSchemas ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumnPrivileges( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eColumnPrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::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); @@ -916,7 +916,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( MacabHeader::iterator aField; - for ( aField = aHeader->begin(); + for ( aField = aHeader->begin(); aField != aHeader->end(); ++aField, ++nPosition) { @@ -962,7 +962,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( const Any&, const ::rtl::OUString&, const ::rtl::OUString&, @@ -1005,7 +1005,7 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( ::std::vector<MacabGroup *> xGroups = m_xConnection->getAddressBook()->getMacabGroups(); sal_Int32 i, nGroups; nGroups = xGroups.size(); - + aRow[0] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[1] = ODatabaseMetaDataResultSet::getEmptyValue(); aRow[2] = ODatabaseMetaDataResultSet::getEmptyValue(); @@ -1024,21 +1024,21 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTables( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedureColumns( + const Any&, const ::rtl::OUString&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedureColumns ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( - const Any&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getProcedures( + const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eProcedures ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( const Any&, const ::rtl::OUString&, const ::rtl::OUString& table ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eVersionColumns ); @@ -1071,47 +1071,47 @@ Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getVersionColumns( return xRef; } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getExportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eExportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getImportedKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eImportedKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getPrimaryKeys( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::ePrimaryKeys ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getIndexInfo( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::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 MacabDatabaseMetaData::getBestRowIdentifier( - const Any&, const ::rtl::OUString&, const ::rtl::OUString&, sal_Int32, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::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 MacabDatabaseMetaData::getTablePrivileges( +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getTablePrivileges( const Any&, const ::rtl::OUString&, const ::rtl::OUString& ) throw(SQLException, RuntimeException) { return new ODatabaseMetaDataResultSet( ODatabaseMetaDataResultSet::eTablePrivileges ); } // ------------------------------------------------------------------------- -Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::getCrossReference( - const Any&, const ::rtl::OUString&, - const ::rtl::OUString&, const Any&, +Reference< XResultSet > SAL_CALL MacabDatabaseMetaData::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/macab/MacabDatabaseMetaData.hxx b/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx index 0cc796bda9be..852cd32c7db0 100644 --- a/connectivity/source/drivers/macab/MacabDatabaseMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabDatabaseMetaData.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 MacabDatabaseMetaData : public MacabDatabaseMetaData_BASE { - ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; - sal_Bool m_bUseCatalog; + ::com::sun::star::uno::Reference< MacabConnection > m_xConnection; + sal_Bool m_bUseCatalog; public: diff --git a/connectivity/source/drivers/macab/MacabDriver.cxx b/connectivity/source/drivers/macab/MacabDriver.cxx index 796b814710db..abcfe98bd0a0 100644 --- a/connectivity/source/drivers/macab/MacabDriver.cxx +++ b/connectivity/source/drivers/macab/MacabDriver.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/macab/MacabDriver.hxx b/connectivity/source/drivers/macab/MacabDriver.hxx index 2648e3871e82..c21715ec09fb 100644 --- a/connectivity/source/drivers/macab/MacabDriver.hxx +++ b/connectivity/source/drivers/macab/MacabDriver.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 @@ -38,9 +38,9 @@ #include <osl/module.h> // the address book driver's version -#define MACAB_DRIVER_VERSION "0.1" -#define MACAB_DRIVER_VERSION_MAJOR 0 -#define MACAB_DRIVER_VERSION_MINOR 1 +#define MACAB_DRIVER_VERSION "0.1" +#define MACAB_DRIVER_VERSION_MAJOR 0 +#define MACAB_DRIVER_VERSION_MINOR 1 namespace connectivity { @@ -131,11 +131,11 @@ namespace connectivity class MacabDriver : public MacabDriver_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 // MacabConnection 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 MacabImplModule m_aImplModule; public: diff --git a/connectivity/source/drivers/macab/MacabGroup.cxx b/connectivity/source/drivers/macab/MacabGroup.cxx index f254e2d48f82..6f0dabf45b0f 100644 --- a/connectivity/source/drivers/macab/MacabGroup.cxx +++ b/connectivity/source/drivers/macab/MacabGroup.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/macab/MacabGroup.hxx b/connectivity/source/drivers/macab/MacabGroup.hxx index afc45408face..1f09ac0d09ad 100644 --- a/connectivity/source/drivers/macab/MacabGroup.hxx +++ b/connectivity/source/drivers/macab/MacabGroup.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/macab/MacabHeader.cxx b/connectivity/source/drivers/macab/MacabHeader.cxx index c8b28853feff..11519522d683 100644 --- a/connectivity/source/drivers/macab/MacabHeader.cxx +++ b/connectivity/source/drivers/macab/MacabHeader.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 @@ -66,7 +66,7 @@ MacabHeader::MacabHeader(const sal_Int32 _size, macabfield **_fields) CFRetain(fields[i]->value); } } - + } // ------------------------------------------------------------------------- @@ -124,7 +124,7 @@ void MacabHeader::operator+= (const MacabHeader *r) numToAdd++; } } - + newFields = new macabfield *[size+numToAdd]; for(i = 0; i < size; i++) { @@ -249,7 +249,7 @@ macabfield **MacabHeader::sortRecord(const sal_Int32 _start, const sal_Int32 _le return sorted; } -sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield *_field2) +sal_Int32 MacabHeader::compareFields(const macabfield *_field1, const macabfield *_field2) { /* Comparing two fields in a MacabHeader is different than comparing two * fields in a MacabRecord. It starts in the same way (if one of the two diff --git a/connectivity/source/drivers/macab/MacabHeader.hxx b/connectivity/source/drivers/macab/MacabHeader.hxx index 05c381928ce4..b0dc2820e6cb 100644 --- a/connectivity/source/drivers/macab/MacabHeader.hxx +++ b/connectivity/source/drivers/macab/MacabHeader.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/macab/MacabPreparedStatement.cxx b/connectivity/source/drivers/macab/MacabPreparedStatement.cxx index aa94353e72cd..19d9c5f9de9e 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.cxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.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 @@ -59,7 +59,7 @@ void MacabPreparedStatement::checkAndResizeParameters(sal_Int32 nParams) throw(S // ------------------------------------------------------------------------- void MacabPreparedStatement::setMacabFields() const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -150,7 +150,7 @@ void SAL_CALL MacabPreparedStatement::close() throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // Reset last warning message try { clearWarnings (); @@ -178,7 +178,7 @@ sal_Int32 SAL_CALL MacabPreparedStatement::executeUpdate() throw(SQLException, R { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // same as in statement with the difference that this statement also can contain parameter return 0; } @@ -213,64 +213,64 @@ void SAL_CALL MacabPreparedStatement::setNull(sal_Int32 parameterIndex, sal_Int3 // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectNull(sal_Int32, sal_Int32, const ::rtl::OUString&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectNull", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBoolean(sal_Int32, sal_Bool) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBoolean", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setByte(sal_Int32, sal_Int8) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setByte", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setShort(sal_Int32, sal_Int16) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setShort", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setInt(sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setInt", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setLong(sal_Int32, sal_Int64) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setLong", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setFloat(sal_Int32, float) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setFloat", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDouble(sal_Int32, double) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDouble", NULL); } @@ -287,48 +287,48 @@ void SAL_CALL MacabPreparedStatement::setString(sal_Int32 parameterIndex, const // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBytes(sal_Int32, const Sequence< sal_Int8 >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBytes", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setDate(sal_Int32, const Date&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setDate", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTime(sal_Int32, const Time&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTime", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setTimestamp(sal_Int32, const DateTime&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setTimestamp", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBinaryStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBinaryStream", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setCharacterStream(sal_Int32, const Reference< ::com::sun::star::io::XInputStream >&, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setCharacterStream", NULL); } @@ -347,40 +347,40 @@ void SAL_CALL MacabPreparedStatement::setObject(sal_Int32 parameterIndex, const // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setObjectWithInfo(sal_Int32, const Any&, sal_Int32, sal_Int32) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setObjectWithInfo", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setRef(sal_Int32, const Reference< XRef >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setRef", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setBlob(sal_Int32, const Reference< XBlob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setBlob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setClob(sal_Int32, const Reference< XClob >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setClob", NULL); } // ------------------------------------------------------------------------- void SAL_CALL MacabPreparedStatement::setArray(sal_Int32, const Reference< XArray >&) throw(SQLException, RuntimeException) { - - + + ::dbtools::throwFunctionNotSupportedException("setArray", NULL); } diff --git a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx b/connectivity/source/drivers/macab/MacabPreparedStatement.hxx index 15443ef7636c..0fb1b6e92d91 100644 --- a/connectivity/source/drivers/macab/MacabPreparedStatement.hxx +++ b/connectivity/source/drivers/macab/MacabPreparedStatement.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< MacabCommonStatement, + typedef ::cppu::ImplInheritanceHelper4< MacabCommonStatement, ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, @@ -51,12 +51,12 @@ namespace connectivity class MacabPreparedStatement : public MacabPreparedStatement_BASE { protected: - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; ::rtl::Reference< MacabResultSetMetaData > 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 setMacabFields() const throw(::com::sun::star::sdbc::SQLException); diff --git a/connectivity/source/drivers/macab/MacabRecord.cxx b/connectivity/source/drivers/macab/MacabRecord.cxx index d3521663e9e1..bb6eb60661f0 100644 --- a/connectivity/source/drivers/macab/MacabRecord.cxx +++ b/connectivity/source/drivers/macab/MacabRecord.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 @@ -173,9 +173,9 @@ void MacabRecord::releaseFields() } // ------------------------------------------------------------------------- -sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield *_field2) +sal_Int32 MacabRecord::compareFields(const macabfield *_field1, const macabfield *_field2) { - + /* When comparing records, if either field is NULL (and the other is * not), that field is considered "greater than" the other, so that it * shows up later in the list when fields are ordered. @@ -247,7 +247,7 @@ macabfield *MacabRecord::createMacabField(const ::rtl::OUString _newFieldString, case kABDateProperty: { DateTime aDateTime = DBTypeConversion::toDateTime(_newFieldString); - + // bad format... if(aDateTime.Year == 0 && aDateTime.Month == 0 && aDateTime.Day == 0) { diff --git a/connectivity/source/drivers/macab/MacabRecord.hxx b/connectivity/source/drivers/macab/MacabRecord.hxx index 9ab992eeb27a..aa47f8377bba 100644 --- a/connectivity/source/drivers/macab/MacabRecord.hxx +++ b/connectivity/source/drivers/macab/MacabRecord.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/macab/MacabRecords.cxx b/connectivity/source/drivers/macab/MacabRecords.cxx index 02c3a90cf511..601808e9a7bf 100644 --- a/connectivity/source/drivers/macab/MacabRecords.cxx +++ b/connectivity/source/drivers/macab/MacabRecords.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 @@ -152,7 +152,7 @@ void MacabRecords::initialize() records[i] = createMacabRecord(record, header, recordType); } currentRecord = recordsSize; - + CFRelease(allRecords); } @@ -204,7 +204,7 @@ MacabRecord *MacabRecords::insertRecord(MacabRecord *_newRecord, const sal_Int32 */ if(_location >= currentRecord) currentRecord = _location+1; - + oldRecord = records[_location]; records[_location] = _newRecord; return oldRecord; @@ -352,7 +352,7 @@ MacabHeader *MacabRecords::createHeaderForRecordType(const CFArrayRef _records, CFArrayRef allProperties = ABCopyArrayOfPropertiesForRecordType(addressBook, _recordType); CFStringRef *nonRequiredProperties; sal_Int32 numRecords = (sal_Int32) CFArrayGetCount(_records); - sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(allProperties); + sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(allProperties); sal_Int32 numNonRequiredProperties = numProperties - numRequiredProperties; /* While searching through the properties for required properties, these @@ -546,7 +546,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert if(_propertyValue != NULL) { sal_Int32 i; - + sal_Int32 multiLength = ABMultiValueCount((ABMutableMultiValueRef) _propertyValue); CFStringRef multiLabel, localizedMultiLabel; ::rtl::OUString multiLabelString; @@ -651,7 +651,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = multiHeaders[j]->copy(k); } for(i = 0; i < multiLengthFirstLevel; i++) @@ -660,7 +660,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert delete [] multiHeaders; } break; - + /* Dictionary */ case kABDictionaryProperty: /* For non-scalars, we can only get more information if the property @@ -729,7 +729,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = dictHeaders[j]->copy(k); } @@ -789,7 +789,7 @@ MacabHeader *MacabRecords::createHeaderForProperty(const ABPropertyType _propert j++; k = 0; } - + headerNames[i] = arrHeaders[j]->copy(k); } for(i = 0; i < arrLength; i++) @@ -869,7 +869,7 @@ MacabRecord *MacabRecords::createMacabRecord(const ABRecordRef _abrecord, const MacabRecord *macabRecord = new MacabRecord(_header->getSize()); CFArrayRef recordProperties = ABCopyArrayOfPropertiesForRecordType(addressBook, _recordType); - sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(recordProperties); + sal_Int32 numProperties = (sal_Int32) CFArrayGetCount(recordProperties); sal_Int32 i; @@ -955,7 +955,7 @@ void MacabRecords::insertPropertyIntoMacabRecord(const ABPropertyType _propertyT sal_Bool bPlaced = sal_False; ::rtl::OUString columnName = ::rtl::OUString(_propertyName); sal_Int32 i = 1; - + // A big safeguard to prevent two fields from having the same name. while(bPlaced != sal_True) { diff --git a/connectivity/source/drivers/macab/MacabRecords.hxx b/connectivity/source/drivers/macab/MacabRecords.hxx index 80c87ee7d40a..dfd6cb8429f7 100644 --- a/connectivity/source/drivers/macab/MacabRecords.hxx +++ b/connectivity/source/drivers/macab/MacabRecords.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 @@ -71,7 +71,7 @@ namespace connectivity /* For required properties */ CFStringRef *requiredProperties; sal_Int32 numRequiredProperties; - + private: /* All of the private methods are for creating a MacabHeader or a * MacabRecord. They are used by the initialize method that goes diff --git a/connectivity/source/drivers/macab/MacabResultSet.cxx b/connectivity/source/drivers/macab/MacabResultSet.cxx index 242e92f3cc13..314337fbe73a 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.cxx +++ b/connectivity/source/drivers/macab/MacabResultSet.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 @@ -56,7 +56,7 @@ using namespace com::sun::star::util; IMPLEMENT_SERVICE_INFO(MacabResultSet, "com.sun.star.sdbc.drivers.MacabResultSet", "com.sun.star.sdbc.ResultSet"); // ------------------------------------------------------------------------- -MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt) +MacabResultSet::MacabResultSet(MacabCommonStatement* pStmt) : MacabResultSet_BASE(m_aMutex), OPropertySetHelper(MacabResultSet_BASE::rBHelper), m_xStatement(pStmt), @@ -75,7 +75,7 @@ MacabResultSet::~MacabResultSet() void MacabResultSet::allMacabRecords() { MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get()); - + m_aMacabRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName); } // ------------------------------------------------------------------------- @@ -83,7 +83,7 @@ void MacabResultSet::someMacabRecords(const MacabCondition *pCondition) { MacabConnection* pConnection = static_cast< MacabConnection *>(m_xStatement->getConnection().get()); MacabRecords* allRecords; - + allRecords = pConnection->getAddressBook()->getMacabRecords(m_sTableName); // Bad table!! Throw exception? @@ -191,13 +191,13 @@ sal_Int32 SAL_CALL MacabResultSet::findColumn(const ::rtl::OUString& columnName) ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_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; @@ -578,7 +578,7 @@ void SAL_CALL MacabResultSet::beforeFirst() throw(SQLException, RuntimeException { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // move before the first row m_nRowPos = -1; } @@ -692,7 +692,7 @@ sal_Bool SAL_CALL MacabResultSet::rowDeleted() throw(SQLException, RuntimeExcept } // ------------------------------------------------------------------------- sal_Bool SAL_CALL MacabResultSet::rowInserted() throw(SQLException, RuntimeException) -{ +{ ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); @@ -742,7 +742,7 @@ void SAL_CALL MacabResultSet::updateRow() throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow updates } // ------------------------------------------------------------------------- @@ -762,7 +762,7 @@ void SAL_CALL MacabResultSet::moveToInsertRow() throw(SQLException, RuntimeExcep { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + // only when you allow inserts } // ------------------------------------------------------------------------- @@ -985,7 +985,7 @@ Sequence< sal_Int32 > SAL_CALL MacabResultSet::deleteRows(const Sequence< Any { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabResultSet_BASE::rBHelper.bDisposed); - + return Sequence< sal_Int32 >(); } // ------------------------------------------------------------------------- @@ -994,12 +994,12 @@ IPropertyArrayHelper* MacabResultSet::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/macab/MacabResultSet.hxx b/connectivity/source/drivers/macab/MacabResultSet.hxx index 46363e979469..029aa6c13ad0 100644 --- a/connectivity/source/drivers/macab/MacabResultSet.hxx +++ b/connectivity/source/drivers/macab/MacabResultSet.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,7 +45,7 @@ namespace connectivity namespace macab { /* - ** MacabResultSet + ** MacabResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -61,18 +61,18 @@ namespace connectivity ::com::sun::star::lang::XServiceInfo> MacabResultSet_BASE; class MacabRecords; - class MacabResultSet : public comphelper::OBaseMutex, - public MacabResultSet_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<MacabResultSet> + class MacabResultSet : public comphelper::OBaseMutex, + public MacabResultSet_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<MacabResultSet> { protected: - ::rtl::Reference< MacabCommonStatement > m_xStatement; // the statement that has created this result set - ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; // the description of the columns in this result set - MacabRecords * m_aMacabRecords; // 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::OUString m_sTableName; + ::rtl::Reference< MacabCommonStatement > m_xStatement; // the statement that has created this result set + ::rtl::Reference< MacabResultSetMetaData > m_xMetaData; // the description of the columns in this result set + MacabRecords * m_aMacabRecords; // 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::OUString m_sTableName; // OPropertyArrayUsageHelper virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; @@ -99,7 +99,7 @@ namespace connectivity public: DECLARE_SERVICE_INFO(); - + MacabResultSet(MacabCommonStatement *pStmt); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx index 21cd4e9727c5..27ff55dcedb3 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.cxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.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 MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: static const ::rtl::OUString aName(::rtl::OUString::createFromAscii("Name")); MacabRecords *aRecords; MacabHeader *aHeader; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName @@ -78,7 +78,7 @@ void MacabResultSetMetaData::setMacabFields(const ::rtl::Reference<connectivity: nFieldNumber = aHeader->getColumnNumber(aFieldName); m_aMacabFields.push_back(nFieldNumber); } - + } // ------------------------------------------------------------------------- sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnDisplaySize(sal_Int32 column) throw(SQLException, RuntimeException) @@ -92,7 +92,7 @@ sal_Int32 SAL_CALL MacabResultSetMetaData::getColumnType(sal_Int32 column) throw MacabRecords *aRecords; MacabHeader *aHeader; macabfield *aField; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName @@ -133,7 +133,7 @@ sal_Bool SAL_CALL MacabResultSetMetaData::isCaseSensitive(sal_Int32) throw(SQLEx sal_uInt32 nFieldNumber = m_aMacabFields[column - 1]; MacabRecords *aRecords; MacabHeader *aHeader; - + aRecords = m_pConnection->getAddressBook()->getMacabRecords(m_sTableName); // In case, somehow, we don't have anything with the name m_sTableName diff --git a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx b/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx index ab5b9bd20062..2140a03b3073 100644 --- a/connectivity/source/drivers/macab/MacabResultSetMetaData.hxx +++ b/connectivity/source/drivers/macab/MacabResultSetMetaData.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 @@ -41,15 +41,15 @@ namespace connectivity namespace macab { /* - ** MacabResultSetMetaData + ** MacabResultSetMetaData */ typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> MacabResultSetMetaData_BASE; class MacabResultSetMetaData : public MacabResultSetMetaData_BASE { - MacabConnection* m_pConnection; - ::rtl::OUString m_sTableName; - ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number + MacabConnection* m_pConnection; + ::rtl::OUString m_sTableName; + ::std::vector<sal_Int32> m_aMacabFields; // for each selected column, contains the number // of the corresponding AddressBook field protected: diff --git a/connectivity/source/drivers/macab/MacabServices.cxx b/connectivity/source/drivers/macab/MacabServices.cxx index cc3535ec5586..d6e9e7b385a2 100644 --- a/connectivity/source/drivers/macab/MacabServices.cxx +++ b/connectivity/source/drivers/macab/MacabServices.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/macab/MacabStatement.cxx b/connectivity/source/drivers/macab/MacabStatement.cxx index 583dc62910b6..fa2654131fa2 100644 --- a/connectivity/source/drivers/macab/MacabStatement.cxx +++ b/connectivity/source/drivers/macab/MacabStatement.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 @@ -73,7 +73,7 @@ namespace connectivity IMPLEMENT_SERVICE_INFO(MacabStatement, "com.sun.star.sdbc.drivers.MacabStatement", "com.sun.star.sdbc.Statement"); //------------------------------------------------------------------------------ -MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) +MacabCommonStatement::MacabCommonStatement(MacabConnection* _pConnection ) : MacabCommonStatement_BASE(m_aMutex), OPropertySetHelper(MacabCommonStatement_BASE::rBHelper), m_aParser(_pConnection->getDriver()->getMSFactory()), @@ -147,9 +147,9 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { ::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()) @@ -192,7 +192,7 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP 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); @@ -233,9 +233,9 @@ MacabCondition *MacabCommonStatement::analyseWhereClause(const OSQLParseNode *pP { ::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 MacabConditionSimilar(m_pHeader, sColumnName, sMatchString); @@ -313,8 +313,8 @@ MacabOrder *MacabCommonStatement::analyseOrderByClause(const OSQLParseNode *pPar //------------------------------------------------------------------------------ void MacabCommonStatement::setMacabFields(MacabResultSet *pResult) const throw(SQLException) { - ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns - MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields + ::rtl::Reference<connectivity::OSQLColumns> xColumns; // selected columns + MacabResultSetMetaData *pMeta; // meta information - holds the list of AddressBook fields xColumns = m_aSQLIterator.getSelectColumns(); if (!xColumns.is()) @@ -385,7 +385,7 @@ Any SAL_CALL MacabCommonStatement::queryInterface( const Type & rType ) throw(Ru // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL MacabCommonStatement::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 )); @@ -405,7 +405,7 @@ void SAL_CALL MacabCommonStatement::close( ) throw(SQLException, RuntimeExcepti { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + } dispose(); } @@ -460,20 +460,20 @@ OSL_TRACE("Mac OS Address book - SQL Request: %s", OUtoCStr(sql)); pResult->setTableName(sTableName); - setMacabFields(pResult); // SELECT which columns ? - selectRecords(pResult); // WHERE which condition ? - sortRecords(pResult); // ORDER BY which columns ? + setMacabFields(pResult); // SELECT which columns ? + selectRecords(pResult); // WHERE which condition ? + sortRecords(pResult); // ORDER BY which columns ? } // To be continued: DISTINCT -// etc... +// etc... } } break; default: // To be continued: UPDATE -// DELETE -// etc... +// DELETE +// etc... impl_throwError(STR_QUERY_TOO_COMPLEX); } @@ -485,7 +485,7 @@ Reference< XConnection > SAL_CALL MacabCommonStatement::getConnection( ) throw( { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_BASE::rBHelper.bDisposed); - + // just return our connection here return (Reference< XConnection >) m_pConnection; } @@ -494,8 +494,8 @@ sal_Int32 SAL_CALL MacabCommonStatement::executeUpdate( const ::rtl::OUString& ) { ::osl::MutexGuard aGuard( m_aMutex ); checkDisposed(MacabCommonStatement_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; } // ------------------------------------------------------------------------- @@ -522,12 +522,12 @@ void SAL_CALL MacabCommonStatement::clearWarnings( ) throw(SQLException, Runtim 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); @@ -548,7 +548,7 @@ sal_Bool MacabCommonStatement::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/macab/MacabStatement.hxx b/connectivity/source/drivers/macab/MacabStatement.hxx index e9fabc4ee9dc..0eda7b05f5b9 100644 --- a/connectivity/source/drivers/macab/MacabStatement.hxx +++ b/connectivity/source/drivers/macab/MacabStatement.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 @@ -44,7 +44,7 @@ namespace connectivity { namespace macab { - 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> MacabCommonStatement_BASE; @@ -53,23 +53,23 @@ namespace connectivity // Class MacabCommonStatement // is a base class for the normal statement and for the prepared statement //************************************************************** - class MacabCommonStatement : public comphelper::OBaseMutex, - public MacabCommonStatement_BASE, - public ::cppu::OPropertySetHelper, - public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement> + class MacabCommonStatement : public comphelper::OBaseMutex, + public MacabCommonStatement_BASE, + public ::cppu::OPropertySetHelper, + public comphelper::OPropertyArrayUsageHelper<MacabCommonStatement> { - ::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; - MacabConnection* m_pConnection; // The owning Connection object - MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) + ::std::list< ::rtl::OUString> m_aBatchList; + connectivity::OSQLParser m_aParser; + connectivity::OSQLParseTreeIterator m_aSQLIterator; + connectivity::OSQLParseNode* m_pParseTree; + MacabConnection* m_pConnection; // The owning Connection object + MacabHeader* m_pHeader; // The header of the address book on which to run queries (provided by m_pConnection) ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created - + protected: class MacabCondition *analyseWhereClause( diff --git a/connectivity/source/drivers/macab/MacabTable.cxx b/connectivity/source/drivers/macab/MacabTable.cxx index f6d78221d30d..ab4ff29d6578 100644 --- a/connectivity/source/drivers/macab/MacabTable.cxx +++ b/connectivity/source/drivers/macab/MacabTable.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; // ------------------------------------------------------------------------- -MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection) +MacabTable::MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection) : MacabTable_TYPEDEF(_pTables, sal_True), m_pConnection(_pConnection) { diff --git a/connectivity/source/drivers/macab/MacabTable.hxx b/connectivity/source/drivers/macab/MacabTable.hxx index 1375aacc2e9a..39f113368e63 100644 --- a/connectivity/source/drivers/macab/MacabTable.hxx +++ b/connectivity/source/drivers/macab/MacabTable.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 MacabConnection* m_pConnection; public: - MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); - MacabTable( sdbcx::OCollection* _pTables, + MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection); + MacabTable( sdbcx::OCollection* _pTables, MacabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/macab/MacabTables.cxx b/connectivity/source/drivers/macab/MacabTables.cxx index eddd6a68ab7f..1d839f40f90b 100644 --- a/connectivity/source/drivers/macab/MacabTables.cxx +++ b/connectivity/source/drivers/macab/MacabTables.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/macab/MacabTables.hxx b/connectivity/source/drivers/macab/MacabTables.hxx index 657fa753d7d3..17422ce862a2 100644 --- a/connectivity/source/drivers/macab/MacabTables.hxx +++ b/connectivity/source/drivers/macab/MacabTables.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/macab/macab.xcu b/connectivity/source/drivers/macab/macab.xcu index 0845bc9a2ce2..cbb9d0b6b0c0 100755 --- a/connectivity/source/drivers/macab/macab.xcu +++ b/connectivity/source/drivers/macab/macab.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/macab/macab.xml b/connectivity/source/drivers/macab/macab.xml index b524d1b0bd50..e1c4b57c378b 100755 --- a/connectivity/source/drivers/macab/macab.xml +++ b/connectivity/source/drivers/macab/macab.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> macab1 </module-name> + <module-name> macab1 </module-name> <component-description> <Author>Omer bar-or</Author> <Name>com.sun.star.comp.sdbc.macab.Driver</Name> @@ -10,68 +10,68 @@ <language>c++</language> <status value="alpha"/> <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/macab/macabcondition.cxx b/connectivity/source/drivers/macab/macabcondition.cxx index 9c584cb96803..3faf0aa26137 100644 --- a/connectivity/source/drivers/macab/macabcondition.cxx +++ b/connectivity/source/drivers/macab/macabcondition.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/macab/macabcondition.hxx b/connectivity/source/drivers/macab/macabcondition.hxx index d268c4100bdb..29f27bc52ff6 100644 --- a/connectivity/source/drivers/macab/macabcondition.hxx +++ b/connectivity/source/drivers/macab/macabcondition.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/macab/macaborder.cxx b/connectivity/source/drivers/macab/macaborder.cxx index c1afc29d7867..fa8ba7a1abfb 100644 --- a/connectivity/source/drivers/macab/macaborder.cxx +++ b/connectivity/source/drivers/macab/macaborder.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/macab/macaborder.hxx b/connectivity/source/drivers/macab/macaborder.hxx index 2dbc6c5d2850..bad4bc813306 100644 --- a/connectivity/source/drivers/macab/macaborder.hxx +++ b/connectivity/source/drivers/macab/macaborder.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/macab/macabutilities.hxx b/connectivity/source/drivers/macab/macabutilities.hxx index 2f128ed000a0..9b9aa1f6443d 100644 --- a/connectivity/source/drivers/macab/macabutilities.hxx +++ b/connectivity/source/drivers/macab/macabutilities.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 |