diff options
Diffstat (limited to 'dbaccess/source/sdbtools')
14 files changed, 43 insertions, 43 deletions
diff --git a/dbaccess/source/sdbtools/connection/connectiondependent.hxx b/dbaccess/source/sdbtools/connection/connectiondependent.hxx index ed756b98a76c..12aa55645211 100644 --- a/dbaccess/source/sdbtools/connection/connectiondependent.hxx +++ b/dbaccess/source/sdbtools/connection/connectiondependent.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 sdbtools //==================================================================== //= ConnectionDependentComponent //==================================================================== - class ConnectionDependentComponent + class ConnectionDependentComponent { private: mutable ::osl::Mutex m_aMutex; diff --git a/dbaccess/source/sdbtools/connection/connectiontools.cxx b/dbaccess/source/sdbtools/connection/connectiontools.cxx index 5f1e8153f278..cba20331f537 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.cxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.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 @@ -92,14 +92,14 @@ namespace sdbtools EntryGuard aGuard( *this ); return new TableName( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XObjectNames > SAL_CALL ConnectionTools::getObjectNames() throw (RuntimeException) { EntryGuard aGuard( *this ); return new ObjectNames( getContext(), getConnection() ); } - + //-------------------------------------------------------------------- Reference< XDataSourceMetaData > SAL_CALL ConnectionTools::getDataSourceMetaData() throw (RuntimeException) { @@ -130,7 +130,7 @@ namespace sdbtools { return getImplementationName_static(); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ConnectionTools::supportsService(const ::rtl::OUString & _ServiceName) throw (RuntimeException) { @@ -139,7 +139,7 @@ namespace sdbtools const ::rtl::OUString* end = aSupported.getConstArray() + aSupported.getLength(); return ::std::find( begin, end, _ServiceName ) != end; } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames() throw (RuntimeException) { @@ -151,7 +151,7 @@ namespace sdbtools { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.comp.dbaccess.ConnectionTools" ) ); } - + //-------------------------------------------------------------------- Sequence< ::rtl::OUString > SAL_CALL ConnectionTools::getSupportedServiceNames_static() { @@ -159,13 +159,13 @@ namespace sdbtools aSupported[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM( "com.sun.star.sdb.tools.ConnectionTools" ) ); return aSupported; } - + //-------------------------------------------------------------------- Reference< XInterface > SAL_CALL ConnectionTools::Create(const Reference< XComponentContext >& _rxContext ) { return *( new ConnectionTools( ::comphelper::ComponentContext( _rxContext ) ) ); } - + //-------------------------------------------------------------------- void SAL_CALL ConnectionTools::initialize(const Sequence< Any > & _rArguments) throw (RuntimeException, Exception) { diff --git a/dbaccess/source/sdbtools/connection/connectiontools.hxx b/dbaccess/source/sdbtools/connection/connectiontools.hxx index ed1372e5eb89..a85ade7020ca 100644 --- a/dbaccess/source/sdbtools/connection/connectiontools.hxx +++ b/dbaccess/source/sdbtools/connection/connectiontools.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/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx index ef76d96eed95..169230063d58 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.cxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.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/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx b/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx index 440b1f6c2c81..41f19047b2e8 100644 --- a/dbaccess/source/sdbtools/connection/datasourcemetadata.hxx +++ b/dbaccess/source/sdbtools/connection/datasourcemetadata.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/dbaccess/source/sdbtools/connection/objectnames.cxx b/dbaccess/source/sdbtools/connection/objectnames.cxx index 0b64bca252ef..d7a487289df8 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.cxx +++ b/dbaccess/source/sdbtools/connection/objectnames.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 @@ -200,7 +200,7 @@ namespace sdbtools if ( ( _rName.indexOf( (sal_Unicode)34 ) >= 0 ) // " || ( _rName.indexOf( (sal_Unicode)39 ) >= 0 ) // ' || ( _rName.indexOf( (sal_Unicode)96 ) >= 0 ) // - || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // + || ( _rName.indexOf( (sal_Unicode)145 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)146 ) >= 0 ) // || ( _rName.indexOf( (sal_Unicode)180 ) >= 0 ) // #86621# removed unparsable chars ) @@ -448,7 +448,7 @@ namespace sdbtools return sName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL ObjectNames::convertToSQLName( const ::rtl::OUString& Name ) throw (RuntimeException) { @@ -456,7 +456,7 @@ namespace sdbtools Reference< XDatabaseMetaData > xMeta( getConnection()->getMetaData(), UNO_QUERY_THROW ); return ::dbtools::convertName2SQLName( Name, xMeta->getExtraNameCharacters() ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameUsed( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -465,7 +465,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createExistenceCheck( getContext(), _CommandType, getConnection()) ); return !pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- ::sal_Bool SAL_CALL ObjectNames::isNameValid( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (IllegalArgumentException, RuntimeException) { @@ -474,7 +474,7 @@ namespace sdbtools PNameValidation pNameCheck( NameCheckFactory::createValidityCheck( getContext(), _CommandType, getConnection()) ); return pNameCheck->validateName( _Name ); } - + //-------------------------------------------------------------------- void SAL_CALL ObjectNames::checkNameForCreate( ::sal_Int32 _CommandType, const ::rtl::OUString& _Name ) throw (SQLException, RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/objectnames.hxx b/dbaccess/source/sdbtools/connection/objectnames.hxx index de2b95951c62..4a9609a0d064 100644 --- a/dbaccess/source/sdbtools/connection/objectnames.hxx +++ b/dbaccess/source/sdbtools/connection/objectnames.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/dbaccess/source/sdbtools/connection/tablename.cxx b/dbaccess/source/sdbtools/connection/tablename.cxx index 4d6357a88d1b..cc704122134e 100644 --- a/dbaccess/source/sdbtools/connection/tablename.cxx +++ b/dbaccess/source/sdbtools/connection/tablename.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 @@ -108,49 +108,49 @@ namespace sdbtools EntryGuard aGuard( *this ); return m_pImpl->sCatalog; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setCatalogName( const ::rtl::OUString& _catalogName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sCatalog = _catalogName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getSchemaName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sSchema; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setSchemaName( const ::rtl::OUString& _schemaName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sSchema = _schemaName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getTableName() throw (RuntimeException) { EntryGuard aGuard( *this ); return m_pImpl->sName; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTableName( const ::rtl::OUString& _tableName ) throw (RuntimeException) { EntryGuard aGuard( *this ); m_pImpl->sName = _tableName; } - + //-------------------------------------------------------------------- ::rtl::OUString SAL_CALL TableName::getNameForSelect() throw (RuntimeException) { EntryGuard aGuard( *this ); return composeTableNameForSelect( getConnection(), m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName ); } - + //-------------------------------------------------------------------- Reference< XPropertySet > SAL_CALL TableName::getTable() throw (NoSuchElementException, RuntimeException) { @@ -178,7 +178,7 @@ namespace sdbtools return xTable; } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setTable( const Reference< XPropertySet >& _table ) throw (IllegalArgumentException, RuntimeException) { @@ -208,7 +208,7 @@ namespace sdbtools throw IllegalArgumentException( e.Message, e.Context, 0 ); } } - + //-------------------------------------------------------------------- namespace { @@ -218,7 +218,7 @@ namespace sdbtools */ EComposeRule lcl_translateCompositionType_throw( sal_Int32 _nType ) { - struct + struct { sal_Int32 nCompositionType; EComposeRule eComposeRule; @@ -258,7 +258,7 @@ namespace sdbtools m_pImpl->sCatalog, m_pImpl->sSchema, m_pImpl->sName, _Quote, lcl_translateCompositionType_throw( _Type ) ); } - + //-------------------------------------------------------------------- void SAL_CALL TableName::setComposedName( const ::rtl::OUString& _ComposedName, ::sal_Int32 _Type ) throw (RuntimeException) { diff --git a/dbaccess/source/sdbtools/connection/tablename.hxx b/dbaccess/source/sdbtools/connection/tablename.hxx index d165fc8680fe..073a6ed34791 100644 --- a/dbaccess/source/sdbtools/connection/tablename.hxx +++ b/dbaccess/source/sdbtools/connection/tablename.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/dbaccess/source/sdbtools/inc/module_sdbt.hxx b/dbaccess/source/sdbtools/inc/module_sdbt.hxx index 938ec38c6aca..185d9b1adef9 100644 --- a/dbaccess/source/sdbtools/inc/module_sdbt.hxx +++ b/dbaccess/source/sdbtools/inc/module_sdbt.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/dbaccess/source/sdbtools/inc/sdbt_resource.hrc b/dbaccess/source/sdbtools/inc/sdbt_resource.hrc index 1a23ab206fd8..5b94f748b7ae 100644 --- a/dbaccess/source/sdbtools/inc/sdbt_resource.hrc +++ b/dbaccess/source/sdbtools/inc/sdbt_resource.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 @@ -33,7 +33,7 @@ #endif //------------------------------------------------------------------------------ -#define RID_SDBT_STRINGS_START RID_DBACCESS_START +#define RID_SDBT_STRINGS_START RID_DBACCESS_START //------------------------------------------------------------------------------ //- String-IDs diff --git a/dbaccess/source/sdbtools/misc/module_sdbt.cxx b/dbaccess/source/sdbtools/misc/module_sdbt.cxx index f84822c1d25a..e90999ced2be 100644 --- a/dbaccess/source/sdbtools/misc/module_sdbt.cxx +++ b/dbaccess/source/sdbtools/misc/module_sdbt.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/dbaccess/source/sdbtools/misc/sdbt_services.cxx b/dbaccess/source/sdbtools/misc/sdbt_services.cxx index dcea32927e21..06bfebaf2602 100644 --- a/dbaccess/source/sdbtools/misc/sdbt_services.cxx +++ b/dbaccess/source/sdbtools/misc/sdbt_services.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,8 +56,8 @@ extern "C" void SAL_CALL sdbt_initializeModule() //--------------------------------------------------------------------------------------- extern "C" void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** + const sal_Char **ppEnvTypeName, + uno_Environment ** ) { sdbt_initializeModule(); @@ -70,8 +70,8 @@ extern "C" sal_Bool SAL_CALL component_writeInfo( void* pRegistryKey ) { - if (pRegistryKey) - try + if (pRegistryKey) + try { return ::sdbtools::SdbtModule::getInstance().writeComponentInfos( static_cast<XMultiServiceFactory*>(pServiceManager), diff --git a/dbaccess/source/sdbtools/resource/sdbt_strings.src b/dbaccess/source/sdbtools/resource/sdbt_strings.src index bd6d7d49f5c1..f19a52c4b2c0 100644 --- a/dbaccess/source/sdbtools/resource/sdbt_strings.src +++ b/dbaccess/source/sdbtools/resource/sdbt_strings.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 |