diff options
Diffstat (limited to 'connectivity/source/drivers/hsqldb')
27 files changed, 149 insertions, 149 deletions
diff --git a/connectivity/source/drivers/hsqldb/HCatalog.cxx b/connectivity/source/drivers/hsqldb/HCatalog.cxx index a1cb584b8bf6..2412ed906ca3 100644 --- a/connectivity/source/drivers/hsqldb/HCatalog.cxx +++ b/connectivity/source/drivers/hsqldb/HCatalog.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 @@ -71,7 +71,7 @@ void OHCatalog::refreshTables() Sequence< ::rtl::OUString > sTableTypes(2); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - + refreshObjects(sTableTypes,aVector); if ( m_pTables ) @@ -149,7 +149,7 @@ Sequence< Type > SAL_CALL OHCatalog::getTypes( ) throw(RuntimeException) { Sequence< Type > aTypes = OCatalog::getTypes(); ::std::vector<Type> aOwnTypes; - aOwnTypes.reserve(aTypes.getLength()); + aOwnTypes.reserve(aTypes.getLength()); const Type* pBegin = aTypes.getConstArray(); const Type* pEnd = pBegin + aTypes.getLength(); for(;pBegin != pEnd;++pBegin) diff --git a/connectivity/source/drivers/hsqldb/HColumns.cxx b/connectivity/source/drivers/hsqldb/HColumns.cxx index c1a640ec4036..c8d83e0d2b4e 100644 --- a/connectivity/source/drivers/hsqldb/HColumns.cxx +++ b/connectivity/source/drivers/hsqldb/HColumns.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 @@ -43,7 +43,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent +OHSQLColumns::OHSQLColumns( ::cppu::OWeakObject& _rParent ,sal_Bool _bCase ,::osl::Mutex& _rMutex ,const TStringVector &_rVector @@ -58,8 +58,8 @@ Reference< XPropertySet > OHSQLColumns::createDescriptor() } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -OHSQLColumn::OHSQLColumn( sal_Bool _bCase) - : connectivity::sdbcx::OColumn( _bCase ) +OHSQLColumn::OHSQLColumn( sal_Bool _bCase) + : connectivity::sdbcx::OColumn( _bCase ) { construct(); } @@ -67,7 +67,7 @@ OHSQLColumn::OHSQLColumn( sal_Bool _bCase) void OHSQLColumn::construct() { m_sAutoIncrement = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("IDENTITY")); - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_AUTOINCREMENTCREATION),PROPERTY_ID_AUTOINCREMENTCREATION,0,&m_sAutoIncrement, ::getCppuType(&m_sAutoIncrement)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OHSQLColumn::createArrayHelper( sal_Int32 /*_nId*/ ) const diff --git a/connectivity/source/drivers/hsqldb/HConnection.cxx b/connectivity/source/drivers/hsqldb/HConnection.cxx index 07fc4ec5e00a..543e6b39328d 100644 --- a/connectivity/source/drivers/hsqldb/HConnection.cxx +++ b/connectivity/source/drivers/hsqldb/HConnection.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 @@ -170,7 +170,7 @@ namespace connectivity { namespace hsqldb void SAL_CALL OHsqlConnection::flush( ) throw (RuntimeException) { MethodGuard aGuard( *this ); - + try { if ( m_xConnection.is() ) diff --git a/connectivity/source/drivers/hsqldb/HDriver.cxx b/connectivity/source/drivers/hsqldb/HDriver.cxx index 583c33112caa..c551312d0cdc 100644 --- a/connectivity/source/drivers/hsqldb/HDriver.cxx +++ b/connectivity/source/drivers/hsqldb/HDriver.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 @@ -260,7 +260,7 @@ namespace connectivity makeAny( lcl_getPermittedJavaMethods_nothrow( m_xFactory ) ) ); aProperties.put( "SystemProperties", Sequence< NamedValue >( &aPermittedClasses, 1 ) ); - + const ::rtl::OUString sProperties( RTL_CONSTASCII_USTRINGPARAM( "properties" ) ); ::rtl::OUString sMessage; try @@ -282,7 +282,7 @@ namespace connectivity const sal_Int32 nMajor = sLine.GetToken(0,'.').ToInt32(); const sal_Int32 nMinor = sLine.GetToken(1,'.').ToInt32(); const sal_Int32 nMicro = sLine.GetToken(2,'.').ToInt32(); - if ( nMajor > 1 + if ( nMajor > 1 || ( nMajor == 1 && nMinor > 8 ) || ( nMajor == 1 && nMinor == 8 && nMicro > 0 ) ) { @@ -469,7 +469,7 @@ namespace connectivity const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); ::dbtools::throwGenericSQLException(sMessage ,*this); } - + return getDataDefinitionByConnection(connect(url,info)); } @@ -882,7 +882,7 @@ namespace connectivity //------------------------------------------------------------------ //------------------------------------------------------------------ //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HStorage.hxx b/connectivity/source/drivers/hsqldb/HStorage.hxx index cd7e94b44bf0..f13dc3be283b 100644 --- a/connectivity/source/drivers/hsqldb/HStorage.hxx +++ b/connectivity/source/drivers/hsqldb/HStorage.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,43 +42,43 @@ #include <comphelper/broadcasthelper.hxx> -#define DECLARE_SERVICE_INFO_STATIC() \ - DECLARE_SERVICE_INFO(); \ - static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ - static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ - SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ +#define DECLARE_SERVICE_INFO_STATIC() \ + DECLARE_SERVICE_INFO(); \ + static ::rtl::OUString SAL_CALL getImplementationName_Static( ) throw (::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL getSupportedServiceNames_Static( ) throw(::com::sun::star::uno::RuntimeException); \ + static ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > \ + SAL_CALL Create(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >&) \ namespace connectivity { namespace hsqldb { - typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::io::XStream - , ::com::sun::star::io::XInputStream - , ::com::sun::star::io::XOutputStream - , ::com::sun::star::io::XSeekable - , ::com::sun::star::lang::XInitialization - , ::com::sun::star::lang::XServiceInfo> OStorage_Base; + typedef ::cppu::WeakComponentImplHelper6< ::com::sun::star::io::XStream + , ::com::sun::star::io::XInputStream + , ::com::sun::star::io::XOutputStream + , ::com::sun::star::io::XSeekable + , ::com::sun::star::lang::XInitialization + , ::com::sun::star::lang::XServiceInfo> OStorage_Base; class OStorage : public ::comphelper::OBaseMutex ,public OStorage_Base { - ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; - ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentSubStorageSupplier> m_xDS; + ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xServiceFactory; + ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentSubStorageSupplier> m_xDS; - ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> m_xStorge; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xIn; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOut; - ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeek; + ::com::sun::star::uno::Reference< ::com::sun::star::embed::XStorage> m_xStorge; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XStream > m_xStream; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XInputStream > m_xIn; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XOutputStream > m_xOut; + ::com::sun::star::uno::Reference< ::com::sun::star::io::XSeekable > m_xSeek; - OStorage(); // never implemented - OStorage(const OStorage&); // never implemented - int operator= (const OStorage&); // never implemented + OStorage(); // never implemented + OStorage(const OStorage&); // never implemented + int operator= (const OStorage&); // never implemented OStorage( - const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); + const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory); protected: /** this function is called upon disposing the component */ diff --git a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx b/connectivity/source/drivers/hsqldb/HStorageAccess.cxx index 1ce47beb572f..b4a898275b94 100644 --- a/connectivity/source/drivers/hsqldb/HStorageAccess.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageAccess.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 @@ -237,7 +237,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js jsize nLen = env->GetArrayLength(buffer); if ( nLen < len || len <= 0 ) { - ThrowException( env, + ThrowException( env, "java/io/IOException", "len is greater or equal to the buffer size"); return -1; @@ -265,7 +265,7 @@ jint read_from_storage_stream_into_buffer( JNIEnv * env, jobject /*obj_this*/,js #endif return nBytesRead; } - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); return -1; @@ -354,7 +354,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_NativeStor #endif return nRet; } - ThrowException( env, + ThrowException( env, "java/io/IOException", "No InputStream"); return -1; @@ -450,7 +450,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst { Sequence< ::sal_Int8 > aData(buf + off,len); env->ReleaseByteArrayElements(buffer, buf, JNI_ABORT); - xOut->writeBytes(aData); + xOut->writeBytes(aData); #ifdef HSQLDB_DBG if ( logger ) logger->write( aData.getConstArray(), len ); @@ -459,7 +459,7 @@ void write_to_storage_stream_from_buffer( JNIEnv* env, jobject /*obj_this*/, jst } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "No OutputStream"); } @@ -518,7 +518,7 @@ void write_to_storage_stream( JNIEnv* env, jobject /*obj_this*/, jstring name, j } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "No OutputStream"); } diff --git a/connectivity/source/drivers/hsqldb/HStorageMap.cxx b/connectivity/source/drivers/hsqldb/HStorageMap.cxx index 9f5a1dbd44b7..72722d5645f3 100644 --- a/connectivity/source/drivers/hsqldb/HStorageMap.cxx +++ b/connectivity/source/drivers/hsqldb/HStorageMap.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 @@ -355,7 +355,7 @@ namespace connectivity env->ThrowNew(env->FindClass("java/io/IOException"), cstr.getStr()); } //........................................................................ - } // namespace hsqldb + } // namespace hsqldb //........................................................................ //........................................................................ } diff --git a/connectivity/source/drivers/hsqldb/HTable.cxx b/connectivity/source/drivers/hsqldb/HTable.cxx index 3d4373542e08..8b426adfaa75 100644 --- a/connectivity/source/drivers/hsqldb/HTable.cxx +++ b/connectivity/source/drivers/hsqldb/HTable.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 @@ -64,24 +64,24 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, - const Reference< XConnection >& _xConnection) +OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, + const Reference< XConnection >& _xConnection) :OTableHelper(_pTables,_xConnection,sal_True) { // we create a new table here, so we should have all the rights or ;-) - m_nPrivileges = Privilege::DROP | - Privilege::REFERENCE | - Privilege::ALTER | - Privilege::CREATE | - Privilege::READ | - Privilege::DELETE | - Privilege::UPDATE | - Privilege::INSERT | + m_nPrivileges = Privilege::DROP | + Privilege::REFERENCE | + Privilege::ALTER | + Privilege::CREATE | + Privilege::READ | + Privilege::DELETE | + Privilege::UPDATE | + Privilege::INSERT | Privilege::SELECT; construct(); } // ------------------------------------------------------------------------- -OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, +OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const Reference< XConnection >& _xConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, @@ -89,7 +89,7 @@ OHSQLTable::OHSQLTable( sdbcx::OCollection* _pTables, const ::rtl::OUString& _SchemaName, const ::rtl::OUString& _CatalogName, sal_Int32 _nPrivileges - ) : OTableHelper( _pTables, + ) : OTableHelper( _pTables, _xConnection, sal_True, _Name, @@ -106,7 +106,7 @@ void OHSQLTable::construct() { OTableHelper::construct(); if ( !isNew() ) - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRIVILEGES), PROPERTY_ID_PRIVILEGES,PropertyAttribute::READONLY,&m_nPrivileges, ::getCppuType(&m_nPrivileges)); } // ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper* OHSQLTable::createArrayHelper( sal_Int32 /*_nId*/ ) const @@ -188,26 +188,26 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con ::dbtools::OPropertyMap& rProp = OMetaConnection::getPropMap(); // type/typename - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sOldTypeName; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nOldType; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPE)) >>= nNewType; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME)) >>= sOldTypeName; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_TYPENAME))>>= sNewTypeName; // and precsions and scale - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION)) >>= nOldPrec; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_PRECISION))>>= nNewPrec; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nOldScale; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_SCALE)) >>= nNewScale; // second: check the "is nullable" value sal_Int32 nOldNullable = 0,nNewNullable = 0; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nOldNullable; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISNULLABLE)) >>= nNewNullable; // check also the auto_increment sal_Bool bOldAutoIncrement = sal_False,bAutoIncrement = sal_False; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; - descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bOldAutoIncrement; + descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_ISAUTOINCREMENT)) >>= bAutoIncrement; // now we should look if the name of the column changed ::rtl::OUString sNewColumnName; @@ -228,10 +228,10 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con if ( nOldType != nNewType || sOldTypeName != sNewTypeName - || nOldPrec != nNewPrec - || nOldScale != nNewScale - || nNewNullable != nOldNullable - || bOldAutoIncrement != bAutoIncrement ) + || nOldPrec != nNewPrec + || nOldScale != nNewScale + || nNewNullable != nOldNullable + || bOldAutoIncrement != bAutoIncrement ) { // special handling because they change the type names to distinguish // if a column should be an auto_incmrement one @@ -244,7 +244,7 @@ void SAL_CALL OHSQLTable::alterColumnByName( const ::rtl::OUString& colName, con // third: check the default values ::rtl::OUString sNewDefault,sOldDefault; - xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; + xProp->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sOldDefault; descriptor->getPropertyValue(rProp.getNameByIndex(PROPERTY_ID_DEFAULTVALUE)) >>= sNewDefault; if(sOldDefault.getLength()) diff --git a/connectivity/source/drivers/hsqldb/HTables.cxx b/connectivity/source/drivers/hsqldb/HTables.cxx index 44ce6dfbecc9..ea2521a633b8 100644 --- a/connectivity/source/drivers/hsqldb/HTables.cxx +++ b/connectivity/source/drivers/hsqldb/HTables.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -70,7 +70,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Sequence< ::rtl::OUString > sTableTypes(3); sTableTypes[0] = s_sTableTypeView; sTableTypes[1] = s_sTableTypeTable; - sTableTypes[2] = s_sAll; // just to be sure to include anything else .... + sTableTypes[2] = s_sAll; // just to be sure to include anything else .... Any aCatalog; if ( sCatalog.getLength() ) diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx b/connectivity/source/drivers/hsqldb/HTerminateListener.cxx index 070d5e8be5cb..b2f23d8d5119 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.cxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.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 @@ -28,7 +28,7 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_connectivity.hxx" - + #include "HTerminateListener.hxx" #include "hsqldb/HDriver.hxx" @@ -61,7 +61,7 @@ throw( RuntimeException ) } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx b/connectivity/source/drivers/hsqldb/HTerminateListener.hxx index b8af49d66dc8..681985951e49 100644 --- a/connectivity/source/drivers/hsqldb/HTerminateListener.hxx +++ b/connectivity/source/drivers/hsqldb/HTerminateListener.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 namespace hsqldb { class ODriverDelegator; - class OConnectionController : public ::cppu::WeakImplHelper1< + class OConnectionController : public ::cppu::WeakImplHelper1< ::com::sun::star::frame::XTerminateListener > { ODriverDelegator* m_pDriver; @@ -60,7 +60,7 @@ namespace connectivity }; } //........................................................................ -} // namespace connectivity +} // namespace connectivity //........................................................................ #endif // CONNECTIVITY_HSQLDB_TERMINATELISTENER_HXX diff --git a/connectivity/source/drivers/hsqldb/HTools.cxx b/connectivity/source/drivers/hsqldb/HTools.cxx index f3849359f80f..8f35c9246aeb 100644 --- a/connectivity/source/drivers/hsqldb/HTools.cxx +++ b/connectivity/source/drivers/hsqldb/HTools.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/hsqldb/HUser.cxx b/connectivity/source/drivers/hsqldb/HUser.cxx index bfc9d5a44144..840e54d3f6eb 100644 --- a/connectivity/source/drivers/hsqldb/HUser.cxx +++ b/connectivity/source/drivers/hsqldb/HUser.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 @@ -47,7 +47,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; // ------------------------------------------------------------------------- -OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) +OHSQLUser::OHSQLUser( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : connectivity::sdbcx::OUser(sal_True) ,m_xConnection(_xConnection) { construct(); @@ -65,15 +65,15 @@ void OHSQLUser::refreshGroups() { } // ------------------------------------------------------------------------- -OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) +OUserExtend::OUserExtend( const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection) : OHSQLUser(_xConnection) { construct(); } // ------------------------------------------------------------------------- -typedef connectivity::sdbcx::OUser OUser_TYPEDEF; +typedef connectivity::sdbcx::OUser OUser_TYPEDEF; void OUserExtend::construct() { - registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); + registerProperty(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PASSWORD), PROPERTY_ID_PASSWORD,0,&m_Password,::getCppuType(reinterpret_cast< ::rtl::OUString*>(NULL))); } // ----------------------------------------------------------------------------- cppu::IPropertyArrayHelper* OUserExtend::createArrayHelper() const @@ -118,7 +118,7 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, xRes = xMeta->getTablePrivileges(aCatalog,sSchema,sTable); } break; - + case PrivilegeObject::COLUMN: { Any aCatalog; @@ -128,29 +128,29 @@ void OHSQLUser::findPrivilegesAndGrantPrivileges(const ::rtl::OUString& objName, } break; } - + if ( xRes.is() ) { - static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); - static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); - static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); - static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); - static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); - static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); - static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); + static const ::rtl::OUString sSELECT = ::rtl::OUString::createFromAscii("SELECT"); + static const ::rtl::OUString sINSERT = ::rtl::OUString::createFromAscii("INSERT"); + static const ::rtl::OUString sUPDATE = ::rtl::OUString::createFromAscii("UPDATE"); + static const ::rtl::OUString sDELETE = ::rtl::OUString::createFromAscii("DELETE"); + static const ::rtl::OUString sREAD = ::rtl::OUString::createFromAscii("READ"); + static const ::rtl::OUString sCREATE = ::rtl::OUString::createFromAscii("CREATE"); + static const ::rtl::OUString sALTER = ::rtl::OUString::createFromAscii("ALTER"); static const ::rtl::OUString sREFERENCE = ::rtl::OUString::createFromAscii("REFERENCE"); - static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); - static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); + static const ::rtl::OUString sDROP = ::rtl::OUString::createFromAscii("DROP"); + static const ::rtl::OUString sYes = ::rtl::OUString::createFromAscii("YES"); nRightsWithGrant = nRights = 0; Reference<XRow> xCurrentRow(xRes,UNO_QUERY); while( xCurrentRow.is() && xRes->next() ) { - ::rtl::OUString sGrantee = xCurrentRow->getString(5); - ::rtl::OUString sPrivilege = xCurrentRow->getString(6); - ::rtl::OUString sGrantable = xCurrentRow->getString(7); - + ::rtl::OUString sGrantee = xCurrentRow->getString(5); + ::rtl::OUString sPrivilege = xCurrentRow->getString(6); + ::rtl::OUString sGrantable = xCurrentRow->getString(7); + if (!m_Name.equalsIgnoreAsciiCase(sGrantee)) continue; @@ -217,7 +217,7 @@ sal_Int32 SAL_CALL OHSQLUser::getGrantablePrivileges( const ::rtl::OUString& obj { ::osl::MutexGuard aGuard(m_aMutex); checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed); - + sal_Int32 nRights,nRightsWithGrant; findPrivilegesAndGrantPrivileges(objName,objType,nRights,nRightsWithGrant); return nRightsWithGrant; @@ -231,7 +231,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In const ::rtl::OUString sError( aResources.getResourceString(STR_PRIVILEGE_NOT_GRANTED)); ::dbtools::throwGenericSQLException(sError,*this); } // if ( objType != PrivilegeObject::TABLE ) - + ::osl::MutexGuard aGuard(m_aMutex); @@ -246,7 +246,7 @@ void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, sal_In sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" TO "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -276,7 +276,7 @@ void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, sal_I sGrant += ::dbtools::quoteTableName(xMeta,objName,::dbtools::eInDataManipulation); sGrant += ::rtl::OUString::createFromAscii(" FROM "); sGrant += m_Name; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if(xStmt.is()) xStmt->execute(sGrant); @@ -296,7 +296,7 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, sAlterPwd += newPassword; sAlterPwd += ::rtl::OUString::createFromAscii("')") ; - + Reference<XStatement> xStmt = m_xConnection->createStatement(); if ( xStmt.is() ) { @@ -310,35 +310,35 @@ void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& /*oldPassword*/, ::rtl::OUString sPrivs; if((nRights & Privilege::INSERT) == Privilege::INSERT) sPrivs += ::rtl::OUString::createFromAscii("INSERT"); - + if((nRights & Privilege::DELETE) == Privilege::DELETE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("DELETE"); } - + if((nRights & Privilege::UPDATE) == Privilege::UPDATE) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("UPDATE"); } - + if((nRights & Privilege::ALTER) == Privilege::ALTER) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("ALTER"); } - + if((nRights & Privilege::SELECT) == Privilege::SELECT) { if(sPrivs.getLength()) sPrivs += ::rtl::OUString::createFromAscii(","); sPrivs += ::rtl::OUString::createFromAscii("SELECT"); } - + if((nRights & Privilege::REFERENCE) == Privilege::REFERENCE) { if(sPrivs.getLength()) diff --git a/connectivity/source/drivers/hsqldb/HUsers.cxx b/connectivity/source/drivers/hsqldb/HUsers.cxx index e9c2ead9d733..6e91008f1dc7 100644 --- a/connectivity/source/drivers/hsqldb/HUsers.cxx +++ b/connectivity/source/drivers/hsqldb/HUsers.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 @@ -44,7 +44,7 @@ using namespace connectivity; using namespace connectivity::hsqldb; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -54,7 +54,7 @@ OUsers::OUsers( ::cppu::OWeakObject& _rParent, ::osl::Mutex& _rMutex, const TStringVector &_rVector, const ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XConnection >& _xConnection, - connectivity::sdbcx::IRefreshableUsers* _pParent) + connectivity::sdbcx::IRefreshableUsers* _pParent) : sdbcx::OCollection(_rParent,sal_True,_rMutex,_rVector) ,m_xConnection(_xConnection) ,m_pParent(_pParent) @@ -81,8 +81,8 @@ Reference< XPropertySet > OUsers::createDescriptor() // XAppend sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const Reference< XPropertySet >& descriptor ) { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("GRANT USAGE ON * TO "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sUserName( _rForName ); aSql += ::dbtools::quoteName(aQuote,sUserName) + ::rtl::OUString::createFromAscii(" @\"%\" "); @@ -107,8 +107,8 @@ sdbcx::ObjectType OUsers::appendObject( const ::rtl::OUString& _rForName, const void OUsers::dropObject(sal_Int32 /*nPos*/,const ::rtl::OUString _sElementName) { { - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); - ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("REVOKE ALL ON * FROM "); + ::rtl::OUString aQuote = m_xConnection->getMetaData()->getIdentifierQuoteString( ); aSql += ::dbtools::quoteName(aQuote,_sElementName); Reference< XStatement > xStmt = m_xConnection->createStatement( ); diff --git a/connectivity/source/drivers/hsqldb/HView.cxx b/connectivity/source/drivers/hsqldb/HView.cxx index 86f0ddfcca46..1596ee70259f 100644 --- a/connectivity/source/drivers/hsqldb/HView.cxx +++ b/connectivity/source/drivers/hsqldb/HView.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/hsqldb/HViews.cxx b/connectivity/source/drivers/hsqldb/HViews.cxx index 1ead660ac9be..2c8c429d87dd 100644 --- a/connectivity/source/drivers/hsqldb/HViews.cxx +++ b/connectivity/source/drivers/hsqldb/HViews.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 @@ -76,8 +76,8 @@ sdbcx::ObjectType HViews::createObject(const ::rtl::OUString& _rName) ::rtl::OUString sCatalog,sSchema,sTable; ::dbtools::qualifiedNameComponents(m_xMetaData, _rName, - sCatalog, - sSchema, + sCatalog, + sSchema, sTable, ::dbtools::eInDataManipulation); return new HView( m_xConnection, isCaseSensitive(), sSchema, sTable ); @@ -120,10 +120,10 @@ void HViews::dropObject(sal_Int32 _nPos,const ::rtl::OUString /*_sElementName*/) if (!bIsNew) { ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("DROP VIEW"); - + Reference<XPropertySet> xProp(xObject,UNO_QUERY); aSql += ::dbtools::composeTableName( m_xMetaData, xProp, ::dbtools::eInTableDefinitions, false, false, true ); - + Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection(); Reference< XStatement > xStmt = xConnection->createStatement( ); xStmt->execute(aSql); @@ -142,8 +142,8 @@ void HViews::createView( const Reference< XPropertySet >& descriptor ) { Reference<XConnection> xConnection = static_cast<OHCatalog&>(m_rParent).getConnection(); - ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); - ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); + ::rtl::OUString aSql = ::rtl::OUString::createFromAscii("CREATE VIEW "); + ::rtl::OUString aQuote = xConnection->getMetaData()->getIdentifierQuoteString( ); ::rtl::OUString sSchema,sCommand; aSql += ::dbtools::composeTableName( m_xMetaData, descriptor, ::dbtools::eInTableDefinitions, false, false, true ); diff --git a/connectivity/source/drivers/hsqldb/Hservices.cxx b/connectivity/source/drivers/hsqldb/Hservices.cxx index fd21de93b1d9..12fd647576ed 100644 --- a/connectivity/source/drivers/hsqldb/Hservices.cxx +++ b/connectivity/source/drivers/hsqldb/Hservices.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 @@ -117,8 +117,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/hsqldb/StorageFileAccess.cxx b/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx index 5a51e6d9bb7f..532d7ca0de97 100644 --- a/connectivity/source/drivers/hsqldb/StorageFileAccess.cxx +++ b/connectivity/source/drivers/hsqldb/StorageFileAccess.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/hsqldb/StorageNativeInputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx index b9b78a675936..be64f013d71b 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeInputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeInputStream.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 @@ -153,7 +153,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNa #endif if ( n < 0 ) - ThrowException( env, + ThrowException( env, "java/io/IOException", "n < 0"); @@ -198,7 +198,7 @@ SAL_DLLPUBLIC_EXPORT jlong JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNa } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); } @@ -240,7 +240,7 @@ SAL_DLLPUBLIC_EXPORT jint JNICALL Java_com_sun_star_sdbcx_comp_hsqldb_StorageNat } else { - ThrowException( env, + ThrowException( env, "java/io/IOException", "Stream is not valid"); } diff --git a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx index 4ef88ff7bdca..36ec342e3291 100644 --- a/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.cxx +++ b/connectivity/source/drivers/hsqldb/StorageNativeOutputStream.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/hsqldb/accesslog.cxx b/connectivity/source/drivers/hsqldb/accesslog.cxx index a80350eef30c..111e1da186c1 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.cxx +++ b/connectivity/source/drivers/hsqldb/accesslog.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/hsqldb/accesslog.hxx b/connectivity/source/drivers/hsqldb/accesslog.hxx index d29e67c2aa37..f10ae77d4e3e 100644 --- a/connectivity/source/drivers/hsqldb/accesslog.hxx +++ b/connectivity/source/drivers/hsqldb/accesslog.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/hsqldb/hsqldb.map b/connectivity/source/drivers/hsqldb/hsqldb.map index b4fc53b320ef..a13f907752e6 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.map +++ b/connectivity/source/drivers/hsqldb/hsqldb.map @@ -19,7 +19,7 @@ UDK_3_0_0 { Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_readInt; Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_seek; Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_write; - Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt; + Java_com_sun_star_sdbcx_comp_hsqldb_NativeStorageAccess_writeInt; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_openStream; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2; Java_com_sun_star_sdbcx_comp_hsqldb_StorageNativeInputStream_read__Ljava_lang_String_2Ljava_lang_String_2_3BII; diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xcu b/connectivity/source/drivers/hsqldb/hsqldb.xcu index f97b5e357179..af9c34824263 100755 --- a/connectivity/source/drivers/hsqldb/hsqldb.xcu +++ b/connectivity/source/drivers/hsqldb/hsqldb.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 @@ -66,7 +66,7 @@ <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> </prop> - </node> + </node> <node oor:name="AutoIncrementIsPrimaryKey" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> diff --git a/connectivity/source/drivers/hsqldb/hsqldb.xml b/connectivity/source/drivers/hsqldb/hsqldb.xml index c456c253777d..f8e5c61af6de 100644 --- a/connectivity/source/drivers/hsqldb/hsqldb.xml +++ b/connectivity/source/drivers/hsqldb/hsqldb.xml @@ -12,7 +12,7 @@ <language>c++</language> <status value="final"/> <supported-service>com.sun.star.sdbcx.Driver</supported-service> - </component-description> + </component-description> <project-build-dependency>cppuhelper</project-build-dependency> <project-build-dependency>cppu</project-build-dependency> <project-build-dependency>sal</project-build-dependency> diff --git a/connectivity/source/drivers/hsqldb/hsqlui.hrc b/connectivity/source/drivers/hsqldb/hsqlui.hrc index fe20ec5eaf21..052b603a7256 100644 --- a/connectivity/source/drivers/hsqldb/hsqlui.hrc +++ b/connectivity/source/drivers/hsqldb/hsqlui.hrc @@ -1,7 +1,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/hsqldb/hsqlui.src b/connectivity/source/drivers/hsqldb/hsqlui.src index a2886c1a18cf..0e0189c5e278 100644 --- a/connectivity/source/drivers/hsqldb/hsqlui.src +++ b/connectivity/source/drivers/hsqldb/hsqlui.src @@ -1,7 +1,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 @@ If there were another possibility to ensure that the images are put into the repository, instead of creating a resource file for them, - then we would use this other way ... + then we would use this other way ... */ Image 1000 |