diff options
Diffstat (limited to 'connectivity/source/drivers/evoab2')
29 files changed, 161 insertions, 161 deletions
diff --git a/connectivity/source/drivers/evoab2/EApi.cxx b/connectivity/source/drivers/evoab2/EApi.cxx index d670735d2144..1767ec1bcf5a 100644 --- a/connectivity/source/drivers/evoab2/EApi.cxx +++ b/connectivity/source/drivers/evoab2/EApi.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 @@ -74,7 +74,7 @@ typedef void (*SymbolFunc) (void); SYM_MAP( e_book_query_to_string ), SYM_MAP( e_book_query_field_exists ), SYM_MAP( e_source_group_peek_base_uri) - }; + }; #undef SYM_MAP static bool @@ -120,13 +120,13 @@ bool EApiInit() // hjs: SOLARDEF does no longer exist please lookup the required // defines in a regular compile line /* - * Test code - enable & + * Test code - enable & * * Compile with ( after source LinuxIntelEnv.Set.sh ) gcc $SOLARDEF -I $SOLARVER/$UPD/$INPATH/inc \ -I. `pkg-config --cflags --libs gobject-2.0` \ -L $SOLARVER/$UPD/$INPATH/lib -luno_sal -lstdc++ EApi.cxx - */ + */ int main( int argc, char **argv) { diff --git a/connectivity/source/drivers/evoab2/EApi.h b/connectivity/source/drivers/evoab2/EApi.h index 90422b7e01f8..c089fda927c3 100644 --- a/connectivity/source/drivers/evoab2/EApi.h +++ b/connectivity/source/drivers/evoab2/EApi.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 @@ -57,7 +57,7 @@ typedef void EContact; typedef int EContactField; EAPI_EXTERN const char *(*e_contact_field_name) ( EContactField field_id); -EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); +EAPI_EXTERN gpointer (*e_contact_get) (EContact *contact, EContactField field_id); EAPI_EXTERN gconstpointer (*e_contact_get_const) (EContact *contact, EContactField field_id); // e-source.h typedef void ESource; @@ -90,14 +90,14 @@ typedef enum { typedef void EBook; typedef void EBookQuery; -EAPI_EXTERN EBook *(*e_book_new) (ESource *source, +EAPI_EXTERN EBook *(*e_book_new) (ESource *source, GError **error); -EAPI_EXTERN gboolean (*e_book_open) (EBook *book, +EAPI_EXTERN gboolean (*e_book_open) (EBook *book, gboolean only_if_exists, GError **error); -EAPI_EXTERN const char *(*e_book_get_uri) (EBook *book); +EAPI_EXTERN const char *(*e_book_get_uri) (EBook *book); EAPI_EXTERN ESource *(*e_book_get_source)(EBook *book); EAPI_EXTERN gboolean (*e_book_get_addressbooks) (ESourceList **addressbook_sources, diff --git a/connectivity/source/drivers/evoab2/NCatalog.cxx b/connectivity/source/drivers/evoab2/NCatalog.cxx index 0ed28663f72b..4698a6aab0ea 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.cxx +++ b/connectivity/source/drivers/evoab2/NCatalog.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 @@ -63,7 +63,7 @@ void OEvoabCatalog::refreshTables() { Reference< XRow > xRow(xResult,UNO_QUERY); ::rtl::OUString aName; - + while(xResult->next()) { aName = xRow->getString(3); diff --git a/connectivity/source/drivers/evoab2/NCatalog.hxx b/connectivity/source/drivers/evoab2/NCatalog.hxx index d55f218fd2df..b08b4e46a1c6 100644 --- a/connectivity/source/drivers/evoab2/NCatalog.hxx +++ b/connectivity/source/drivers/evoab2/NCatalog.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/evoab2/NColumns.cxx b/connectivity/source/drivers/evoab2/NColumns.cxx index cfed31d54422..53818b7507a7 100644 --- a/connectivity/source/drivers/evoab2/NColumns.cxx +++ b/connectivity/source/drivers/evoab2/NColumns.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/evoab2/NColumns.hxx b/connectivity/source/drivers/evoab2/NColumns.hxx index 8c98e9deaf17..34c01e911f8b 100644 --- a/connectivity/source/drivers/evoab2/NColumns.hxx +++ b/connectivity/source/drivers/evoab2/NColumns.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 OEvoabColumns : public sdbcx::OCollection { protected: - OEvoabTable* m_pTable; + OEvoabTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OEvoabColumns( OEvoabTable* _pTable, + OEvoabColumns( OEvoabTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector), diff --git a/connectivity/source/drivers/evoab2/NConnection.cxx b/connectivity/source/drivers/evoab2/NConnection.cxx index a49f2683a106..caf6d11d36b9 100644 --- a/connectivity/source/drivers/evoab2/NConnection.cxx +++ b/connectivity/source/drivers/evoab2/NConnection.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/evoab2/NConnection.hxx b/connectivity/source/drivers/evoab2/NConnection.hxx index c61d938ccf2c..2b25b76013ab 100644 --- a/connectivity/source/drivers/evoab2/NConnection.hxx +++ b/connectivity/source/drivers/evoab2/NConnection.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 @@ #include "TConnection.hxx" #include <cppuhelper/weakref.hxx> #include <osl/module.h> -#include "EApi.h" +#include "EApi.h" namespace connectivity { @@ -48,21 +48,21 @@ namespace connectivity namespace SDBCAddress { typedef enum { - Unknown = 0, + Unknown = 0, EVO_LOCAL = 1, - EVO_LDAP = 2, - EVO_GWISE = 3 + EVO_LDAP = 2, + EVO_GWISE = 3 } sdbc_address_type; } - - typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding - + + typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + class OEvoabConnection :public OConnection_BASE ,public connectivity::OSubComponent<OEvoabConnection, OConnection_BASE> { friend class connectivity::OSubComponent<OEvoabConnection, OConnection_BASE>; - private: + private: const OEvoabDriver& m_rDriver; SDBCAddress::sdbc_address_type m_eSDBCAddressType; ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > @@ -80,18 +80,18 @@ namespace connectivity inline void setPassword( rtl::OString aStr ) { m_aPassword = aStr; } // own methods inline const OEvoabDriver& getDriver() const { return m_rDriver; } - + SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} void setSDBCAddressType(SDBCAddress::sdbc_address_type _eSDBCAddressType) {m_eSDBCAddressType = _eSDBCAddressType;} - + // OComponentHelper virtual void SAL_CALL disposing(void); // XInterface virtual void SAL_CALL release() throw(); - + // XServiceInfo DECLARE_SERVICE_INFO(); - + // XConnection virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier > createCatalog(); virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XStatement > SAL_CALL createStatement( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -112,7 +112,7 @@ namespace connectivity virtual sal_Int32 SAL_CALL getTransactionIsolation( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTypeMap( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL setTypeMap( const ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >& typeMap ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + // XCloseable virtual void SAL_CALL close( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // XWarningsSupplier diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx index 9112c5c0dba9..c6dc8bbf7afb 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.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 @@ namespace connectivity static ColumnProperty **pFields=NULL; static guint nFields = 0; - static const char *pBlackList[] = + static const char *pBlackList[] = { "id", "list-show-addresses", @@ -89,11 +89,11 @@ namespace connectivity return evo_addr; } - static void + static void splitColumn (ColumnProperty **pToBeFields) { const SplitEvoColumns* evo_addr( get_evo_addr() ); - for (int i = 0; i < OTHER_ZIP; i++) + for (int i = 0; i < OTHER_ZIP; i++) { pToBeFields[nFields] = g_new0(ColumnProperty,1); pToBeFields[nFields]->bIsSplittedValue = true; @@ -135,7 +135,7 @@ namespace connectivity break; } } - if( bAdd ) + if( bAdd ) { pToBeFields[nFields]= g_new0(ColumnProperty,1); pToBeFields[nFields]->bIsSplittedValue=false; @@ -147,7 +147,7 @@ namespace connectivity break; } } - + splitColumn(pToBeFields); pFields = pToBeFields; } @@ -192,7 +192,7 @@ namespace connectivity guint findEvoabField(const rtl::OUString& aColName) { - guint nRet = (guint)-1; + guint nRet = (guint)-1; sal_Bool bFound = sal_False; initFields(); for (guint i=0;(i < nFields) && !bFound;i++) @@ -236,24 +236,24 @@ namespace connectivity return aName; } - void + void free_column_resources() { - for (int i=nFields-1;i > 0;i--) + for (int i=nFields-1;i > 0;i--) { - if (pFields && pFields[i] ) + if (pFields && pFields[i] ) { - if (pFields[i]->pField) + if (pFields[i]->pField) g_param_spec_unref(pFields[i]->pField); g_free(pFields[i]); } } - if(pFields) + if(pFields) { g_free(pFields); pFields=NULL; } - + } @@ -277,11 +277,11 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const static ODatabaseMetaDataResultSet::ORows aRows; ODatabaseMetaDataResultSet::ORow aRow(19); aRows.clear(); - + // **************************************************** // Some entries in a row never change, so set them now // **************************************************** - + // Catalog aRow[1] = new ORowSetValueDecorator(::rtl::OUString::createFromAscii("")); // Schema @@ -333,7 +333,7 @@ ODatabaseMetaDataResultSet::ORows& OEvoabDatabaseMetaData::getColumnRows( const return aRows ; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) +::rtl::OUString OEvoabDatabaseMetaData::impl_getCatalogSeparator_throw( ) { return ::rtl::OUString(); } @@ -393,7 +393,7 @@ sal_Int32 SAL_CALL OEvoabDatabaseMetaData::getMaxTableNameLength( ) throw(SQLEx return 0;// 0 means no limit } // ------------------------------------------------------------------------- -sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 OEvoabDatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { // We only support a single table return 1; @@ -415,7 +415,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::storesLowerCaseIdentifiers( ) throw(S return sal_False; } // ------------------------------------------------------------------------- -sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool OEvoabDatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return sal_False; } @@ -461,7 +461,7 @@ sal_Bool SAL_CALL OEvoabDatabaseMetaData::supportsNonNullableColumns( ) throw(S return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +::rtl::OUString OEvoabDatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " ::rtl::OUString aVal = ::rtl::OUString::createFromAscii("\""); @@ -1031,7 +1031,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw ODatabaseMetaDataResultSet::ORow aRow; aRow.push_back(ODatabaseMetaDataResultSet::getEmptyValue()); aRow.push_back(new ORowSetValueDecorator(sTableTypes[i])); - + // bound row aRows.push_back(aRow); } @@ -1042,8 +1042,8 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTableTypes( ) throw // ------------------------------------------------------------------------- Reference< XResultSet > OEvoabDatabaseMetaData::impl_getTypeInfo_throw( ) { - /* - * Return the proper type information required by evo driver + /* + * Return the proper type information required by evo driver */ ODatabaseMetaDataResultSet* pResultSet = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTypeInfo); @@ -1107,20 +1107,20 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( ODatabaseMetaDataResultSet* pResult = new ODatabaseMetaDataResultSet(ODatabaseMetaDataResultSet::eTableTypes); Reference< XResultSet > xRef = pResult; - + // check if any type is given // when no types are given then we have to return all tables e.g. TABLE - + const ::rtl::OUString aTable(::rtl::OUString::createFromAscii("TABLE")); - + sal_Bool bTableFound = sal_True; sal_Int32 nLength = types.getLength(); if(nLength) { bTableFound = sal_False; - + const ::rtl::OUString* pBegin = types.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + nLength; + const ::rtl::OUString* pEnd = pBegin + nLength; for(;pBegin != pEnd;++pBegin) { if(*pBegin == aTable) @@ -1134,7 +1134,7 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( return xRef; ODatabaseMetaDataResultSet::ORows aRows; - + ESourceList *pSourceList; if( !e_book_get_addressbooks (&pSourceList, NULL) ) pSourceList = NULL; @@ -1149,17 +1149,17 @@ Reference< XResultSet > SAL_CALL OEvoabDatabaseMetaData::getTables( case SDBCAddress::EVO_GWISE: if (0==strncmp( "groupwise://", p, 11 )) break; - else + else continue; case SDBCAddress::EVO_LOCAL: if (0==strncmp( "file://", p, 6 )) break; else continue; - case SDBCAddress::EVO_LDAP: + case SDBCAddress::EVO_LDAP: if (0==strncmp( "ldap://", p, 6 )) break; - else + else continue; case SDBCAddress::Unknown: break; diff --git a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx b/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx index d6faab52665e..a0fe1788e29a 100644 --- a/connectivity/source/drivers/evoab2/NDatabaseMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NDatabaseMetaData.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,7 +41,7 @@ namespace connectivity { class EvoContacts; - + //************************************************************** //************ Class: OEvoabDatabaseMetaData //************************************************************** @@ -71,15 +71,15 @@ namespace connectivity rtl::OUString getFieldTypeName(guint nCol) ; rtl::OUString getFieldName(guint nCol) ; guint findEvoabField(const rtl::OUString& aColName); - + void free_column_resources(); class OEvoabDatabaseMetaData : public ODatabaseMetaDataBase { - OEvoabConnection* m_pConnection; - + OEvoabConnection* m_pConnection; + ODatabaseMetaDataResultSet::ORows& getColumnRows( const ::rtl::OUString& columnNamePattern ); - + protected: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -98,11 +98,11 @@ namespace connectivity virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); virtual ~OEvoabDatabaseMetaData(); - public: + public: inline OEvoabConnection* getOwnConnection() const { return m_pConnection; } - + OEvoabDatabaseMetaData(OEvoabConnection* _pCon); - + // as I mentioned before this interface is really BIG // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); @@ -126,10 +126,10 @@ namespace connectivity virtual sal_Bool SAL_CALL storesUpperCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesMixedCaseIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual sal_Bool SAL_CALL storesUpperCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL storesLowerCaseQuotedIdentifiers( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); - + virtual ::rtl::OUString SAL_CALL getSQLKeywords( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getNumericFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::rtl::OUString SAL_CALL getStringFunctions( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NDebug.cxx b/connectivity/source/drivers/evoab2/NDebug.cxx index 612bb9319437..92e360425b98 100644 --- a/connectivity/source/drivers/evoab2/NDebug.cxx +++ b/connectivity/source/drivers/evoab2/NDebug.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/evoab2/NDebug.hxx b/connectivity/source/drivers/evoab2/NDebug.hxx index e522c7873971..77f7269c82a1 100644 --- a/connectivity/source/drivers/evoab2/NDebug.hxx +++ b/connectivity/source/drivers/evoab2/NDebug.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 @@ -35,9 +35,9 @@ #ifdef DEBUG void evo_traceStringMessage( const sal_Char* pFormat, const ::rtl::OUString& rString ); -# define EVO_TRACE_STRING( pFormat, rString ) evo_traceStringMessage( pFormat, rString ) +# define EVO_TRACE_STRING( pFormat, rString ) evo_traceStringMessage( pFormat, rString ) #else -# define EVO_TRACE_STRING( pFormat, rString ) ((void)0) +# define EVO_TRACE_STRING( pFormat, rString ) ((void)0) #endif #endif // CONNECTIVITY_EVOAB_DEBUG_HELPER_HXX diff --git a/connectivity/source/drivers/evoab2/NDriver.cxx b/connectivity/source/drivers/evoab2/NDriver.cxx index 5a71080036df..4b5cd5550d8d 100644 --- a/connectivity/source/drivers/evoab2/NDriver.cxx +++ b/connectivity/source/drivers/evoab2/NDriver.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 @@ -67,13 +67,13 @@ OEvoabDriver::~OEvoabDriver() void OEvoabDriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { Reference< XComponent > xComp(i->get(), UNO_QUERY); if (xComp.is()) { - try { + try { xComp->dispose(); } catch (com::sun::star::lang::DisposedException e) { @@ -99,7 +99,7 @@ rtl::OUString OEvoabDriver::getImplementationName_Static( ) throw(RuntimeExcept //------------------------------------------------------------------ Sequence< ::rtl::OUString > OEvoabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString::createFromAscii("com.sun.star.sdbc.Driver"); @@ -138,15 +138,15 @@ Reference< XConnection > SAL_CALL OEvoabDriver::connect( const ::rtl::OUString& ::osl::MutexGuard aGuard( m_aMutex ); if (ODriver_BASE::rBHelper.bDisposed) throw DisposedException(); - + if ( ! acceptsURL(url) ) return NULL; - + OEvoabConnection* pCon = new OEvoabConnection( *this ); pCon->construct(url,info); Reference< XConnection > xCon = pCon; m_xConnections.push_back(WeakReferenceHelper(*pCon)); - + return xCon; } // -------------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/evoab2/NDriver.hxx b/connectivity/source/drivers/evoab2/NDriver.hxx index 2b9a2cf0f395..c8917bffa68d 100644 --- a/connectivity/source/drivers/evoab2/NDriver.hxx +++ b/connectivity/source/drivers/evoab2/NDriver.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 @@ -35,66 +35,66 @@ #include "connectivity/CommonTools.hxx" #include <osl/module.h> -#define EVOAB_EVOLUTION_SCHEMA "evolution" +#define EVOAB_EVOLUTION_SCHEMA "evolution" /*In Future, when seperate schema is required for ldap, groupwise*/ -#define EVOAB_LDAP_SCHEMA "ldap" -#define EVOAB_GWISE_SCHEMA "groupwise" +#define EVOAB_LDAP_SCHEMA "ldap" +#define EVOAB_GWISE_SCHEMA "groupwise" -#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" +#define EVOAB_DRIVER_IMPL_NAME "com.sun.star.comp.sdbc.evoab.OEvoabDriver" namespace connectivity { namespace evoab { - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL OEvoabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ); - - - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + + + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; - + class OEvoabDriver : public ODriver_BASE { - + protected: - ::osl::Mutex m_aMutex; - connectivity::OWeakRefArray m_xConnections; + ::osl::Mutex m_aMutex; + connectivity::OWeakRefArray m_xConnections; ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xFactory; - + public: OEvoabDriver(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); virtual ~OEvoabDriver(); - + // OComponentHelper virtual void SAL_CALL disposing(void); - + // XInterface static ::rtl::OUString getImplementationName_Static( ) throw(::com::sun::star::uno::RuntimeException); static ::com::sun::star::uno::Sequence< ::rtl::OUString > getSupportedServiceNames_Static( ) throw (::com::sun::star::uno::RuntimeException); - + // XServiceInfo virtual ::rtl::OUString SAL_CALL getImplementationName( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL supportsService( const ::rtl::OUString& ServiceName ) throw(::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames( ) throw(::com::sun::star::uno::RuntimeException); - - + + // XDriver virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection > SAL_CALL connect( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL acceptsURL( const ::rtl::OUString& url ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual ::com::sun::star::uno::Sequence< ::com::sun::star::sdbc::DriverPropertyInfo > SAL_CALL getPropertyInfo( const ::rtl::OUString& url, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMajorVersion( ) throw(::com::sun::star::uno::RuntimeException); virtual sal_Int32 SAL_CALL getMinorVersion( ) throw(::com::sun::star::uno::RuntimeException); - + public: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > & getMSFactory(void) const { return m_xFactory; } - - // static methods + + // static methods static sal_Bool acceptsURL_Stat( const ::rtl::OUString& url ); }; } - + } #endif //_CONNECTIVITY_EVOAB_DRIVER_HXX_ diff --git a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx b/connectivity/source/drivers/evoab2/NPreparedStatement.cxx index 3f1ef4b572b6..1aadfbf031fe 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.cxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.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/evoab2/NPreparedStatement.hxx b/connectivity/source/drivers/evoab2/NPreparedStatement.hxx index 1df469d0c8fb..af0e56729fe3 100644 --- a/connectivity/source/drivers/evoab2/NPreparedStatement.hxx +++ b/connectivity/source/drivers/evoab2/NPreparedStatement.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 { class OBoundParam; - typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, + typedef ::cppu::ImplHelper5< ::com::sun::star::sdbc::XPreparedStatement, ::com::sun::star::sdbc::XParameters, ::com::sun::star::sdbc::XResultSetMetaDataSupplier, ::com::sun::star::sdbc::XMultipleResults, @@ -57,27 +57,27 @@ namespace connectivity protected: struct Parameter { - ::com::sun::star::uno::Any aValue; - sal_Int32 nDataType; + ::com::sun::star::uno::Any aValue; + sal_Int32 nDataType; - Parameter(const ::com::sun::star::uno::Any& rValue, - sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) + Parameter(const ::com::sun::star::uno::Any& rValue, + sal_Int32 rDataType) : aValue(rValue),nDataType(rDataType) { } }; - ::std::vector< Parameter> m_aParameters; + ::std::vector< Parameter> m_aParameters; //==================================================================== // Data attributes //==================================================================== // our SQL statement - ::rtl::OUString m_sSqlStatement; + ::rtl::OUString m_sSqlStatement; // the EBookQuery we're working with QueryData m_aQueryData; // our meta data - ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; protected: virtual ~OEvoabPreparedStatement(); diff --git a/connectivity/source/drivers/evoab2/NResultSet.cxx b/connectivity/source/drivers/evoab2/NResultSet.cxx index 874b70d8a0ea..4bea08aab6d3 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.cxx +++ b/connectivity/source/drivers/evoab2/NResultSet.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 @@ -75,7 +75,7 @@ using namespace com::sun::star::io; namespace ErrorCondition = ::com::sun::star::sdb::ErrorCondition; //------------------------------------------------------------------------------ -::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ +::rtl::OUString SAL_CALL OEvoabResultSet::getImplementationName( ) throw ( RuntimeException) \ { return ::rtl::OUString::createFromAscii("com.sun.star.sdbcx.evoab.ResultSet"); } diff --git a/connectivity/source/drivers/evoab2/NResultSet.hxx b/connectivity/source/drivers/evoab2/NResultSet.hxx index 36c1f7d359f0..0ffe5a7e5b86 100644 --- a/connectivity/source/drivers/evoab2/NResultSet.hxx +++ b/connectivity/source/drivers/evoab2/NResultSet.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 @@ -70,15 +70,15 @@ namespace connectivity ,public ::comphelper::OPropertyContainer ,public ::comphelper::OPropertyArrayUsageHelper<OEvoabResultSet> { - + protected: OCommonStatement* m_pStatement; OEvoabConnection* m_pConnection; - ::com::sun::star::uno::WeakReferenceHelper m_aStatement; + ::com::sun::star::uno::WeakReferenceHelper m_aStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > m_xMetaData; ::dbtools::WarningsContainer m_aWarnings; - + bool m_bWasNull; // <properties> sal_Int32 m_nFetchSize; @@ -88,7 +88,7 @@ namespace connectivity // </properties> // Data & iteration - GList *m_pContacts; + GList *m_pContacts; sal_Int32 m_nIndex; sal_Int32 m_nLength; EContact *getCur() @@ -101,22 +101,22 @@ namespace connectivity virtual ::cppu::IPropertyArrayHelper* createArrayHelper( ) const; // OPropertySetHelper virtual ::cppu::IPropertyArrayHelper & SAL_CALL getInfoHelper(); - + // you can't delete objects of this type virtual ~OEvoabResultSet(); public: DECLARE_SERVICE_INFO(); - + OEvoabResultSet( OCommonStatement *pStmt, OEvoabConnection *pConnection ); void construct( const QueryData& _rData ); OEvoabConnection * getConnection() { return m_pConnection; } - + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > operator *() { return ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >(*(OResultSet_BASE*)this); } - + // ::cppu::OComponentHelper virtual void SAL_CALL disposing(void); // XInterface diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx index 2265fa0f72cd..ed727feb0727 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.cxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.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 @@ -40,7 +40,7 @@ using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::sdbc; -OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) +OEvoabResultSetMetaData::OEvoabResultSetMetaData(const ::rtl::OUString& _aTableName) : m_aTableName(_aTableName), m_aEvoabFields() { @@ -117,7 +117,7 @@ sal_Bool SAL_CALL OEvoabResultSetMetaData::isCaseSensitive( sal_Int32 /*nColumnN ::rtl::OUString SAL_CALL OEvoabResultSetMetaData::getColumnLabel( sal_Int32 nColumnNum ) throw(SQLException, RuntimeException) { sal_uInt32 nField = m_aEvoabFields[nColumnNum - 1]; - const ColumnProperty *pSpecs = getField(nField); + const ColumnProperty *pSpecs = getField(nField); GParamSpec *pSpec = pSpecs->pField; rtl::OUString aLabel; diff --git a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx b/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx index 29e432737dac..6906549dece9 100644 --- a/connectivity/source/drivers/evoab2/NResultSetMetaData.hxx +++ b/connectivity/source/drivers/evoab2/NResultSetMetaData.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 @@ -26,8 +26,8 @@ * ************************************************************************/ -#ifndef _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ -#define _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ +#ifndef _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ +#define _CONNECTIVITY_EVOAB_RESULTSETMETADATA_HXX_ #include <com/sun/star/sdbc/XResultSetMetaData.hpp> #include <cppuhelper/implbase1.hxx> @@ -43,7 +43,7 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OEvoabResultSetMetaData : public OResultSetMetaData_BASE + class OEvoabResultSetMetaData : public OResultSetMetaData_BASE { ::rtl::OUString m_aTableName; ::std::vector<sal_Int32> m_aEvoabFields; @@ -55,12 +55,12 @@ namespace connectivity void setEvoabFields(const ::rtl::Reference<connectivity::OSQLColumns> &xColumns) throw(::com::sun::star::sdbc::SQLException); inline sal_uInt32 fieldAtColumn(sal_Int32 columnIndex) const { return m_aEvoabFields[columnIndex - 1]; } - inline sal_Int32 getFieldSize() const + inline sal_Int32 getFieldSize() const {return m_aEvoabFields.size();} /// Avoid ambigous cast error from the compiler. inline operator ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData > () throw() { return this; } - + virtual sal_Int32 SAL_CALL getColumnCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isAutoIncrement( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual sal_Bool SAL_CALL isCaseSensitive( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/evoab2/NServices.cxx b/connectivity/source/drivers/evoab2/NServices.cxx index cfdce80a9885..e01013fdde1c 100644 --- a/connectivity/source/drivers/evoab2/NServices.cxx +++ b/connectivity/source/drivers/evoab2/NServices.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 ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; diff --git a/connectivity/source/drivers/evoab2/NStatement.cxx b/connectivity/source/drivers/evoab2/NStatement.cxx index af914aae7e87..43bbaf2fcfa4 100644 --- a/connectivity/source/drivers/evoab2/NStatement.cxx +++ b/connectivity/source/drivers/evoab2/NStatement.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 @@ -139,7 +139,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OCommonStatement::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 )); diff --git a/connectivity/source/drivers/evoab2/NStatement.hxx b/connectivity/source/drivers/evoab2/NStatement.hxx index d12956e96008..b5adfeb0a761 100644 --- a/connectivity/source/drivers/evoab2/NStatement.hxx +++ b/connectivity/source/drivers/evoab2/NStatement.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 @@ -160,20 +160,20 @@ namespace connectivity ::com::sun::star::uno::WeakReference< ::com::sun::star::sdbc::XResultSet> m_xResultSet; // The last ResultSet created OEvoabResultSet *m_pResultSet; OEvoabConnection *m_pConnection; - connectivity::OSQLParser m_aParser; + connectivity::OSQLParser m_aParser; connectivity::OSQLParseTreeIterator m_aSQLIterator; connectivity::OSQLParseNode *m_pParseTree; // <properties> - ::rtl::OUString m_aCursorName; - sal_Int32 m_nMaxFieldSize; - sal_Int32 m_nMaxRows; - sal_Int32 m_nQueryTimeOut; - sal_Int32 m_nFetchSize; - sal_Int32 m_nResultSetType; - sal_Int32 m_nFetchDirection; - sal_Int32 m_nResultSetConcurrency; - sal_Bool m_bEscapeProcessing; + ::rtl::OUString m_aCursorName; + sal_Int32 m_nMaxFieldSize; + sal_Int32 m_nMaxRows; + sal_Int32 m_nQueryTimeOut; + sal_Int32 m_nFetchSize; + sal_Int32 m_nResultSetType; + sal_Int32 m_nFetchDirection; + sal_Int32 m_nResultSetConcurrency; + sal_Bool m_bEscapeProcessing; // </properties> ::cppu::OBroadcastHelper& rBHelper; diff --git a/connectivity/source/drivers/evoab2/NTable.cxx b/connectivity/source/drivers/evoab2/NTable.cxx index 3d4538401f65..30807ab4f50a 100644 --- a/connectivity/source/drivers/evoab2/NTable.cxx +++ b/connectivity/source/drivers/evoab2/NTable.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/evoab2/NTable.hxx b/connectivity/source/drivers/evoab2/NTable.hxx index 8843f5fc157c..169191d63032 100644 --- a/connectivity/source/drivers/evoab2/NTable.hxx +++ b/connectivity/source/drivers/evoab2/NTable.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 OEvoabConnection* m_pConnection; public: - OEvoabTable( sdbcx::OCollection* _pTables, + OEvoabTable( sdbcx::OCollection* _pTables, OEvoabConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/evoab2/NTables.cxx b/connectivity/source/drivers/evoab2/NTables.cxx index 88bce2c7d869..a41d13db5a2a 100644 --- a/connectivity/source/drivers/evoab2/NTables.cxx +++ b/connectivity/source/drivers/evoab2/NTables.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/evoab2/NTables.hxx b/connectivity/source/drivers/evoab2/NTables.hxx index 8654eb83997d..001454a18dd3 100644 --- a/connectivity/source/drivers/evoab2/NTables.hxx +++ b/connectivity/source/drivers/evoab2/NTables.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/evoab2/evoab.xml b/connectivity/source/drivers/evoab2/evoab.xml index f0abcc963b8d..fbf309cbf03c 100644 --- a/connectivity/source/drivers/evoab2/evoab.xml +++ b/connectivity/source/drivers/evoab2/evoab.xml @@ -11,7 +11,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbc.Driver</supported-service> - <service-dependency> ... </service-dependency> + <service-dependency> ... </service-dependency> </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> diff --git a/connectivity/source/drivers/evoab2/evoab2.xcu b/connectivity/source/drivers/evoab2/evoab2.xcu index a7c81d9c75e8..bda1fb8648f9 100755 --- a/connectivity/source/drivers/evoab2/evoab2.xcu +++ b/connectivity/source/drivers/evoab2/evoab2.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 @@ -49,7 +49,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Evolution LDAP</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> |