diff options
Diffstat (limited to 'connectivity/source/drivers/mozab')
23 files changed, 510 insertions, 510 deletions
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index a4a288d1a70c..8fae349bfe70 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -24,7 +24,7 @@ #include <com/sun/star/sdbc/XResultSet.hpp> #include <cppuhelper/interfacecontainer.h> -// ------------------------------------------------------------------------- + using namespace connectivity::mozab; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; @@ -34,7 +34,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; using namespace ::cppu; -// ------------------------------------------------------------------------- + OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) ,m_pConnection(_pCon) ,m_xMetaData(m_pConnection->getMetaData( )) @@ -46,7 +46,7 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) // refreshUsers(); // osl_atomic_decrement( &m_refCount ); } -// ------------------------------------------------------------------------- + void OCatalog::refreshTables() { TStringVector aVector; @@ -70,19 +70,19 @@ void OCatalog::refreshTables() else m_pTables = new OTables(m_xMetaData,*this,m_aMutex,aVector); } -// ------------------------------------------------------------------------- + void OCatalog::refreshViews() { } -// ------------------------------------------------------------------------- + void OCatalog::refreshGroups() { } -// ------------------------------------------------------------------------- + void OCatalog::refreshUsers() { } -// ----------------------------------------------------------------------------- + // XTablesSupplier Reference< XNameAccess > SAL_CALL OCatalog::getTables( ) throw(RuntimeException) diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index df9254b3d6fc..18aa6ca90020 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -37,7 +37,7 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::beans; using namespace ::com::sun::star::container; -//------------------------------------------------------------------------------ + OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ) { static const sal_Char* s_pProgrammaticNames[] = @@ -87,7 +87,7 @@ OColumnAlias::OColumnAlias( const ::com::sun::star::uno::Reference< ::com::sun:: initialize( _rxORB ); } -//------------------------------------------------------------------------------ + void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxORB ) { // open our driver settings config node @@ -157,7 +157,7 @@ void OColumnAlias::initialize( const ::com::sun::star::uno::Reference< ::com::su } } -//------------------------------------------------------------------ + OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& _rAlias ) const { AliasMap::const_iterator pos = m_aAliasMap.find( _rAlias ); @@ -169,7 +169,7 @@ OString OColumnAlias::getProgrammaticNameOrFallbackToUTF8Alias( const OUString& return pos->second.programmaticAsciiName; } -//------------------------------------------------------------------ + bool OColumnAlias::isColumnSearchable( const OUString _alias ) const { OString sProgrammatic = getProgrammaticNameOrFallbackToUTF8Alias( _alias ); diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index a7c3b96c5758..452a34bece0a 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -83,12 +83,12 @@ sdbcx::ObjectType OColumns::createObject(const OUString& _rName) return xRet; } -// ------------------------------------------------------------------------- + void OColumns::impl_refresh() throw(RuntimeException) { m_pTable->refreshColumns(); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index dd4281a81bb5..53083fb4893b 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -34,7 +34,7 @@ namespace connectivity { namespace mozab { - //----------------------------------------------------------------- + Reference< XPropertySet > createDriverConfigNode( Reference< XMultiServiceFactory > _rxORB ) { Reference< XPropertySet > xNode; @@ -86,7 +86,7 @@ namespace connectivity return xNode; } - //----------------------------------------------------------------- + namespace { // a private helper to accessing the point where we store the reference @@ -98,19 +98,19 @@ namespace connectivity } } - //----------------------------------------------------------------- + void setMozabServiceFactory( const Reference< XMultiServiceFactory >& _rxFactory ) { accessFactoryStorage( ) = _rxFactory; } - //----------------------------------------------------------------- + const Reference< XMultiServiceFactory >& getMozabServiceFactory( ) { return accessFactoryStorage( ); } - //----------------------------------------------------------------- + OUString getDescription(const sal_Char* sNode,const OUString & sDefault) { OUString sPreferredName; @@ -143,7 +143,7 @@ namespace connectivity sDescription = sDefault; return sDescription; } - //----------------------------------------------------------------- + OUString getPreferredProfileName( ) { OUString sPreferredName; @@ -174,7 +174,7 @@ namespace connectivity //......................................................................... -//------------------------------------------------------------------------- + extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) { static sal_Bool bReadConfig = sal_False; @@ -187,7 +187,7 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) return sUserProfile.getStr(); } -//------------------------------------------------------------------------ + extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { static sal_Bool bReadConfig = sal_False; @@ -207,7 +207,7 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) return sPabDescription.getStr(); } -//------------------------------------------------------------------------- + extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { static sal_Bool bReadConfig = sal_False; @@ -227,7 +227,7 @@ extern "C" const sal_Char* SAL_CALL getHisDescription( void ) return sHisDescription.getStr(); } -//------------------------------------------------------------------------- + // MConfigAccess was invented to allow non-UNO parts access to the configuration. // Unfortunately, configuration access requires a XMultiServiceFactory - which the // mozilla side does not have. diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 8440d50d9770..708438f67612 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -54,13 +54,13 @@ extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL OMozabConnection_CreateInstance( using namespace dbtools; -//------------------------------------------------------------------------------ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; using namespace com::sun::star::sdbc; using namespace com::sun::star::sdbcx; -// -------------------------------------------------------------------------------- + namespace connectivity { namespace mozab { @@ -72,7 +72,7 @@ struct ConnectionImplData ::boost::shared_ptr< ::comphelper::OfficeResourceBundle > pResourceBundle; }; -// ----------------------------------------------------------------------------- + #ifdef __MINGW32__ extern "C" #endif @@ -88,13 +88,13 @@ const sal_Char* getSdbcScheme( SdbcScheme _eScheme ) } return NULL; } -// ----------------------------------------------------------------------------- + OUString OConnection::getDriverImplementationName() { return OUString(MOZAB_DRIVER_IMPL_NAME); } -// ----------------------------------------------------------------------------- + const sal_Char* getSchemeURI( MozillaScheme _eScheme ) { switch ( _eScheme ) @@ -108,7 +108,7 @@ const sal_Char* getSchemeURI( MozillaScheme _eScheme ) return NULL; } -// ----------------------------------------------------------------------------- + OConnection::OConnection(MozabDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) @@ -123,7 +123,7 @@ OConnection::OConnection(MozabDriver* _pDriver) m_pDriver->acquire(); } -//----------------------------------------------------------------------------- + OConnection::~OConnection() { acquire(); @@ -132,13 +132,13 @@ OConnection::~OConnection() m_pDriver->release(); m_pDriver = NULL; } -//----------------------------------------------------------------------------- + void SAL_CALL OConnection::release() throw() { relase_ChildImpl(); } -// ----------------------------------------------------------------------------- -//----------------------------------------------------------------------------- + + void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("IN OConnection::construct()" ); @@ -340,10 +340,10 @@ void OConnection::construct(const OUString& url,const Sequence< PropertyValue >& } // XServiceInfo -// -------------------------------------------------------------------------------- + IMPLEMENT_SERVICE_INFO(OConnection, "com.sun.star.sdbc.drivers.mozab.OConnection", "com.sun.star.sdbc.Connection") -// -------------------------------------------------------------------------------- + Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -355,7 +355,7 @@ Reference< XStatement > SAL_CALL OConnection::createStatement( ) throw(SQLExcep m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -372,7 +372,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const OU m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; } -// -------------------------------------------------------------------------------- + Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUString& _sSql ) throw(SQLException, RuntimeException) { OSL_UNUSED( _sSql ); @@ -380,7 +380,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareCall( const OUStrin OSL_TRACE("OConnection::prepareCall( %s )", OUtoCStr( _sSql ) ); return NULL; } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -389,12 +389,12 @@ OUString SAL_CALL OConnection::nativeSQL( const OUString& _sSql ) throw(SQLExcep return _sSql; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setAutoCommit( sal_Bool /*autoCommit*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setAutoCommit", *this ); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeException) { // you have to distinguish which if you are in autocommit mode or not @@ -402,17 +402,17 @@ sal_Bool SAL_CALL OConnection::getAutoCommit( ) throw(SQLException, RuntimeExce return sal_True; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::commit( ) throw(SQLException, RuntimeException) { // when you database does support transactions you should commit here } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::rollback( ) throw(SQLException, RuntimeException) { // same as commit but for the other case } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -420,7 +420,7 @@ sal_Bool SAL_CALL OConnection::isClosed( ) throw(SQLException, RuntimeException // just simple -> we are close when we are disposed that means someone called dispose(); (XComponent) return OConnection_BASE::rBHelper.bDisposed; } -// -------------------------------------------------------------------------------- + Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -437,51 +437,51 @@ Reference< XDatabaseMetaData > SAL_CALL OConnection::getMetaData( ) throw(SQLEx return xMetaData; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setReadOnly( sal_Bool /*readOnly*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setReadOnly", *this ); } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL OConnection::isReadOnly( ) throw(SQLException, RuntimeException) { // return if your connection to readonly return sal_False; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setCatalog( const OUString& /*catalog*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setCatalog", *this ); } -// -------------------------------------------------------------------------------- + OUString SAL_CALL OConnection::getCatalog( ) throw(SQLException, RuntimeException) { // return your current catalog return OUString(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setTransactionIsolation( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTransactionIsolation", *this ); } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL OConnection::getTransactionIsolation( ) throw(SQLException, RuntimeException) { // please have a look at @see com.sun.star.sdbc.TransactionIsolation return TransactionIsolation::NONE; } -// -------------------------------------------------------------------------------- + Reference< ::com::sun::star::container::XNameAccess > SAL_CALL OConnection::getTypeMap( ) throw(SQLException, RuntimeException) { // if your driver has special database types you can return it here return NULL; } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::setTypeMap( const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XConnection::setTypeMap", *this ); } -// -------------------------------------------------------------------------------- + // XCloseable void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) { @@ -493,19 +493,19 @@ void SAL_CALL OConnection::close( ) throw(SQLException, RuntimeException) } dispose(); } -// -------------------------------------------------------------------------------- + // XWarningsSupplier Any SAL_CALL OConnection::getWarnings( ) throw(SQLException, RuntimeException) { // when you collected some warnings -> return it return Any(); } -// -------------------------------------------------------------------------------- + void SAL_CALL OConnection::clearWarnings( ) throw(SQLException, RuntimeException) { // you should clear your collected warnings here } -//------------------------------------------------------------------------------ + void OConnection::disposing() { // we noticed that we should be destroied in near future so we have to dispose our statements @@ -521,7 +521,7 @@ void OConnection::disposing() dispose_ChildImpl(); } -// ----------------------------------------------------------------------------- + Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() { @@ -537,7 +537,7 @@ Reference< XTablesSupplier > SAL_CALL OConnection::createCatalog() OSL_TRACE( "\tOUT OConnection::createCatalog()" ); return xTab; } -// ----------------------------------------------------------------------------- + MNameMapper* OConnection::getNameMapper () { @@ -547,7 +547,7 @@ MNameMapper* OConnection::getNameMapper () return m_aNameMapper; } -// ----------------------------------------------------------------------------- + void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Reference< XInterface >& _rxContext ) { if ( _rError.getResId() != 0 ) @@ -584,7 +584,7 @@ void OConnection::throwSQLException( const ErrorDescriptor& _rError, const Refer throwGenericSQLException( STR_UNSPECIFIED_ERROR, _rxContext ); } -// ----------------------------------------------------------------------------- + void OConnection::throwSQLException( const sal_uInt16 _nErrorResourceId, const Reference< XInterface >& _rxContext ) { ErrorDescriptor aError; diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 34c640b6d5e4..ef3b63bf8801 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -64,13 +64,13 @@ ODatabaseMetaData::ODatabaseMetaData(OConnection* _pCon) OSL_ENSURE(m_pConnection,"ODatabaseMetaData::ODatabaseMetaData: No connection set!"); m_pDbMetaDataHelper = new MDatabaseMetaDataHelper(); } -// ------------------------------------------------------------------------- + ODatabaseMetaData::~ODatabaseMetaData() { delete m_pDbMetaDataHelper; } -// ------------------------------------------------------------------------- + ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException) @@ -152,317 +152,317 @@ ODatabaseMetaDataResultSet::ORows& SAL_CALL ODatabaseMetaData::getColumnRows( } return( aRows ); } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::impl_getCatalogSeparator_throw( ) { return OUString(); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxBinaryLiteralLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 65535; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxRowSize( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCatalogNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCharLiteralLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 254; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 20; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInIndex( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxCursorNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxConnections( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) { return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { // We only support a single table return 1; } -// ------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + sal_Bool SAL_CALL ODatabaseMetaData::doesMaxRowSizeIncludeBlobs( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseQuotedIdentifiers( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::storesUpperCaseIdentifiers( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithAddColumn_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsAlterTableWithDropColumn_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxIndexLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getCatalogTerm( ) throw(SQLException, RuntimeException) { OUString aVal; return aVal; } -// ------------------------------------------------------------------------- + OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " return OUString("\""); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getExtraNameCharacters( ) throw(SQLException, RuntimeException) { OUString aVal; return aVal; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDifferentTableCorrelationNames( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_isCatalogAtStart_throw( ) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionIgnoredInTransactions( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::dataDefinitionCausesTransactionCommit( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDataManipulationTransactionsOnly( ) throw(SQLException, RuntimeException) { //We support create table return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsDataDefinitionAndDataManipulationTransactions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedDelete( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsPositionedUpdate( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossRollback( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenStatementsAcrossCommit( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossCommit( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOpenCursorsAcrossRollback( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int32 /*level*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92FullSQL( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92EntryLevelSQL( ) throw(SQLException, RuntimeException) { return sal_True; // should be supported at least } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsIntegrityEnhancementFacility( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsCatalogsInTableDefinitions_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInIndexDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsCatalogsInDataManipulation_throw( ) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOuterJoins( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxStatementLength( ) throw(SQLException, RuntimeException) { return 0;// 0 means no limit } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxProcedureNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxSchemaNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::allProceduresAreCallable( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsStoredProcedures( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSelectForUpdate( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::allTablesAreSelectable( ) throw(SQLException, RuntimeException) { // We allow you to select from any table. return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeException) { //we support insert/update/delete now @@ -470,382 +470,382 @@ sal_Bool SAL_CALL ODatabaseMetaData::isReadOnly( ) throw(SQLException, RuntimeE //entry to the popup menu. We should avoid them. return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFiles( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::usesLocalFilePerTable( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTypeConversion( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullPlusNonNullIsNull( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsColumnAliasing( ) throw(SQLException, RuntimeException) { // Support added for this. return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsTableCorrelationNames( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsConvert( sal_Int32 /*fromType*/, sal_Int32 /*toType*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsExpressionsInOrderBy( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupBy( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByBeyondSelect( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsGroupByUnrelated( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleTransactions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMultipleResultSets( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsLikeEscapeClause( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsOrderByUnrelated( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsUnion( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsUnionAll( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMixedCaseIdentifiers( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool ODatabaseMetaData::impl_supportsMixedCaseQuotedIdentifiers_throw( ) { // Any case may be used return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtEnd( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedAtStart( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedHigh( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::nullsAreSortedLow( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInProcedureCalls( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInProcedureCalls( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCatalogsInPrivilegeDefinitions( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCorrelatedSubqueries( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInComparisons( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInExists( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInIns( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsSubqueriesInQuantifieds( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsANSI92IntermediateSQL( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getURL( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); return m_pConnection->getURL(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getUserName( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDriverName( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDriverVersion() throw(SQLException, RuntimeException) { return OUString( "1" ); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDatabaseProductVersion( ) throw(SQLException, RuntimeException) { return OUString( "0" ); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getDatabaseProductName( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getProcedureTerm( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSchemaTerm( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMajorVersion( ) throw(RuntimeException) { return 1; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDefaultTransactionIsolation( ) throw(SQLException, RuntimeException) { return TransactionIsolation::NONE; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getDriverMinorVersion( ) throw(RuntimeException) { return 0; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSQLKeywords( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSearchStringEscape( ) throw(SQLException, RuntimeException) { OUString aValue; return aValue; } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getStringFunctions( ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getTimeDateFunctions( ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getSystemFunctions( ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL ODatabaseMetaData::getNumericFunctions( ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsExtendedSQLGrammar( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsCoreSQLGrammar( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsMinimumSQLGrammar( ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsFullOuterJoins( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsLimitedOuterJoins( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInGroupBy( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInOrderBy( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInSelect( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL ODatabaseMetaData::getMaxUserNameLength( ) throw(SQLException, RuntimeException) { sal_Int32 nValue = 0; // 0 means no limit return nValue; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetType( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsResultSetConcurrency( sal_Int32 /*setType*/, sal_Int32 /*concurrency*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::ownInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersUpdatesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersDeletesAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::othersInsertsAreVisible( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::updatesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::deletesAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::insertsAreDetected( sal_Int32 /*setType*/ ) throw(SQLException, RuntimeException) { return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL ODatabaseMetaData::supportsBatchUpdates( ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + // here follow all methods which return a resultset // the first methods is an example implementation how to use this resultset // of course you could implement it on your and you should do this because // the general way is more memory expensive -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLException, RuntimeException) { // there exists no possibility to get table types so we have to check @@ -879,7 +879,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTableTypes( ) throw(SQLE pResult->setRows(aRows); return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) { // this returns an empty resultset where the column-names are already set @@ -919,7 +919,7 @@ Reference< XResultSet > ODatabaseMetaData::impl_getTypeInfo_throw( ) pResultSet->setRows(aRows); return xResultSet; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const OUString& columnNamePattern ) throw(SQLException, RuntimeException) @@ -931,7 +931,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getColumns( pResultSet->setRows( getColumnRows( tableNamePattern, columnNamePattern )); return xResultSet; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern, const Sequence< OUString >& types ) throw(SQLException, RuntimeException) @@ -952,7 +952,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTables( return xResultSet; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& tableNamePattern ) throw(SQLException, RuntimeException) { @@ -1007,12 +1007,12 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( return xRef; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL ODatabaseMetaData::getUDTs( const Any& /*catalog*/, const OUString& /*schemaPattern*/, const OUString& /*typeNamePattern*/, const Sequence< sal_Int32 >& /*types*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index 0f945dc05beb..a30fae3b3d88 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -36,14 +36,14 @@ namespace connectivity { namespace mozab { - //------------------------------------------------------------------ + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL MozabDriver_CreateInstance(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { return *(new MozabDriver( _rxFactory )); } } } -// -------------------------------------------------------------------------------- + MozabDriver::MozabDriver( const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) : ODriver_BASE(m_aMutex), m_xMSFactory( _rxFactory ) @@ -51,11 +51,11 @@ MozabDriver::MozabDriver( ,m_pCreationFunc(NULL) { } -// ----------------------------------------------------------------------------- + MozabDriver::~MozabDriver() { } -// -------------------------------------------------------------------------------- + void MozabDriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -80,14 +80,14 @@ void MozabDriver::disposing() } // static ServiceInfo -//------------------------------------------------------------------------------ + OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeException) { return OUString(MOZAB_DRIVER_IMPL_NAME); // this name is referenced in the configuration and in the mozab.xml // Please take care when changing it. } -//------------------------------------------------------------------------------ + Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported @@ -97,7 +97,7 @@ Sequence< OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (Run return aSNS; } -//------------------------------------------------------------------ + OUString SAL_CALL MozabDriver::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); @@ -108,13 +108,13 @@ sal_Bool SAL_CALL MozabDriver::supportsService( const OUString& _rServiceName ) return cppu::supportsService(this, _rServiceName); } -//------------------------------------------------------------------ + Sequence< OUString > SAL_CALL MozabDriver::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); } -// -------------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, const Sequence< PropertyValue >& info ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -150,7 +150,7 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const OUString& url, con return xCon; } -// -------------------------------------------------------------------------------- + sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url ) throw(SQLException, RuntimeException) { @@ -160,7 +160,7 @@ sal_Bool SAL_CALL MozabDriver::acceptsURL( const OUString& url ) // here we have to look if we support this url format return impl_classifyURL(url) != Unknown; } -// -------------------------------------------------------------------------------- + Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUString& url, const Sequence< PropertyValue >& /*info*/ ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -194,17 +194,17 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const OUSt // if you have something special to say return it here :-) return Sequence< DriverPropertyInfo >(); } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL MozabDriver::getMajorVersion( ) throw(RuntimeException) { return 1; // depends on you } -// -------------------------------------------------------------------------------- + sal_Int32 SAL_CALL MozabDriver::getMinorVersion( ) throw(RuntimeException) { return 0; // depends on you } -// -------------------------------------------------------------------------------- + EDriverType MozabDriver::impl_classifyURL( const OUString& url ) { // Skip 'sdbc:mozab: part of URL @@ -252,7 +252,7 @@ EDriverType MozabDriver::impl_classifyURL( const OUString& url ) return Unknown; } -// -------------------------------------------------------------------------------- + namespace { template< typename FUNCTION > @@ -277,7 +277,7 @@ namespace } } -// ----------------------------------------------------------------------------- + extern "C" { static void SAL_CALL thisModule() {} } bool MozabDriver::ensureInit() @@ -314,6 +314,6 @@ bool MozabDriver::ensureInit() return true; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index 346c6bda8ff1..e8ace7cf11ce 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -61,17 +61,17 @@ OPreparedStatement::OPreparedStatement( OConnection* _pConnection,const OUString ,m_pResultSet() { } -// ----------------------------------------------------------------------------- + OPreparedStatement::~OPreparedStatement() { } -// ----------------------------------------------------------------------------- + void OPreparedStatement::lateInit() { if ( eSelect != parseSql( m_sSqlStatement ) ) throw SQLException(); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -86,7 +86,7 @@ void SAL_CALL OPreparedStatement::disposing() } m_xParamColumns = NULL; } -// ----------------------------------------------------------------------------- + OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sql , sal_Bool bAdjusted ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ) @@ -106,7 +106,7 @@ OCommonStatement::StatementType OPreparedStatement::parseSql( const OUString& sq return eStatementType; } -// ----------------------------------------------------------------------------- + void OPreparedStatement::initializeResultSet( OResultSet* _pResult ) { OCommonStatement::initializeResultSet( _pResult ); @@ -114,14 +114,14 @@ void OPreparedStatement::initializeResultSet( OResultSet* _pResult ) _pResult->setParameterRow( m_aParameterRow ); } -// ----------------------------------------------------------------------------- + void OPreparedStatement::clearCachedResultSet() { OCommonStatement::clearCachedResultSet(); m_pResultSet.clear(); m_xMetaData.clear(); } -// ----------------------------------------------------------------------------- + void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) { OCommonStatement::cacheResultSet( _pResult ); @@ -129,17 +129,17 @@ void OPreparedStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _ m_pResultSet = _pResult; } -// ----------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::acquire() throw() { OCommonStatement::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::release() throw() { OCommonStatement::release(); } -// ----------------------------------------------------------------------------- + Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OCommonStatement::queryInterface(rType); @@ -147,12 +147,12 @@ Any SAL_CALL OPreparedStatement::queryInterface( const Type & rType ) throw(Runt aRet = OPreparedStatement_BASE::queryInterface(rType); return aRet; } -// ------------------------------------------------------------------------- + ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL OPreparedStatement::getTypes( ) throw(::com::sun::star::uno::RuntimeException) { return ::comphelper::concatSequences(OPreparedStatement_BASE::getTypes(),OCommonStatement::getTypes()); } -// ------------------------------------------------------------------------- + Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) throw(SQLException, RuntimeException) { @@ -171,7 +171,7 @@ Reference< XResultSetMetaData > SAL_CALL OPreparedStatement::getMetaData( ) thr return m_xMetaData; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -180,14 +180,14 @@ sal_Bool SAL_CALL OPreparedStatement::execute( ) throw(SQLException, RuntimeExc Reference< XResultSet> xResult = executeQuery(); return xResult.is(); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OPreparedStatement::executeUpdate( ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUString& x ) throw(SQLException, RuntimeException) { @@ -197,7 +197,7 @@ void SAL_CALL OPreparedStatement::setString( sal_Int32 parameterIndex, const OUS OSL_TRACE("prepStmt::setString( %s )", OUtoCStr( x ) ); setParameter( parameterIndex, x ); } -// ------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQLException, RuntimeException) { @@ -206,7 +206,7 @@ Reference< XConnection > SAL_CALL OPreparedStatement::getConnection( ) throw(SQ return (Reference< XConnection >)m_pConnection; } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLException, RuntimeException) { @@ -218,62 +218,62 @@ Reference< XResultSet > SAL_CALL OPreparedStatement::executeQuery( ) throw(SQLE // stuff again. Just execute. return impl_executeCurrentQuery(); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setBoolean( sal_Int32 /*parameterIndex*/, sal_Bool /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBoolean", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setByte( sal_Int32 /*parameterIndex*/, sal_Int8 /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setByte", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setDate( sal_Int32 /*parameterIndex*/, const Date& /*aData*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setDate", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setTime( sal_Int32 /*parameterIndex*/, const Time& /*aVal*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setTime", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setTimestamp( sal_Int32 /*parameterIndex*/, const DateTime& /*aVal*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setTimestamp", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setDouble( sal_Int32 /*parameterIndex*/, double /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setDouble", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setFloat( sal_Int32 /*parameterIndex*/, float /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setFloat", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setInt( sal_Int32 /*parameterIndex*/, sal_Int32 /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setInt", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setLong( sal_Int32 /*parameterIndex*/, sal_Int64 /*aVal*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setLong", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 /*sqlType*/ ) throw(SQLException, RuntimeException) { @@ -284,79 +284,79 @@ void SAL_CALL OPreparedStatement::setNull( sal_Int32 parameterIndex, sal_Int32 / (m_aParameterRow->get())[parameterIndex].setNull(); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setClob( sal_Int32 /*parameterIndex*/, const Reference< XClob >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setClob", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setBlob( sal_Int32 /*parameterIndex*/, const Reference< XBlob >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBlob", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setArray( sal_Int32 /*parameterIndex*/, const Reference< XArray >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setArray", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setRef( sal_Int32 /*parameterIndex*/, const Reference< XRef >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setRef", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setObjectWithInfo( sal_Int32 /*parameterIndex*/, const Any& /*x*/, sal_Int32 /*sqlType*/, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setObjectWithInfo", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setObjectNull( sal_Int32 parameterIndex, sal_Int32 sqlType, const OUString& /*typeName*/ ) throw(SQLException, RuntimeException) { setNull(parameterIndex,sqlType); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setObject( sal_Int32 parameterIndex, const Any& x ) throw(SQLException, RuntimeException) { ::dbtools::implSetObject(this,parameterIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setShort( sal_Int32 /*parameterIndex*/, sal_Int16 /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setShort", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setBytes( sal_Int32 /*parameterIndex*/, const Sequence< sal_Int8 >& /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBytes", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setCharacterStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setCharacterStream", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::setBinaryStream( sal_Int32 /*parameterIndex*/, const Reference< ::com::sun::star::io::XInputStream >& /*x*/, sal_Int32 /*length*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XParameters::setBinaryStream", *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OPreparedStatement::clearParameters( ) throw(SQLException, RuntimeException) { } -// ------------------------------------------------------------------------- + void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& rValue) throw (Exception) { switch(nHandle) @@ -374,7 +374,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons } } -// ----------------------------------------------------------------------------- + void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) { ::connectivity::checkDisposed(OCommonStatement_IBASE::rBHelper.bDisposed); @@ -387,7 +387,7 @@ void OPreparedStatement::checkAndResizeParameters(sal_Int32 parameterIndex) if ((sal_Int32)(m_aParameterRow->get()).size() <= parameterIndex) (m_aParameterRow->get()).resize(parameterIndex+1); } -// ----------------------------------------------------------------------------- + void OPreparedStatement::setParameter(sal_Int32 parameterIndex, const ORowSetValue& x) { @@ -398,7 +398,7 @@ ORowSetValue& x) (m_aParameterRow->get())[parameterIndex] = x; } -//------------------------------------------------------------------ + size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Reference<XPropertySet>& _xCol) { OSL_UNUSED( pParameter ); @@ -450,7 +450,7 @@ size_t OPreparedStatement::AddParameter(OSQLParseNode * pParameter, const Refere m_xParamColumns->get().push_back(xParaColumn); return nParameter; } -// ----------------------------------------------------------------------------- + void OPreparedStatement::describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) { @@ -470,7 +470,7 @@ _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable) // else // AddParameter(_pParameter,xProp); } -// ------------------------------------------------------------------------- + void OPreparedStatement::describeParameter() { ::std::vector< OSQLParseNode*> aParseNodes; @@ -492,7 +492,7 @@ aParseNodes.begin(); } } -// ----------------------------------------------------------------------------- + void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes) { OSL_ENSURE(pParseNode != NULL,"OResultSet: internal error: invalid ParseNode"); @@ -512,22 +512,22 @@ void OPreparedStatement::scanParameter(OSQLParseNode* pParseNode,::std::vector< for (sal_uInt32 i = 0; i < pParseNode->count(); i++) scanParameter(pParseNode->getChild(i),_rParaNodes); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > SAL_CALL OPreparedStatement::getResultSet( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return NULL; } -// ----------------------------------------------------------------------------- + sal_Int32 SAL_CALL OPreparedStatement::getUpdateCount( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return 0; } -// ----------------------------------------------------------------------------- + sal_Bool SAL_CALL OPreparedStatement::getMoreResults( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { return sal_False; } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index aeb5bea51dd0..49c9ff05f76e 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -60,13 +60,13 @@ using namespace com::sun::star::container; using namespace com::sun::star::io; using namespace com::sun::star::util; -//------------------------------------------------------------------------------ + // IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { return OUString("com.sun.star.sdbcx.mozab.ResultSet"); } -// ------------------------------------------------------------------------- + Sequence< OUString > SAL_CALL OResultSet::getSupportedServiceNames( ) throw( RuntimeException) { ::com::sun::star::uno::Sequence< OUString > aSupported(2); @@ -80,7 +80,7 @@ sal_Bool SAL_CALL OResultSet::supportsService( const OUString& _rServiceName ) t return cppu::supportsService(this, _rServiceName); } -// ------------------------------------------------------------------------- + OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< connectivity::OSQLParseTreeIterator >& _pSQLIterator ) : OResultSet_BASE(m_aMutex) ,OPropertySetHelper(OResultSet_BASE::rBHelper) @@ -109,12 +109,12 @@ OResultSet::OResultSet(OCommonStatement* pStmt, const ::boost::shared_ptr< conne m_aQuery.setMaxNrOfReturns(pStmt->getOwnConnection()->getMaxResultRecords()); } -// ------------------------------------------------------------------------- + OResultSet::~OResultSet() { } -// ------------------------------------------------------------------------- + void OResultSet::disposing(void) { OPropertySetHelper::disposing(); @@ -133,7 +133,7 @@ void OResultSet::disposing(void) m_pTable = NULL; } } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OPropertySetHelper::queryInterface(rType); @@ -141,7 +141,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep aRet = OResultSet_BASE::queryInterface(rType); return aRet; } -// ------------------------------------------------------------------------- + Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) { OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), @@ -150,7 +150,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep return ::comphelper::concatSequences(aTypes.getTypes(),OResultSet_BASE::getTypes()); } -// ------------------------------------------------------------------------- + void OResultSet::methodEntry() { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); @@ -161,7 +161,7 @@ void OResultSet::methodEntry() } } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -181,60 +181,60 @@ sal_Int32 SAL_CALL OResultSet::findColumn( const OUString& columnName ) throw(SQ assert(false); return 0; // Never reached } -// ------------------------------------------------------------------------- + Reference< XInputStream > SAL_CALL OResultSet::getBinaryStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + Reference< XInputStream > SAL_CALL OResultSet::getCharacterStream( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::getBoolean( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); m_bWasNull = sal_True; return sal_False; } -// ------------------------------------------------------------------------- + sal_Int8 SAL_CALL OResultSet::getByte( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return 0; } -// ------------------------------------------------------------------------- + Sequence< sal_Int8 > SAL_CALL OResultSet::getBytes( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return Sequence< sal_Int8 >(); } -// ------------------------------------------------------------------------- + Date SAL_CALL OResultSet::getDate( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return Date(); } -// ------------------------------------------------------------------------- + double SAL_CALL OResultSet::getDouble( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return 0.0; } -// ------------------------------------------------------------------------- + float SAL_CALL OResultSet::getFloat( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { @@ -242,7 +242,7 @@ sal_Int32 SAL_CALL OResultSet::getInt( sal_Int32 /*columnIndex*/ ) throw(SQLExce return 0; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -250,14 +250,14 @@ sal_Int32 SAL_CALL OResultSet::getRow( ) throw(SQLException, RuntimeException) OSL_TRACE("In/Out: OResultSet::getRow, return = %u", m_nRowPos ); return m_nRowPos; } -// ------------------------------------------------------------------------- + sal_Int64 SAL_CALL OResultSet::getLong( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return sal_Int64(); } -// ------------------------------------------------------------------------- + Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLException, RuntimeException) { @@ -268,49 +268,49 @@ Reference< XResultSetMetaData > SAL_CALL OResultSet::getMetaData( ) throw(SQLEx m_pSQLIterator->getSelectColumns(), m_pSQLIterator->getTables().begin()->first ,m_pTable,determineReadOnly()); return m_xMetaData; } -// ------------------------------------------------------------------------- + Reference< XArray > SAL_CALL OResultSet::getArray( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + Reference< XClob > SAL_CALL OResultSet::getClob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + Reference< XBlob > SAL_CALL OResultSet::getBlob( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + Reference< XRef > SAL_CALL OResultSet::getRef( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return NULL; } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::getObject( sal_Int32 /*columnIndex*/, const Reference< ::com::sun::star::container::XNameAccess >& /*typeMap*/ ) throw(SQLException, RuntimeException) { return Any(); } -// ------------------------------------------------------------------------- + sal_Int16 SAL_CALL OResultSet::getShort( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { return 0; } -// ------------------------------------------------------------------------- + void OResultSet::checkIndex(sal_Int32 columnIndex ) throw(::com::sun::star::sdbc::SQLException) { if(columnIndex <= 0 || columnIndex > (sal_Int32)m_xColumns->get().size()) ::dbtools::throwInvalidIndexException(*this); } -// ------------------------------------------------------------------------- + sal_uInt32 OResultSet::currentRowCount() { if ( m_bIsAlwaysFalseQuery ) @@ -318,7 +318,7 @@ sal_uInt32 OResultSet::currentRowCount() return m_aQuery.getRealRowCount() - deletedCount(); } -// ------------------------------------------------------------------------- + sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) { @@ -326,7 +326,7 @@ sal_Bool OResultSet::fetchCurrentRow( ) throw(SQLException, RuntimeException) return fetchRow(getCurrentCardNumber()); } -// ------------------------------------------------------------------------- + sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, RuntimeException) { if (cardNumber == 0) @@ -353,7 +353,7 @@ sal_Bool OResultSet::pushCard(sal_uInt32 cardNumber) throw(SQLException, Runtime return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw(SQLException, RuntimeException) { OSL_TRACE("fetchRow, cardNumber = %u", cardNumber ); @@ -394,7 +394,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( } return sal_True; } -// ------------------------------------------------------------------------- + const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -409,7 +409,7 @@ const ORowSetValue& OResultSet::getValue(sal_Int32 cardNumber, sal_Int32 columnI return (m_aRow->get())[columnIndex]; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) @@ -424,14 +424,14 @@ OUString SAL_CALL OResultSet::getString( sal_Int32 columnIndex ) throw(SQLExcept return getValue(getCurrentCardNumber(), mapColumn( columnIndex ) ); } -// ------------------------------------------------------------------------- + Time SAL_CALL OResultSet::getTime( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); return Time(); } -// ------------------------------------------------------------------------- + DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQLException, RuntimeException) @@ -439,7 +439,7 @@ DateTime SAL_CALL OResultSet::getTimestamp( sal_Int32 /*columnIndex*/ ) throw(SQ ResultSetEntryGuard aGuard( *this ); return DateTime(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeException) { @@ -450,7 +450,7 @@ sal_Bool SAL_CALL OResultSet::isBeforeFirst( ) throw(SQLException, RuntimeExcep OSL_TRACE("In/Out: OResultSet::isBeforeFirst" ); return( m_nRowPos < 1 ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -458,7 +458,7 @@ sal_Bool SAL_CALL OResultSet::isAfterLast( ) throw(SQLException, RuntimeExcepti OSL_TRACE("In/Out: OResultSet::isAfterLast" ); return m_nRowPos > currentRowCount() && m_aQuery.queryComplete(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -466,7 +466,7 @@ sal_Bool SAL_CALL OResultSet::isFirst( ) throw(SQLException, RuntimeException) OSL_TRACE("In/Out: OResultSet::isFirst" ); return m_nRowPos == 1; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -474,7 +474,7 @@ sal_Bool SAL_CALL OResultSet::isLast( ) throw(SQLException, RuntimeException) OSL_TRACE("In/Out: OResultSet::isLast" ); return m_nRowPos == currentRowCount() && m_aQuery.queryComplete(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -484,7 +484,7 @@ void SAL_CALL OResultSet::beforeFirst( ) throw(SQLException, RuntimeException) if ( first() ) previous(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -493,7 +493,7 @@ void SAL_CALL OResultSet::afterLast( ) throw(SQLException, RuntimeException) if(last()) next(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) { @@ -501,40 +501,40 @@ void SAL_CALL OResultSet::close( ) throw(SQLException, RuntimeException) OSL_TRACE("In/Out: OResultSet::close" ); dispose(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::first( ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::first" ); return seekRow( FIRST_POS ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::last( ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::last" ); return seekRow( LAST_POS ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::absolute( sal_Int32 row ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::absolute" ); return seekRow( ABSOLUTE_POS, row ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::relative( sal_Int32 row ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::relative" ); return seekRow( RELATIVE_POS, row ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::previous( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::previous" ); return seekRow( PRIOR_POS ); } -// ------------------------------------------------------------------------- + Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -542,7 +542,7 @@ Reference< XInterface > SAL_CALL OResultSet::getStatement( ) throw(SQLException OSL_TRACE("In/Out: OResultSet::getStatement" ); return m_xStatement; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeException) { @@ -550,27 +550,27 @@ sal_Bool SAL_CALL OResultSet::rowDeleted( ) throw(SQLException, RuntimeExceptio OSL_TRACE("In/Out: OResultSet::rowDeleted, m_RowStates=%u",m_RowStates ); return ((m_RowStates & RowStates_Deleted) == RowStates_Deleted) ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowInserted( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::rowInserted,m_RowStates=%u",m_RowStates ); return ((m_RowStates & RowStates_Inserted) == RowStates_Inserted); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::rowUpdated( ) throw(SQLException, RuntimeException) { ResultSetEntryGuard aGuard( *this ); OSL_TRACE("In/Out: OResultSet::rowUpdated,m_RowStates=%u",m_RowStates ); return ((m_RowStates & RowStates_Updated) == RowStates_Updated) ; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::next( ) throw(SQLException, RuntimeException) { return seekRow( NEXT_POS ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) { @@ -578,7 +578,7 @@ sal_Bool SAL_CALL OResultSet::wasNull( ) throw(SQLException, RuntimeException) return m_bWasNull; } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) { @@ -586,25 +586,25 @@ void SAL_CALL OResultSet::cancel( ) throw(RuntimeException) OSL_TRACE("In/Out: OResultSet::cancel" ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::clearWarnings( ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::clearWarnings" ); } -// ------------------------------------------------------------------------- + Any SAL_CALL OResultSet::getWarnings( ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::getWarnings" ); return Any(); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::refreshRow( ) throw(SQLException, RuntimeException) { OSL_TRACE("In/Out: OResultSet::refreshRow" ); if (fetchRow(getCurrentCardNumber(),sal_True)) //force fetch current row will cause we lose all change to the current row m_pStatement->getOwnConnection()->throwSQLException( STR_ERROR_REFRESH_ROW, *this ); } -// ------------------------------------------------------------------------- + IPropertyArrayHelper* OResultSet::createArrayHelper( ) const { Sequence< Property > aProps(5); @@ -618,12 +618,12 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const return new OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + IPropertyArrayHelper & OResultSet::getInfoHelper() { return *const_cast<OResultSet*>(this)->getArrayHelper(); } -// ------------------------------------------------------------------------- + sal_Bool OResultSet::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/, @@ -645,7 +645,7 @@ sal_Bool OResultSet::convertFastPropertyValue( } return sal_False; } -// ------------------------------------------------------------------------- + void OResultSet::setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, const Any& /*rValue*/ @@ -667,7 +667,7 @@ void OResultSet::setFastPropertyValue_NoBroadcast( ; } } -// ------------------------------------------------------------------------- + void OResultSet::getFastPropertyValue( Any& rValue, sal_Int32 nHandle @@ -693,23 +693,23 @@ void OResultSet::getFastPropertyValue( break; } } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::acquire() throw() { OResultSet_BASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::release() throw() { OResultSet_BASE::release(); } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OResultSet::getPropertySetInfo( ) throw(::com::sun::star::uno::RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ------------------------------------------------------------------------- + void OResultSet::parseParameter( const OSQLParseNode* pNode, OUString& rMatchString ) { OSL_ENSURE(pNode->count() > 0,"Error parsing parameter in Parse Tree"); @@ -1032,7 +1032,7 @@ void OResultSet::analyseWhereClause( const OSQLParseNode* parseT } -// ----------------------------------------------------------------------------- + void OResultSet::fillRowData() throw( ::com::sun::star::sdbc::SQLException ) @@ -1122,7 +1122,7 @@ void OResultSet::fillRowData() #endif } -// ----------------------------------------------------------------------------- + static sal_Bool matchRow( OValueRow& row1, OValueRow& row2 ) { OValueVector::Vector::iterator row1Iter = row1->get().begin(); @@ -1162,7 +1162,7 @@ sal_Int32 OResultSet::getRowForCardNumber(sal_Int32 nCardNum) return 0; } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -1337,7 +1337,7 @@ void SAL_CALL OResultSet::executeQuery() throw( ::com::sun::star::sdbc::SQLExcep } } -// ----------------------------------------------------------------------------- + void OResultSet::setBoundedColumns(const OValueRow& _rRow, const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, @@ -1419,7 +1419,7 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, } -// ----------------------------------------------------------------------------- + sal_Bool OResultSet::isCount() const { return (m_pParseTree && @@ -1431,7 +1431,7 @@ sal_Bool OResultSet::isCount() const ); } -// ----------------------------------------------------------------------------- + // // Check for valid row in m_aQuery // @@ -1483,7 +1483,7 @@ sal_Int32 OResultSet::deletedCount() return m_CurrentRowCount - static_cast<sal_Int32>(m_pKeySet->get().size()); } -// ----------------------------------------------------------------------------- + sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) { ResultSetEntryGuard aGuard( *this ); @@ -1560,7 +1560,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) fetchCurrentRow(); return sal_True; } -// ----------------------------------------------------------------------------- + void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMapping) { m_aColMapping = _aColumnMapping; @@ -1569,7 +1569,7 @@ void OResultSet::setColumnMapping(const ::std::vector<sal_Int32>& _aColumnMappin OSL_TRACE("Set Mapped: %d -> %d", i, m_aColMapping[i] ); #endif } -// ----------------------------------------------------------------------------- + ::com::sun::star::uno::Any OResultSet::getBookmark( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { @@ -1673,7 +1673,7 @@ void OResultSet::updateValue(sal_Int32 columnIndex ,const ORowSetValue& x) throw m_nUpdatedRow = getCurrentCardNumber(); m_RowStates = m_RowStates | RowStates_Updated; } -// ----------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException, RuntimeException) { @@ -1691,72 +1691,72 @@ void SAL_CALL OResultSet::updateNull( sal_Int32 columnIndex ) throw(SQLException m_nUpdatedRow = getCurrentCardNumber(); m_RowStates = m_RowStates | RowStates_Updated; } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBoolean( sal_Int32 columnIndex, sal_Bool x ) throw(SQLException, RuntimeException) { updateValue(columnIndex, static_cast<bool>(x)); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateByte( sal_Int32 columnIndex, sal_Int8 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateShort( sal_Int32 columnIndex, sal_Int16 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateInt( sal_Int32 columnIndex, sal_Int32 x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateLong( sal_Int32 /*columnIndex*/, sal_Int64 /*x*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XRowUpdate::updateLong", *this ); } -// ----------------------------------------------------------------------- + void SAL_CALL OResultSet::updateFloat( sal_Int32 columnIndex, float x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateDouble( sal_Int32 columnIndex, double x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateString( sal_Int32 columnIndex, const OUString& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBytes( sal_Int32 columnIndex, const Sequence< sal_Int8 >& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateDate( sal_Int32 columnIndex, const ::com::sun::star::util::Date& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateTime( sal_Int32 columnIndex, const ::com::sun::star::util::Time& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateTimestamp( sal_Int32 columnIndex, const ::com::sun::star::util::DateTime& x ) throw(SQLException, RuntimeException) { updateValue(columnIndex,x); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { @@ -1769,12 +1769,12 @@ void SAL_CALL OResultSet::updateBinaryStream( sal_Int32 columnIndex, const Refer x->readBytes(aSeq,length); updateValue(columnIndex,aSeq); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateCharacterStream( sal_Int32 columnIndex, const Reference< ::com::sun::star::io::XInputStream >& x, sal_Int32 length ) throw(SQLException, RuntimeException) { updateBinaryStream(columnIndex,x,length); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) throw(SQLException, RuntimeException) { if (!::dbtools::implUpdateObject(this, columnIndex, x)) @@ -1786,7 +1786,7 @@ void SAL_CALL OResultSet::updateObject( sal_Int32 columnIndex, const Any& x ) th ::dbtools::throwGenericSQLException(sError,*this); } // if (!::dbtools::implUpdateObject(this, columnIndex, x)) } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& x, sal_Int32 /*scale*/ ) throw(SQLException, RuntimeException) { @@ -1801,7 +1801,7 @@ void SAL_CALL OResultSet::updateNumericObject( sal_Int32 columnIndex, const Any& } // XResultSetUpdate -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -1813,7 +1813,7 @@ void SAL_CALL OResultSet::insertRow( ) throw(::com::sun::star::sdbc::SQLExcepti m_aQuery.setRowStates(getCurrentCardNumber(),m_RowStates); OSL_TRACE("insertRow out, m_nRowPos = %u", m_nRowPos ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_TRACE("updateRow in, m_nRowPos = %u", m_nRowPos ); @@ -1842,7 +1842,7 @@ void SAL_CALL OResultSet::updateRow( ) throw(::com::sun::star::sdbc::SQLExcepti fetchCurrentRow(); OSL_TRACE("updateRow out, m_nRowPos = %u", m_nRowPos ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_TRACE("deleteRow, m_nRowPos = %u", m_nRowPos ); @@ -1864,7 +1864,7 @@ void SAL_CALL OResultSet::deleteRow( ) throw(::com::sun::star::sdbc::SQLExcepti m_RowStates = RowStates_Deleted; OSL_TRACE("deleteRow out, m_nRowPos = %u", m_nRowPos ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ResultSetEntryGuard aGuard( *this ); @@ -1872,7 +1872,7 @@ void SAL_CALL OResultSet::cancelRowUpdates( ) throw(::com::sun::star::sdbc::SQL if (fetchRow(getCurrentCardNumber(),sal_True)) //force fetch current row will cause we lose all change to the current row m_pStatement->getOwnConnection()->throwSQLException( STR_CAN_NOT_CANCEL_ROW_UPDATE, *this ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { OSL_TRACE("moveToInsertRow in, m_nRowPos = %u", m_nRowPos ); @@ -1902,7 +1902,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE fetchCurrentRow(); OSL_TRACE("moveToInsertRow out, m_nRowPos = %u", m_nRowPos ); } -// ------------------------------------------------------------------------- + void SAL_CALL OResultSet::moveToCurrentRow( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { ResultSetEntryGuard aGuard( *this ); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index 48a888d4316a..d43eda83a0c8 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -34,48 +34,48 @@ using namespace com::sun::star::beans; using namespace ::dbtools; using namespace ::comphelper; -// ------------------------------------------------------------------------- + OResultSetMetaData::~OResultSetMetaData() { m_xColumns = NULL; } -// ----------------------------------------------------------------------------- + void OResultSetMetaData::checkColumnIndex(sal_Int32 column) throw(SQLException, RuntimeException) { if(column <= 0 || column > (sal_Int32)(sal_Int32)m_xColumns->get().size()) throwInvalidIndexException(*this); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnDisplaySize( sal_Int32 column ) throw(SQLException, RuntimeException) { return getPrecision(column); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnType( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return DataType::VARCHAR; // at the moment there exists only this type } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getColumnCount( ) throw(SQLException, RuntimeException) { return static_cast<sal_Int32>((m_xColumns->get()).size()); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -93,70 +93,70 @@ OUString SAL_CALL OResultSetMetaData::getColumnName( sal_Int32 column ) throw(SQ } return sColumnName; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getTableName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return m_aTableName; } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getCatalogName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnTypeName( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getString((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_TYPENAME))); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnLabel( sal_Int32 column ) throw(SQLException, RuntimeException) { return getColumnName(column); } -// ------------------------------------------------------------------------- + OUString SAL_CALL OResultSetMetaData::getColumnServiceName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return OUString(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isCurrency( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getBOOL((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISCURRENCY))); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isAutoIncrement( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isSigned( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) { return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getPrecision( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_PRECISION))); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::getScale( sal_Int32 column ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_SCALE))); } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OResultSetMetaData::isNullable( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); return getINT32((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_ISNULLABLE))); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -177,7 +177,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { @@ -187,17 +187,17 @@ sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLEx return m_bReadOnly || bReadOnly || m_pTable->isReadOnly(); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isDefinitelyWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { return !isReadOnly(column); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OResultSetMetaData::isWritable( sal_Int32 column ) throw(SQLException, RuntimeException) { return !isReadOnly(column); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 3469a62b75a0..cbe2f70fee1c 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -41,7 +41,7 @@ typedef Reference< XSingleServiceFactory > (SAL_CALL *createFactoryFunc) rtl_ModuleCount* ); -//--------------------------------------------------------------------------------------- + struct ProviderRequest { Reference< XSingleServiceFactory > xRet; @@ -79,7 +79,7 @@ struct ProviderRequest void* getProvider() const { return xRet.get(); } }; -//--------------------------------------------------------------------------------------- + typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Reference< XMultiServiceFactory >& _rxFactory ); ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL createMozillaBootstrap(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rxFactory) throw( ::com::sun::star::uno::Exception ) { @@ -109,7 +109,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere } return NULL; } -//--------------------------------------------------------------------------------------- + extern "C" SAL_DLLPUBLIC_EXPORT void* SAL_CALL mozab_component_getFactory( const sal_Char* pImplementationName, void* pServiceManager, diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 14d154ebf1ae..2632bf8b5737 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -58,7 +58,7 @@ static ::osl::Mutex m_ThreadMutex; using namespace ::comphelper; using namespace connectivity::mozab; using namespace connectivity; -//------------------------------------------------------------------------------ + using namespace com::sun::star::uno; using namespace com::sun::star::lang; using namespace com::sun::star::beans; @@ -66,7 +66,7 @@ using namespace com::sun::star::sdbc; using namespace com::sun::star::container; using namespace com::sun::star::io; using namespace com::sun::star::util; -//------------------------------------------------------------------------------ + OCommonStatement::OCommonStatement(OConnection* _pConnection ) :OCommonStatement_IBASE(m_aMutex) ,OPropertySetHelper(OCommonStatement_IBASE::rBHelper) @@ -83,12 +83,12 @@ OCommonStatement::OCommonStatement(OConnection* _pConnection ) m_pConnection->acquire(); OSL_TRACE("In/Out: OCommonStatement::OCommonStatement" ); } -// ----------------------------------------------------------------------------- + OCommonStatement::~OCommonStatement() { } -//------------------------------------------------------------------------------ + void OCommonStatement::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -105,7 +105,7 @@ void OCommonStatement::disposing() dispose_ChildImpl(); OCommonStatement_IBASE::disposing(); } -//----------------------------------------------------------------------------- + Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = OCommonStatement_IBASE::queryInterface(rType); @@ -113,7 +113,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim aRet = OPropertySetHelper::queryInterface(rType); return aRet; } -// ------------------------------------------------------------------------- + Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) { ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), @@ -122,7 +122,7 @@ Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) return ::comphelper::concatSequences(aTypes.getTypes(),OCommonStatement_IBASE::getTypes()); } -// ------------------------------------------------------------------------- + void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) { { @@ -133,7 +133,7 @@ void SAL_CALL OCommonStatement::close( ) throw(SQLException, RuntimeException) } -// ------------------------------------------------------------------------- + void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) { if(m_pParseTree) @@ -178,7 +178,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) else getOwnConnection()->throwSQLException( STR_QUERY_TOO_COMPLEX, *this ); } -// ------------------------------------------------------------------------- + OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql , sal_Bool bAdjusted) throw ( SQLException, RuntimeException ) { @@ -250,7 +250,7 @@ OCommonStatement::StatementType OCommonStatement::parseSql( const OUString& sql return eSelect; } -// ------------------------------------------------------------------------- + Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery() { clearCachedResultSet(); @@ -265,7 +265,7 @@ Reference< XResultSet > OCommonStatement::impl_executeCurrentQuery() } -// ------------------------------------------------------------------------- + void OCommonStatement::initializeResultSet( OResultSet* _pResult ) { ENSURE_OR_THROW( _pResult, "invalid result set" ); @@ -277,7 +277,7 @@ void OCommonStatement::initializeResultSet( OResultSet* _pResult ) _pResult->setTable(m_pTable); } -// ------------------------------------------------------------------------- + void OCommonStatement::clearCachedResultSet() { Reference< XResultSet > xResultSet( m_xResultSet.get(), UNO_QUERY ); @@ -297,14 +297,14 @@ void OCommonStatement::clearCachedResultSet() m_xResultSet.clear(); } -// ------------------------------------------------------------------------- + void OCommonStatement::cacheResultSet( const ::rtl::Reference< OResultSet >& _pResult ) { ENSURE_OR_THROW( _pResult.is(), "invalid result set" ); m_xResultSet = Reference< XResultSet >( _pResult.get() ); } -// ------------------------------------------------------------------------- + sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -316,7 +316,7 @@ sal_Bool SAL_CALL OCommonStatement::execute( const OUString& sql ) throw(SQLExce // returns true when a resultset is available return xRS.is(); } -// ------------------------------------------------------------------------- + Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& sql ) throw(SQLException, RuntimeException) { @@ -332,7 +332,7 @@ Reference< XResultSet > SAL_CALL OCommonStatement::executeQuery( const OUString& return impl_executeCurrentQuery(); } -// ------------------------------------------------------------------------- + Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLException, RuntimeException) { @@ -342,7 +342,7 @@ Reference< XConnection > SAL_CALL OCommonStatement::getConnection( ) throw(SQLE // just return our connection here return (Reference< XConnection >)m_pConnection; } -// ----------------------------------------------------------------------------- + Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeException) { Any aRet = ::cppu::queryInterface(rType,static_cast< XServiceInfo*> (this)); @@ -350,14 +350,14 @@ Any SAL_CALL OStatement::queryInterface( const Type & rType ) throw(RuntimeExcep aRet = OCommonStatement::queryInterface(rType); return aRet; } -// ------------------------------------------------------------------------- + sal_Int32 SAL_CALL OCommonStatement::executeUpdate( const OUString& /*sql*/ ) throw(SQLException, RuntimeException) { ::dbtools::throwFeatureNotImplementedException( "XStatement::executeUpdate", *this ); return 0; } -// ------------------------------------------------------------------------- + Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -365,9 +365,9 @@ Any SAL_CALL OCommonStatement::getWarnings( ) throw(SQLException, RuntimeExcept return makeAny(m_aLastWarning); } -// ------------------------------------------------------------------------- -// ------------------------------------------------------------------------- + + void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -376,7 +376,7 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc m_aLastWarning = SQLWarning(); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper* OCommonStatement::createArrayHelper( ) const { // this properties are define by the service resultset @@ -397,12 +397,12 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc return new ::cppu::OPropertyArrayHelper(aProps); } -// ------------------------------------------------------------------------- + ::cppu::IPropertyArrayHelper & OCommonStatement::getInfoHelper() { return *const_cast<OCommonStatement*>(this)->getArrayHelper(); } -// ------------------------------------------------------------------------- + sal_Bool OCommonStatement::convertFastPropertyValue( Any & /*rConvertedValue*/, Any & /*rOldValue*/, @@ -414,7 +414,7 @@ sal_Bool OCommonStatement::convertFastPropertyValue( // here we have to try to convert return bConverted; } -// ------------------------------------------------------------------------- + void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const Any& /*rValue*/) throw (Exception) { // set the value to whatever is necessary @@ -432,7 +432,7 @@ void OCommonStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,const ; } } -// ------------------------------------------------------------------------- + void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) const { switch(nHandle) @@ -449,34 +449,34 @@ void OCommonStatement::getFastPropertyValue(Any& /*rValue*/,sal_Int32 nHandle) c ; } } -// ------------------------------------------------------------------------- + IMPLEMENT_SERVICE_INFO(OStatement,"com.sun.star.sdbcx.OStatement","com.sun.star.sdbc.Statement"); -// ----------------------------------------------------------------------------- + void SAL_CALL OCommonStatement::acquire() throw() { OCommonStatement_IBASE::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OCommonStatement::release() throw() { relase_ChildImpl(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatement::acquire() throw() { OCommonStatement::acquire(); } -// ----------------------------------------------------------------------------- + void SAL_CALL OStatement::release() throw() { OCommonStatement::release(); } -// ----------------------------------------------------------------------------- + Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL OCommonStatement::getPropertySetInfo( ) throw(RuntimeException) { return ::cppu::OPropertySetHelper::createPropertySetInfo(getInfoHelper()); } -// ----------------------------------------------------------------------------- + void OCommonStatement::createColumnMapping() { size_t i; @@ -499,7 +499,7 @@ void OCommonStatement::createColumnMapping() OSL_TRACE("AFTER Mapped: %d -> %d", i, m_aColMapping[i] ); #endif } -// ----------------------------------------------------------------------------- + void OCommonStatement::analyseSQL() { @@ -525,7 +525,7 @@ void OCommonStatement::analyseSQL() } } } -//------------------------------------------------------------------ + void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { @@ -550,6 +550,6 @@ void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, // Ascending or Descending? m_aOrderbyAscending.push_back((SQL_ISTOKEN(pAscendingDescending,DESC)) ? SQL_DESC : SQL_ASC); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index 4abecfa5ba64..e0939535352d 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -46,7 +46,7 @@ using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; -// ------------------------------------------------------------------------- + OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const OUString& _Name, const OUString& _Type, const OUString& _Description ) :OTable_Base(_pTables, _pConnection, sal_True, _Name, _Type, _Description ) @@ -55,25 +55,25 @@ OTable::OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, construct(); } -//-------------------------------------------------------------------------- + sdbcx::OCollection* OTable::createColumns( const TStringVector& _rNames ) { return new OColumns( this, m_aMutex, _rNames ); } -//-------------------------------------------------------------------------- + sdbcx::OCollection* OTable::createKeys(const TStringVector& _rNames) { return new OKeysHelper( this, m_aMutex, _rNames ); } -//-------------------------------------------------------------------------- + sdbcx::OCollection* OTable::createIndexes(const TStringVector& _rNames) { return new OIndexesHelper( this, m_aMutex, _rNames ); } -// ----------------------------------------------------------------------------- + diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index 91bd7da14abe..7a3ee5b9451a 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -70,17 +70,17 @@ sdbcx::ObjectType OTables::createObject(const OUString& _rName) return xRet; } -// ------------------------------------------------------------------------- + void OTables::impl_refresh( ) throw(RuntimeException) { static_cast<OCatalog&>(m_rParent).refreshTables(); } -// ------------------------------------------------------------------------- + void OTables::disposing(void) { m_xMetaData.clear(); OCollection::disposing(); } -// ----------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index d97e4a6ef157..a59240723db4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -51,11 +51,11 @@ MozillaBootstrap::MozillaBootstrap( m_ProfileAccess(NULL), m_ProfileManager(NULL) { } -// ----------------------------------------------------------------------------- + MozillaBootstrap::~MozillaBootstrap() { } -// ----------------------------------------------------------------------------- + void MozillaBootstrap::Init() { sal_Bool aProfileExists=sal_False; @@ -72,7 +72,7 @@ void MozillaBootstrap::Init() bootupProfile(::com::sun::star::mozilla::MozillaProductType_Mozilla,OUString()); } -// -------------------------------------------------------------------------------- + void MozillaBootstrap::disposing() { ::osl::MutexGuard aGuard(m_aMutex); @@ -80,12 +80,12 @@ void MozillaBootstrap::disposing() } // static ServiceInfo -//------------------------------------------------------------------------------ + OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeException) { return OUString(MOZAB_MozillaBootstrap_IMPL_NAME); } -//------------------------------------------------------------------------------ + Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) { // which service is supported @@ -95,7 +95,7 @@ Sequence< OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw return aSNS; } -//------------------------------------------------------------------ + OUString SAL_CALL MozillaBootstrap::getImplementationName( ) throw(RuntimeException) { return getImplementationName_Static(); @@ -106,7 +106,7 @@ sal_Bool SAL_CALL MozillaBootstrap::supportsService( const OUString& _rServiceNa return cppu::supportsService(this, _rServiceName); } -//------------------------------------------------------------------ + Sequence< OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( ) throw(RuntimeException) { return getSupportedServiceNames_Static(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index 71a01493d659..5237a9304f23 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -41,7 +41,7 @@ using namespace ::com::sun::star::mozilla; namespace { - // ------------------------------------------------------------------- + static OUString lcl_getUserDataDirectory() { ::osl::Security aSecurity; @@ -59,7 +59,7 @@ namespace return aConfigPath + "/"; } - // ------------------------------------------------------------------- + const size_t NB_PRODUCTS = 3; const size_t NB_CANDIDATES = 4; @@ -87,7 +87,7 @@ namespace "MOZILLA_THUNDERBIRD_PROFILE_ROOT", }; - // ------------------------------------------------------------------- + static OUString lcl_guessProfileRoot( MozillaProductType _product ) { size_t productIndex = _product - 1; @@ -144,7 +144,7 @@ namespace } } -// ----------------------------------------------------------------------- + OUString getRegistryDir(MozillaProductType product) { if (product == MozillaProductType_Default) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 77a9020a7207..e71d28ba965a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -87,7 +87,7 @@ namespace connectivity extern sal_Bool MNS_Init(sal_Bool& aProfileExists); -// ------------------------------------------------------------------------- + MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() :m_bProfileExists(sal_False) { @@ -96,7 +96,7 @@ MDatabaseMetaDataHelper::MDatabaseMetaDataHelper() OSL_TRACE( "\tOUT MDatabaseMetaDataHelper::MDatabaseMetaDataHelper()" ); } -// ------------------------------------------------------------------------- + MDatabaseMetaDataHelper::~MDatabaseMetaDataHelper() { m_aTableNames.clear(); @@ -198,7 +198,7 @@ static nsresult insertPABDescription() {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ } -// ------------------------------------------------------------------------- + // Case where we get a parent uri, and need to list its children. static nsresult getSubsFromParent(const OString& aParent, nsIEnumerator **aSubs) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index add19e6852ba..1324d7822a97 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -141,21 +141,21 @@ namespace connectivity { namespace mozab { //==================================================================== //= MLdapAttributeMap //==================================================================== - // ------------------------------------------------------------------- + MLdapAttributeMap::MLdapAttributeMap() :m_pData( new AttributeMap_Data ) { } - // ------------------------------------------------------------------- + MLdapAttributeMap::~MLdapAttributeMap() { } - // ------------------------------------------------------------------- + NS_IMPL_THREADSAFE_ISUPPORTS1( MLdapAttributeMap, nsIAbLDAPAttributeMap ) - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAttributeList(const nsACString & aProperty, nsACString & _retval) { OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); @@ -175,7 +175,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAttributes(const nsACString & aProperty, PRUint32* aCount, char*** aAttrs) { OSL_FAIL( "MLdapAttributeMap::GetAttributes: not implemented!" ); @@ -185,7 +185,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetFirstAttribute(const nsACString & aProperty, nsACString & _retval) { OString sProperty( MTypeConverter::nsACStringToOString( aProperty ) ); @@ -207,7 +207,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetAttributeList(const nsACString & aProperty, const nsACString & aAttributeList, PRBool allowInconsistencies) { OSL_FAIL( "MLdapAttributeMap::SetAttributeList: not implemented!" ); @@ -217,7 +217,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetProperty(const nsACString & aAttribute, nsACString & _retval) { OSL_FAIL( "MLdapAttributeMap::GetProperty: not implemented!" ); @@ -226,7 +226,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::GetAllCardAttributes(nsACString & _retval) { const MapPropertiesToAttributes& rPropertyMap( lcl_getPropertyMap() ); @@ -246,14 +246,14 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::CheckState(void) { // we do not allow modifying the map, so we're always in a valid state return NS_OK; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetFromPrefs(const nsACString & aPrefBranchName) { OSL_FAIL( "MLdapAttributeMap::SetFromPrefs: not implemented!" ); @@ -261,7 +261,7 @@ namespace connectivity { namespace mozab { return NS_ERROR_NOT_IMPLEMENTED; } - // ------------------------------------------------------------------- + NS_IMETHODIMP MLdapAttributeMap::SetCardPropertiesFromLDAPMessage(nsILDAPMessage* aMessage, nsIAbCard* aCard) { NS_ENSURE_ARG_POINTER( aMessage ); @@ -313,7 +313,7 @@ namespace connectivity { namespace mozab { return NS_OK; } - // ------------------------------------------------------------------- + namespace { struct PreferMailFormatType @@ -347,7 +347,7 @@ namespace connectivity { namespace mozab { } } - // ------------------------------------------------------------------- + void MLdapAttributeMap::fillCardFromResult( nsIAbCard& _card, const MQueryHelperResultEntry& _result ) { _card.SetPreferMailFormat( nsIAbPreferMailFormat::unknown ); @@ -391,7 +391,7 @@ namespace connectivity { namespace mozab { } } - // ------------------------------------------------------------------- + void MLdapAttributeMap::fillResultFromCard( MQueryHelperResultEntry& _result, nsIAbCard& _card ) { nsXPIDLString value; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index 039db52576f5..9cd96b40acdc 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -191,7 +191,7 @@ nsresult MNSMozabProxy::QueryHelperStub() } return rv; } -//------------------------------------------------------------------- + #define NS_LDAPCONNECTION_CONTRACTID "@mozilla.org/network/ldap-connection;1" #define NS_LDAPOPERATION_CONTRACTID "@mozilla.org/network/ldap-operation;1" @@ -287,7 +287,7 @@ NS_IMETHODIMP MLDAPMessageListener::OnLDAPMessage( nsILDAPMessage* aMessage ) return NS_OK; } -//------------------------------------------------------------------- + nsresult MNSMozabProxy::testLDAPConnection( ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx index be8d8e637ae2..4325f4e31892 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx @@ -28,33 +28,33 @@ using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> MNSTerminateListener::mxTerminateListener = new MNSTerminateListener(); -// ----------------------------------------- + // - MNSTerminateListener - -// ----------------------------------------- + MNSTerminateListener::MNSTerminateListener( ) { } -// ----------------------------------------------------------------------------- + MNSTerminateListener::~MNSTerminateListener() { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::disposing( const EventObject& /*Source*/ ) throw( RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::queryTermination( const EventObject& /*aEvent*/ ) throw( TerminationVetoException, RuntimeException ) { } -// ----------------------------------------------------------------------------- + void SAL_CALL MNSTerminateListener::notifyTermination( const EventObject& /*aEvent*/ ) throw( RuntimeException ) { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index 3a618fa8c62a..2395bd0009b0 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -50,7 +50,7 @@ using namespace ::com::sun::star::beans; using namespace ::com::sun::star::sdbc; using namespace connectivity; -// ------------------------------------------------------------------------- + // Used to store an nsIAbDirectoryQuery member without the need to use Mozilla // types in the MQuery.hxx file. // @@ -65,7 +65,7 @@ namespace connectivity { } } -// ------------------------------------------------------------------------- + MQuery::MQuery( const OColumnAlias& _ca ) :m_rColumnAlias( _ca ) { @@ -79,7 +79,7 @@ MQuery::MQuery( const OColumnAlias& _ca ) OSL_TRACE( "\tOUT MQuery::MQuery( ca )" ); } -// ------------------------------------------------------------------------- + MQuery::~MQuery() { OSL_TRACE("IN MQuery::~MQuery()"); @@ -98,7 +98,7 @@ MQuery::~MQuery() OSL_TRACE("\tOUT MQuery::~MQuery()"); } -// ----------------------------------------------------------------------------- + void MQuery::construct() { // Set default values. (For now just as a reminder). @@ -113,7 +113,7 @@ void MQuery::construct() m_aQueryHelper = new MQueryHelper(); NS_IF_ADDREF( m_aQueryHelper); } -// ------------------------------------------------------------------------- + void MQuery::setAddressbook(OUString &ab) { OSL_TRACE("IN MQuery::setAddressbook()"); @@ -123,7 +123,7 @@ void MQuery::setAddressbook(OUString &ab) OSL_TRACE("\tOUT MQuery::setAddressbook()"); } -// ------------------------------------------------------------------------- + void MQuery::setMaxNrOfReturns(const sal_Int32 mnr) { OSL_TRACE( "IN MQuery::setMaxNrOfReturns()" ); @@ -132,7 +132,7 @@ void MQuery::setMaxNrOfReturns(const sal_Int32 mnr) m_nMaxNrOfReturns = mnr; OSL_TRACE("\tOUT MQuery::setMaxNrOfReturns()" ); } -// ------------------------------------------------------------------------- + void MQuery::setExpression( MQueryExpression &_expr ) { OSL_TRACE("IN MQuery::setExpression()"); @@ -142,7 +142,7 @@ void MQuery::setExpression( MQueryExpression &_expr ) OSL_TRACE("\tOUT MQuery::setExpression()"); } -// ------------------------------------------------------------------------- + static sal_Int32 generateExpression( MQuery* _aQuery, MQueryExpression* _aExpr, nsIAbBooleanExpression* queryExpression ) { @@ -312,7 +312,7 @@ sal_Bool isProfileLocked(OConnection* _pCon) } -// ------------------------------------------------------------------------- + sal_Int32 getDirectoryType(const nsIAbDirectory* directory) { nsresult retCode; @@ -349,7 +349,7 @@ sal_Int32 getDirectoryType(const nsIAbDirectory* directory) return SDBCAddress::Unknown; } -// ------------------------------------------------------------------------- + sal_Bool isForceQueryProxyUsed(const nsIAbDirectory* directory) { sal_Int32 nType = getDirectoryType(directory); @@ -357,7 +357,7 @@ sal_Bool isForceQueryProxyUsed(const nsIAbDirectory* directory) return sal_True; return sal_False; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex) { if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery) @@ -374,7 +374,7 @@ sal_Int32 MQuery::commitRow(const sal_Int32 rowIndex) return rv; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex) { if (!m_aQueryHelper || !m_aQueryDirectory || !m_aQueryDirectory->directoryQuery) @@ -392,7 +392,7 @@ sal_Int32 MQuery::deleteRow(const sal_Int32 rowIndex) } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::executeQuery(OConnection* _pCon) { ::osl::MutexGuard aGuard(m_aMutex); @@ -410,7 +410,7 @@ sal_Int32 MQuery::executeQuery(OConnection* _pCon) rv = xMProxy.StartProxy(&args,m_Product,m_Profile); return rv; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) { #if OSL_DEBUG_LEVEL > 0 @@ -563,7 +563,7 @@ sal_Int32 MQuery::executeQueryProxied(OConnection* _pCon) return(0); } -// ------------------------------------------------------------------------- + // // // If the query executed is being done asynchronously then this may return @@ -575,7 +575,7 @@ MQuery::getRowCount() return( m_aQueryHelper->getResultCount() ); } -// ------------------------------------------------------------------------- + // // // As opposed to getRowCount() this returns the actual number of rows fetched @@ -606,7 +606,7 @@ MQuery::waitForQueryComplete( void ) return( sal_False ); } -// ------------------------------------------------------------------------- + sal_Bool MQuery::checkRowAvailable( sal_Int32 nDBRow ) @@ -619,7 +619,7 @@ MQuery::checkRowAvailable( sal_Int32 nDBRow ) return( getRowCount() > nDBRow ); } -// ------------------------------------------------------------------------- + sal_Bool MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { @@ -644,7 +644,7 @@ MQuery::setRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC return sal_True; } -// ------------------------------------------------------------------------- + sal_Bool MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBColumnName, sal_Int32 nType ) const { @@ -670,7 +670,7 @@ MQuery::getRowValue( ORowSetValue& rValue, sal_Int32 nDBRow,const OUString& aDBC return sal_True; } -// ------------------------------------------------------------------------- + sal_Int32 MQuery::getRowStates(sal_Int32 nDBRow) { @@ -728,7 +728,7 @@ MQuery::createNewCard() NS_ENSURE_SUCCESS(rv,0); return nNumber; } -// ------------------------------------------------------------------------- + MNameMapper* MQuery::CreateNameMapper() @@ -736,13 +736,13 @@ MQuery::CreateNameMapper() return( new MNameMapper() ); } -// ------------------------------------------------------------------------- + void MQuery::FreeNameMapper( MNameMapper* _ptr ) { delete _ptr; } -// ------------------------------------------------------------------------- + sal_Bool MQuery::isWritable(OConnection* _pCon) { if ( !m_aQueryDirectory ) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index 6ef6759e2bbb..0e9264a39fad 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -290,7 +290,7 @@ MQueryHelper::waitForRow( sal_Int32 rowNum ) return( sal_True ); } -// ------------------------------------------------------------------------- + sal_Int32 MQueryHelper::getResultCount() const @@ -308,7 +308,7 @@ MQueryHelper::getResultCount() const } } -// ------------------------------------------------------------------------- + sal_uInt32 MQueryHelper::getRealCount() const @@ -317,7 +317,7 @@ MQueryHelper::getRealCount() const return static_cast<sal_Int32>(m_aResults.size()); } -// ------------------------------------------------------------------------- + NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) { ::osl::MutexGuard aGuard( m_aMutex ); @@ -398,7 +398,7 @@ NS_IMETHODIMP MQueryHelper::OnQueryItem(nsIAbDirectoryQueryResult *result) return(NS_OK); } -// ----------------------------------------------------------------------------- + void MQueryHelper::notifyQueryError() { m_bQueryComplete = sal_True ; @@ -591,7 +591,7 @@ sal_Bool MQueryHelper::resyncRow(sal_uInt32 rowIndex) getCardValues(card,rowIndex); return sal_True; } -// ------------------------------------------------------------------------- + sal_Int32 MQueryHelper::createNewCard() { ::osl::MutexGuard aGuard( m_aMutex ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 813d67b09179..5272a6b61cab 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -24,7 +24,7 @@ using namespace connectivity::mozab; -// ------------------------------------------------------------------------- + void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) { // Convert to OString (utf-8 encoding). @@ -37,20 +37,20 @@ void MTypeConverter::ouStringToNsString(OUString const &ous, nsString &nss) //const PRUnichar* uniMozString = (const PRUnichar*) mozString; nss = mozString; // temp. } -// ------------------------------------------------------------------------- + OString MTypeConverter::nsACStringToOString( const nsACString& _source ) { const char* buffer = _source.BeginReading(); const char* bufferEnd = _source.EndReading(); return OString( buffer, static_cast<sal_Int32>(bufferEnd - buffer) ); } -// ------------------------------------------------------------------------- + void MTypeConverter::asciiToNsACString( const sal_Char* _asciiString, nsACString& _dest ) { _dest.Truncate(); _dest.AppendASCII( _asciiString ); } -// ------------------------------------------------------------------------- + void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) { // Get clone of buffer. @@ -64,7 +64,7 @@ void MTypeConverter::nsStringToOUString(nsString const &nss, OUString &ous) nsMemory::Free(uc); } -// ------------------------------------------------------------------------- + void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) { // TODO, specify length. @@ -72,7 +72,7 @@ void MTypeConverter::prUnicharToOUString(PRUnichar const *pru, OUString &ous) OUString _ous(reinterpret_cast_mingw_only<const sal_Unicode *>(pru)); ous = _ous; } -// ------------------------------------------------------------------------- + char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) { // Convert OUString to OString, @@ -80,6 +80,6 @@ char *MTypeConverter::ouStringToCCharStringAscii(OUString const &ous) return(strdup(os.getStr())); } -// ------------------------------------------------------------------------- + /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ |