diff options
Diffstat (limited to 'connectivity/source/drivers/mozab')
77 files changed, 381 insertions, 381 deletions
diff --git a/connectivity/source/drivers/mozab/MCatalog.cxx b/connectivity/source/drivers/mozab/MCatalog.cxx index 45e399473eee..4cf749277227 100644 --- a/connectivity/source/drivers/mozab/MCatalog.cxx +++ b/connectivity/source/drivers/mozab/MCatalog.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -50,12 +50,12 @@ OCatalog::OCatalog(OConnection* _pCon) : connectivity::sdbcx::OCatalog(_pCon) ,m_pConnection(_pCon) ,m_xMetaData(m_pConnection->getMetaData( )) { -// osl_incrementInterlockedCount( &m_refCount ); -// refreshTables(); -// refreshViews(); -// refreshGroups(); -// refreshUsers(); -// osl_decrementInterlockedCount( &m_refCount ); +// osl_incrementInterlockedCount( &m_refCount ); +// refreshTables(); +// refreshViews(); +// refreshGroups(); +// refreshUsers(); +// osl_decrementInterlockedCount( &m_refCount ); } // ------------------------------------------------------------------------- void OCatalog::refreshTables() diff --git a/connectivity/source/drivers/mozab/MCatalog.hxx b/connectivity/source/drivers/mozab/MCatalog.hxx index d75774f7de05..cc57748fe15e 100644 --- a/connectivity/source/drivers/mozab/MCatalog.hxx +++ b/connectivity/source/drivers/mozab/MCatalog.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,22 +39,22 @@ namespace connectivity class OConnection; class OCatalog : public connectivity::sdbcx::OCatalog { - OConnection* m_pConnection; // used to get the metadata + OConnection* m_pConnection; // used to get the metadata ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; // just to make things easier public: // implementation of the pure virtual methods virtual void refreshTables(); - virtual void refreshViews() ; + virtual void refreshViews() ; virtual void refreshGroups(); - virtual void refreshUsers() ; + virtual void refreshUsers() ; virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > SAL_CALL getTables( ) throw(::com::sun::star::uno::RuntimeException); public: OCatalog(OConnection* _pCon); - OConnection* getConnection() const { return m_pConnection; } - sdbcx::OCollection* getPrivateTables() const { return m_pTables;} - sdbcx::OCollection* getPrivateViews() const { return m_pViews; } + OConnection* getConnection() const { return m_pConnection; } + sdbcx::OCollection* getPrivateTables() const { return m_pTables;} + sdbcx::OCollection* getPrivateViews() const { return m_pViews; } static const ::rtl::OUString& getDot(); }; diff --git a/connectivity/source/drivers/mozab/MColumnAlias.cxx b/connectivity/source/drivers/mozab/MColumnAlias.cxx index 211a7c307542..72a35ef63d5b 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.cxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/MColumnAlias.hxx b/connectivity/source/drivers/mozab/MColumnAlias.hxx index 5e4858062aaa..b668bba01e5f 100644 --- a/connectivity/source/drivers/mozab/MColumnAlias.hxx +++ b/connectivity/source/drivers/mozab/MColumnAlias.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/MColumns.cxx b/connectivity/source/drivers/mozab/MColumns.cxx index a3a838a11104..6a95f44df03a 100644 --- a/connectivity/source/drivers/mozab/MColumns.cxx +++ b/connectivity/source/drivers/mozab/MColumns.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ using namespace connectivity::sdbcx; using namespace connectivity; using namespace ::com::sun::star::uno; using namespace ::com::sun::star::beans; -// using namespace ::com::sun::star::sdbcx; +// using namespace ::com::sun::star::sdbcx; using namespace ::com::sun::star::sdbc; using namespace ::com::sun::star::container; using namespace ::com::sun::star::lang; @@ -68,9 +68,9 @@ sdbcx::ObjectType OColumns::createObject(const ::rtl::OUString& _rName) { if(xRow->getString(4) == _rName) { - sal_Int32 nType = xRow->getInt(5); - ::rtl::OUString sTypeName = xRow->getString(6); - sal_Int32 nPrec = xRow->getInt(7); + sal_Int32 nType = xRow->getInt(5); + ::rtl::OUString sTypeName = xRow->getString(6); + sal_Int32 nPrec = xRow->getInt(7); OColumn* pRet = new OColumn(_rName, sTypeName, diff --git a/connectivity/source/drivers/mozab/MColumns.hxx b/connectivity/source/drivers/mozab/MColumns.hxx index 6328dc36e1f2..ffa11ed4af10 100644 --- a/connectivity/source/drivers/mozab/MColumns.hxx +++ b/connectivity/source/drivers/mozab/MColumns.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,12 +41,12 @@ namespace connectivity class OColumns : public sdbcx::OCollection { protected: - OTable* m_pTable; + OTable* m_pTable; virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); public: - OColumns( OTable* _pTable, + OColumns( OTable* _pTable, ::osl::Mutex& _rMutex, const TStringVector &_rVector ) : sdbcx::OCollection(*_pTable,sal_True,_rMutex,_rVector) diff --git a/connectivity/source/drivers/mozab/MConfigAccess.cxx b/connectivity/source/drivers/mozab/MConfigAccess.cxx index 0e4d36fe4daa..c45ee87ff8a8 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.cxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -190,8 +190,8 @@ namespace connectivity //------------------------------------------------------------------------- extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString sUserProfile; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString sUserProfile; if ( !bReadConfig ) { sUserProfile = ::connectivity::mozab::getPreferredProfileName( ); @@ -203,9 +203,9 @@ extern "C" const sal_Unicode* SAL_CALL getUserProfile( void ) //------------------------------------------------------------------------ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usPabDescription; - static ::rtl::OString sPabDescription; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString usPabDescription; + static ::rtl::OString sPabDescription; if ( !bReadConfig ) { @@ -223,9 +223,9 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ) //------------------------------------------------------------------------- extern "C" const sal_Char* SAL_CALL getHisDescription( void ) { - static sal_Bool bReadConfig = sal_False; - static ::rtl::OUString usHisDescription; - static ::rtl::OString sHisDescription; + static sal_Bool bReadConfig = sal_False; + static ::rtl::OUString usHisDescription; + static ::rtl::OString sHisDescription; if ( !bReadConfig ) { diff --git a/connectivity/source/drivers/mozab/MConfigAccess.hxx b/connectivity/source/drivers/mozab/MConfigAccess.hxx index 7aa02d0b4b5e..7b66797a1f81 100644 --- a/connectivity/source/drivers/mozab/MConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MConfigAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -36,6 +36,6 @@ extern "C" const sal_Char* SAL_CALL getPabDescription( void ); extern "C" const sal_Char* SAL_CALL getHisDescription( void ); -#endif // CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX +#endif // CONNECTIVITY_MOZAB_MCONFIGACCESS_HXX /* vim:set shiftwidth=4 softtabstop=4 expandtab: */ diff --git a/connectivity/source/drivers/mozab/MConnection.cxx b/connectivity/source/drivers/mozab/MConnection.cxx index 68a2349a347e..cdf3c6df917c 100644 --- a/connectivity/source/drivers/mozab/MConnection.cxx +++ b/connectivity/source/drivers/mozab/MConnection.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -120,7 +120,7 @@ const sal_Char* getSchemeURI( MozillaScheme _eScheme ) // ----------------------------------------------------------------------------- -OConnection::OConnection(MozabDriver* _pDriver) +OConnection::OConnection(MozabDriver* _pDriver) :OSubComponent<OConnection, OConnection_BASE>((::cppu::OWeakObject*)_pDriver, this) ,m_pDriver(_pDriver) ,m_pImplData( new ConnectionImplData ) @@ -152,7 +152,7 @@ void SAL_CALL OConnection::release() throw() void OConnection::construct(const ::rtl::OUString& url,const Sequence< PropertyValue >& info) throw(SQLException) { OSL_TRACE("IN OConnection::construct()\n" ); - // open file + // open file setURL(url); // // Skip 'sdbc:mozab: part of URL @@ -378,7 +378,7 @@ Reference< XPreparedStatement > SAL_CALL OConnection::prepareStatement( const :: OPreparedStatement* pPrepared = new OPreparedStatement(this,_sSql); Reference< XPreparedStatement > xReturn = pPrepared; pPrepared->lateInit(); - + m_aStatements.push_back(WeakReferenceHelper(xReturn)); return xReturn; } diff --git a/connectivity/source/drivers/mozab/MConnection.hxx b/connectivity/source/drivers/mozab/MConnection.hxx index 76dcb328c2c4..4ec99a12940c 100644 --- a/connectivity/source/drivers/mozab/MConnection.hxx +++ b/connectivity/source/drivers/mozab/MConnection.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -56,12 +56,12 @@ namespace connectivity namespace SDBCAddress { typedef enum { - Unknown = 0, - Mozilla = 1, - ThunderBird = 2, - LDAP = 3, - Outlook = 4, - OutlookExp = 5 + Unknown = 0, + Mozilla = 1, + ThunderBird = 2, + LDAP = 3, + Outlook = 4, + OutlookExp = 5 } sdbc_address_type; } @@ -96,7 +96,7 @@ namespace connectivity #endif const sal_Char* getSdbcScheme( SdbcScheme _eScheme ); - typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding + typedef connectivity::OMetaConnection OConnection_BASE; // implements basics and text encoding struct ConnectionImplData; class OConnection : public OConnection_BASE, @@ -110,34 +110,34 @@ namespace connectivity //==================================================================== ::com::sun::star::sdbc::SQLWarning m_aLastWarning; // Last SQLWarning generated by // an operation - MozabDriver* m_pDriver; // Pointer to the owning + MozabDriver* m_pDriver; // Pointer to the owning // driver object ::std::auto_ptr< ConnectionImplData > m_pImplData; // This is to be able to hold a boost::shared_ptr. If we would hold it as member, it would // not compile the mozillasrc directory, since this directory is compiled without RTTI support // and boost seems to require RTTI on some platforms. // Store Catalog - ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; + ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XTablesSupplier> m_xCatalog; // Start of Additions from the land of mozilla OColumnAlias m_aColumnAlias; rtl::OUString m_sMozillaURI; rtl::OUString m_sMozillaProfile; - sal_Int32 m_nMaxResultRecords; - MNameMapper* m_aNameMapper; + sal_Int32 m_nMaxResultRecords; + MNameMapper* m_aNameMapper; //LDAP only rtl::OUString m_sHostName; sal_Bool m_bUseSSL; rtl::OUString m_sBindDN; - rtl::OUString m_sUser; // the user name + rtl::OUString m_sUser; // the user name rtl::OUString m_sPassword; - SDBCAddress::sdbc_address_type m_eSDBCAddressType; + SDBCAddress::sdbc_address_type m_eSDBCAddressType; sal_Bool m_bForceLoadTable; public: virtual void construct( const ::rtl::OUString& url,const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& info) throw(::com::sun::star::sdbc::SQLException); - OConnection(MozabDriver* _pDriver); + OConnection(MozabDriver* _pDriver); virtual ~OConnection(); void closeAllStatements () throw( ::com::sun::star::sdbc::SQLException); @@ -174,7 +174,7 @@ namespace connectivity virtual ::com::sun::star::uno::Any SAL_CALL getWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); virtual void SAL_CALL clearWarnings( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); // - MozabDriver* getDriver() const { return m_pDriver;} + MozabDriver* getDriver() const { return m_pDriver;} // Added to enable me to use SQLInterpreter which requires an // XNameAccess i/f to access tables. @@ -182,9 +182,9 @@ namespace connectivity // Additions from the land of mozilla - rtl::OUString getMozURI() const { return m_sMozillaURI; } - rtl::OUString getMozProfile() const { return m_sMozillaProfile; } - void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } + rtl::OUString getMozURI() const { return m_sMozillaURI; } + rtl::OUString getMozProfile() const { return m_sMozillaProfile; } + void setMozProfile(rtl::OUString &aNewProfile) { m_sMozillaProfile = aNewProfile; } ::com::sun::star::mozilla::MozillaProductType getProduct() { @@ -206,14 +206,14 @@ namespace connectivity sal_Bool isLDAP(void) const { return m_eSDBCAddressType == SDBCAddress::LDAP; } sal_Bool isThunderbird(void) const { return m_eSDBCAddressType == SDBCAddress::ThunderBird; } - sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} - sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } + sal_Bool isOutlookExpress() const { return m_eSDBCAddressType == SDBCAddress::OutlookExp;} + sal_Int32 getMaxResultRecords() const { return m_nMaxResultRecords; } SDBCAddress::sdbc_address_type getSDBCAddressType() const { return m_eSDBCAddressType;} const OColumnAlias & getColumnAlias() const { return (m_aColumnAlias); } - static ::rtl::OUString getDriverImplementationName(); + static ::rtl::OUString getDriverImplementationName(); MNameMapper* getNameMapper(); void setForceLoadTables(sal_Bool aForce){ m_bForceLoadTable = aForce;} diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx index 4bcea69d2f1a..161d0bced0d3 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -223,7 +223,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxColumnsInTable( ) throw(SQLExceptio return nValue; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxStatements_throw( ) { return 0; } @@ -234,7 +234,7 @@ sal_Int32 SAL_CALL ODatabaseMetaData::getMaxTableNameLength( ) throw(SQLExcepti return nValue; } // ------------------------------------------------------------------------- -sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) +sal_Int32 ODatabaseMetaData::impl_getMaxTablesInSelect_throw( ) { // We only support a single table return 1; @@ -256,7 +256,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::storesLowerCaseIdentifiers( ) throw(SQLExc return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) +sal_Bool ODatabaseMetaData::impl_storesMixedCaseQuotedIdentifiers_throw( ) { return sal_False; } @@ -303,7 +303,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsNonNullableColumns( ) throw(SQLExc return aVal; } // ------------------------------------------------------------------------- -::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) +::rtl::OUString ODatabaseMetaData::impl_getIdentifierQuoteString_throw( ) { // normally this is " return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("\"")); @@ -381,7 +381,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsTransactionIsolationLevel( sal_Int3 return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsSchemasInDataManipulation_throw( ) { return sal_False; } @@ -406,7 +406,7 @@ sal_Bool SAL_CALL ODatabaseMetaData::supportsSchemasInIndexDefinitions( ) throw return sal_False; } // ------------------------------------------------------------------------- -sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) +sal_Bool ODatabaseMetaData::impl_supportsSchemasInTableDefinitions_throw( ) { return sal_False; } @@ -976,7 +976,7 @@ Reference< XResultSet > SAL_CALL ODatabaseMetaData::getTablePrivileges( ::std::vector< ::rtl::OUString > tables; ::std::vector< ::rtl::OUString > types; - if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) + if ( !m_pDbMetaDataHelper->getTableStrings( m_pConnection, tables, types ) ) getOwnConnection()->throwSQLException( m_pDbMetaDataHelper->getError(), *this ); ::connectivity::ODatabaseMetaDataResultSet::ORows aRows; diff --git a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx index 4fb8d5f9a145..89f908367d3e 100644 --- a/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx +++ b/connectivity/source/drivers/mozab/MDatabaseMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity class ODatabaseMetaData : public ODatabaseMetaDataBase { - OConnection* m_pConnection; + OConnection* m_pConnection; MDatabaseMetaDataHelper* m_pDbMetaDataHelper; ODatabaseMetaDataResultSet::ORows& SAL_CALL getColumnRows( const ::rtl::OUString& tableNamePattern, const ::rtl::OUString& columnNamePattern ) throw( ::com::sun::star::sdbc::SQLException ); @@ -53,7 +53,7 @@ namespace connectivity inline OConnection* getOwnConnection() const { return m_pConnection; } ODatabaseMetaData(OConnection* _pCon); - + private: virtual ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSet > impl_getTypeInfo_throw(); // cached database information @@ -70,7 +70,7 @@ namespace connectivity virtual sal_Int32 impl_getMaxStatements_throw( ); virtual sal_Int32 impl_getMaxTablesInSelect_throw( ); virtual sal_Bool impl_storesMixedCaseQuotedIdentifiers_throw( ); - + // as I mentioned before this interface is really BIG // XDatabaseMetaData virtual sal_Bool SAL_CALL allProceduresAreCallable( ) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MDriver.cxx b/connectivity/source/drivers/mozab/MDriver.cxx index c88c6742e6b9..0b2950b3dd31 100644 --- a/connectivity/source/drivers/mozab/MDriver.cxx +++ b/connectivity/source/drivers/mozab/MDriver.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -69,7 +69,7 @@ MozabDriver::~MozabDriver() void MozabDriver::disposing() { ::osl::MutexGuard aGuard(m_aMutex); - + // when driver will be destroied so all our connections have to be destroied as well for (OWeakRefArray::iterator i = m_xConnections.begin(); m_xConnections.end() != i; ++i) { @@ -100,7 +100,7 @@ rtl::OUString MozabDriver::getImplementationName_Static( ) throw(RuntimeExcepti //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > MozabDriver::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.sdbc.Driver Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbc.Driver")); @@ -149,8 +149,8 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u OSL_ENSURE( xInstance.is(), "failed to create instance" ); OConnection* pCon = reinterpret_cast<OConnection*>((*m_pCreationFunc)(this)); - xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) - pCon->construct(url,info); // late constructor call which can throw exception and allows a correct dtor call when so + xCon = pCon; // important here because otherwise the connection could be deleted inside (refcount goes -> 0) + pCon->construct(url,info); // late constructor call which can throw exception and allows a correct dtor call when so m_xConnections.push_back(WeakReferenceHelper(*pCon)); } @@ -161,14 +161,14 @@ Reference< XConnection > SAL_CALL MozabDriver::connect( const ::rtl::OUString& u STR_COULD_NOT_LOAD_LIB, "$libname$", ::rtl::OUString::createFromAscii( SVLIBRARY( "mozabdrv" ) ) ) ); - + ::dbtools::throwGenericSQLException(sError,*this); } - + return xCon; } // -------------------------------------------------------------------------------- -sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) +sal_Bool SAL_CALL MozabDriver::acceptsURL( const ::rtl::OUString& url ) throw(SQLException, RuntimeException) { if ( !ensureInit() ) @@ -203,7 +203,7 @@ Sequence< DriverPropertyInfo > SAL_CALL MozabDriver::getPropertyInfo( const ::rt ,::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("100")) ,Sequence< ::rtl::OUString >()) ); - return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); + return Sequence< DriverPropertyInfo >(&aDriverInfo[0],aDriverInfo.size()); } ::connectivity::SharedResources aResources; const ::rtl::OUString sMessage = aResources.getResourceString(STR_URI_SYNTAX_ERROR); diff --git a/connectivity/source/drivers/mozab/MDriver.hxx b/connectivity/source/drivers/mozab/MDriver.hxx index b8ea911c7db1..5684486b39b7 100644 --- a/connectivity/source/drivers/mozab/MDriver.hxx +++ b/connectivity/source/drivers/mozab/MDriver.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -42,13 +42,13 @@ 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 ); - + typedef void* (SAL_CALL * OMozabConnection_CreateInstanceFunction)(void* _pDriver ); typedef void (SAL_CALL * OSetMozabServiceFactory)( void* _pFactory ); typedef const void* (SAL_CALL * OGetSdbcScheme_Function)( short ); - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::sdbc::XDriver, ::com::sun::star::lang::XServiceInfo > ODriver_BASE; enum EDriverType @@ -66,11 +66,11 @@ namespace connectivity protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access - connectivity::OWeakRefArray m_xConnections; // vector containing a list + ::osl::Mutex m_aMutex; // mutex is need to control member access + connectivity::OWeakRefArray m_xConnections; // vector containing a list // of all the Connection objects // for this Driver - oslModule m_hModule; + oslModule m_hModule; OMozabConnection_CreateInstanceFunction m_pCreationFunc; OGetSdbcScheme_Function m_pSchemeFunction; diff --git a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx index bc1b4fdc07d4..94f15db36bbf 100644 --- a/connectivity/source/drivers/mozab/MExtConfigAccess.hxx +++ b/connectivity/source/drivers/mozab/MExtConfigAccess.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.cxx b/connectivity/source/drivers/mozab/MPreparedStatement.cxx index f8d417bf60da..c221684cbb9d 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.cxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -387,7 +387,7 @@ void OPreparedStatement::setFastPropertyValue_NoBroadcast(sal_Int32 nHandle,cons // ----------------------------------------------------------------------------- void OPreparedStatement::checkParameterIndex(sal_Int32 _parameterIndex) { - if( !_parameterIndex || _parameterIndex > m_nNumParams) + if( !_parameterIndex || _parameterIndex > m_nNumParams) ::dbtools::throwInvalidIndexException(*this); } // ----------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mozab/MPreparedStatement.hxx b/connectivity/source/drivers/mozab/MPreparedStatement.hxx index 31cfa97bc3f0..cf2dd1986e73 100644 --- a/connectivity/source/drivers/mozab/MPreparedStatement.hxx +++ b/connectivity/source/drivers/mozab/MPreparedStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -101,7 +101,7 @@ namespace connectivity void checkAndResizeParameters(sal_Int32 parameterIndex); void setParameter(sal_Int32 parameterIndex, const ORowSetValue& x); - sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, + sal_uInt32 AddParameter(connectivity::OSQLParseNode * pParameter, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet>& _xCol); void scanParameter(OSQLParseNode* pParseNode,::std::vector< OSQLParseNode*>& _rParaNodes); void describeColumn(OSQLParseNode* _pParameter,OSQLParseNode* _pNode,const OSQLTable& _xTable); diff --git a/connectivity/source/drivers/mozab/MResultSet.cxx b/connectivity/source/drivers/mozab/MResultSet.cxx index 50aee9f216ea..8ca4e57b8166 100644 --- a/connectivity/source/drivers/mozab/MResultSet.cxx +++ b/connectivity/source/drivers/mozab/MResultSet.cxx @@ -71,8 +71,8 @@ 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"); -::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ +// IMPLEMENT_SERVICE_INFO(OResultSet,"com.sun.star.sdbcx.OResultSet","com.sun.star.sdbc.ResultSet"); +::rtl::OUString SAL_CALL OResultSet::getImplementationName( ) throw ( RuntimeException) \ { return ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.sdbcx.mozab.ResultSet")); } @@ -160,7 +160,7 @@ Any SAL_CALL OResultSet::queryInterface( const Type & rType ) throw(RuntimeExcep // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OResultSet::getTypes( ) throw( RuntimeException) { - OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), + OTypeCollection aTypes( ::getCppuType( (const Reference< ::com::sun::star::beans::XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XFastPropertySet > *)0 ), ::getCppuType( (const Reference< ::com::sun::star::beans::XPropertySet > *)0 )); @@ -377,7 +377,7 @@ sal_Bool OResultSet::fetchRow(sal_Int32 cardNumber,sal_Bool bForceReload) throw( if (cardNumber == m_nUpdatedRow) { //write back the changes first - if (!pushCard(cardNumber)) //error write back the changes + if (!pushCard(cardNumber)) //error write back the changes throw SQLException(); } } @@ -621,11 +621,11 @@ IPropertyArrayHelper* OResultSet::createArrayHelper( ) const Sequence< Property > aProps(5); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(FETCHDIRECTION, sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHDIRECTION, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_BOOL_PROP1IMPL(ISBOOKMARKABLE) PropertyAttribute::READONLY); DECL_PROP1IMPL(RESULTSETCONCURRENCY,sal_Int32) PropertyAttribute::READONLY); - DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); + DECL_PROP1IMPL(RESULTSETTYPE, sal_Int32) PropertyAttribute::READONLY); return new OPropertyArrayHelper(aProps); } @@ -1452,9 +1452,9 @@ void OResultSet::setBoundedColumns(const OValueRow& _rRow, sal_Bool OResultSet::isCount() const { return (m_pParseTree && - m_pParseTree->count() > 2 && - SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && - SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && + m_pParseTree->count() > 2 && + SQL_ISRULE(m_pParseTree->getChild(2),scalar_exp_commalist) && + SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0),derived_column) && SQL_ISRULE(m_pParseTree->getChild(2)->getChild(0)->getChild(0),general_set_fct) && m_pParseTree->getChild(2)->getChild(0)->getChild(0)->count() == 4 ); @@ -1495,7 +1495,7 @@ sal_Bool OResultSet::fillKeySet(sal_Int32 nMaxCardNumber) impl_ensureKeySet(); if (m_CurrentRowCount < nMaxCardNumber) { - sal_Int32 nKeyValue; + sal_Int32 nKeyValue; if ( (sal_Int32)m_pKeySet->get().capacity() < nMaxCardNumber ) m_pKeySet->get().reserve(nMaxCardNumber + 20 ); @@ -1564,7 +1564,7 @@ sal_Bool OResultSet::seekRow( eRowPosition pos, sal_Int32 nOffset ) { nCurCard = (m_pKeySet->get())[nCurPos-1]; } - else //The requested row has not been retrived until now. We should get the right card for it. + else //The requested row has not been retrived until now. We should get the right card for it. nCurCard = nCurPos + deletedCount(); while ( nCurCard > nNumberOfRecords && !m_aQuery.queryComplete() ) { @@ -1908,7 +1908,7 @@ void SAL_CALL OResultSet::moveToInsertRow( ) throw(::com::sun::star::sdbc::SQLE ResultSetEntryGuard aGuard( *this ); m_nOldRowPos = m_nRowPos; - if (!m_nNewRow) //no new row now, insert one + if (!m_nNewRow) //no new row now, insert one { checkDisposed(OResultSet_BASE::rBHelper.bDisposed); checkPendingUpdate(); diff --git a/connectivity/source/drivers/mozab/MResultSet.hxx b/connectivity/source/drivers/mozab/MResultSet.hxx index 47e9ad13d276..a39cb0e7e007 100644 --- a/connectivity/source/drivers/mozab/MResultSet.hxx +++ b/connectivity/source/drivers/mozab/MResultSet.hxx @@ -55,7 +55,7 @@ namespace connectivity { /* - ** java_sql_ResultSet + ** java_sql_ResultSet */ typedef ::cppu::WeakComponentImplHelper12< ::com::sun::star::sdbc::XResultSet, ::com::sun::star::sdbc::XRow, @@ -72,21 +72,21 @@ namespace connectivity typedef sal_Int64 TVoidPtr; - typedef ::std::allocator< TVoidPtr > TVoidAlloc; - typedef ::std::vector<TVoidPtr> TVoidVector; + typedef ::std::allocator< TVoidPtr > TVoidAlloc; + typedef ::std::vector<TVoidPtr> TVoidVector; - class OResultSet : public comphelper::OBaseMutex, - public OResultSet_BASE, - public ::cppu::OPropertySetHelper, - public ::comphelper::OPropertyArrayUsageHelper<OResultSet> + class OResultSet : public comphelper::OBaseMutex, + public OResultSet_BASE, + public ::cppu::OPropertySetHelper, + public ::comphelper::OPropertyArrayUsageHelper<OResultSet> { protected: - OCommonStatement* m_pStatement; - ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; + OCommonStatement* m_pStatement; + ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> m_xStatement; ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XResultSetMetaData> m_xMetaData; - sal_uInt32 m_nRowPos; - sal_uInt32 m_nOldRowPos; - sal_Bool m_bWasNull; + sal_uInt32 m_nRowPos; + sal_uInt32 m_nOldRowPos; + sal_Bool m_bWasNull; sal_Int32 m_nFetchSize; sal_Int32 m_nResultSetType; sal_Int32 m_nFetchDirection; @@ -232,7 +232,7 @@ namespace connectivity protected: MQuery m_aQuery; OTable* m_pTable; - sal_Int32 m_CurrentRowCount; + sal_Int32 m_CurrentRowCount; ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > m_xTableColumns; @@ -244,13 +244,13 @@ protected: OValueRow m_aParameterRow; ::std::vector< ::rtl::OUString> m_aAttributeStrings; sal_Int32 m_nParamIndex; - sal_Bool m_bIsAlwaysFalseQuery; + sal_Bool m_bIsAlwaysFalseQuery; ::rtl::Reference<OKeySet> m_pKeySet; OSortIndex* m_pSortIndex; - sal_Int32 m_nNewRow; //inserted row - sal_Int32 m_nUpdatedRow; //updated row - sal_Int32 m_RowStates; - sal_Int32 m_bIsReadOnly; + sal_Int32 m_nNewRow; //inserted row + sal_Int32 m_nUpdatedRow; //updated row + sal_Int32 m_RowStates; + sal_Int32 m_bIsReadOnly; inline void resetParameters() { m_nParamIndex = 0; } ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; // this are the select columns @@ -282,7 +282,7 @@ protected: sal_Bool validRow( sal_uInt32 nRow ); sal_Bool seekRow( eRowPosition pos, sal_Int32 nOffset = 0 ); sal_Int32 deletedCount(); - sal_Bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them + sal_Bool fillKeySet(sal_Int32 nMaxCardNumber); //When we get new rows, fill the m_pKeySet items for them sal_Int32 getRowForCardNumber(sal_Int32 nCardNum); const ORowSetValue& getValue(sal_Int32 rowIndex, sal_Int32 columnIndex) throw(::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx index 99894fb750e1..170cf18e2488 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.cxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -83,7 +83,7 @@ sal_Bool SAL_CALL OResultSetMetaData::isCaseSensitive( sal_Int32 /*column*/ ) th // ------------------------------------------------------------------------- ::rtl::OUString SAL_CALL OResultSetMetaData::getSchemaName( sal_Int32 /*column*/ ) throw(SQLException, RuntimeException) -{ +{ return ::rtl::OUString(); } // ------------------------------------------------------------------------- @@ -193,9 +193,9 @@ sal_Bool SAL_CALL OResultSetMetaData::isSearchable( sal_Int32 column ) throw(SQL sal_Bool SAL_CALL OResultSetMetaData::isReadOnly( sal_Int32 column ) throw(SQLException, RuntimeException) { checkColumnIndex(column); - sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && + sal_Bool bReadOnly = (m_xColumns->get())[column-1]->getPropertySetInfo()->hasPropertyByName(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION)) && ::cppu::any2bool((m_xColumns->get())[column-1]->getPropertyValue(OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_FUNCTION))); - + return m_bReadOnly || bReadOnly || m_pTable->isReadOnly(); } // ------------------------------------------------------------------------- diff --git a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx index e04668070dfc..134089fb40a7 100644 --- a/connectivity/source/drivers/mozab/MResultSetMetaData.hxx +++ b/connectivity/source/drivers/mozab/MResultSetMetaData.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -44,18 +44,18 @@ namespace connectivity //************************************************************** typedef ::cppu::WeakImplHelper1< ::com::sun::star::sdbc::XResultSetMetaData> OResultSetMetaData_BASE; - class OResultSetMetaData : public OResultSetMetaData_BASE + class OResultSetMetaData : public OResultSetMetaData_BASE { ::rtl::OUString m_aTableName; ::rtl::Reference<connectivity::OSQLColumns> m_xColumns; OTable* m_pTable; - sal_Bool m_bReadOnly; + sal_Bool m_bReadOnly; protected: virtual ~OResultSetMetaData(); public: // ein Konstruktor, der fuer das Returnen des Objektes benoetigt wird: - // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} + // OResultSetMetaData(OConnection* _pConnection) : m_pConnection(_pConnection){} OResultSetMetaData(const ::rtl::Reference<connectivity::OSQLColumns>& _rxColumns, const ::rtl::OUString& _aTableName,OTable* _pTable,sal_Bool aReadOnly ) diff --git a/connectivity/source/drivers/mozab/MServices.cxx b/connectivity/source/drivers/mozab/MServices.cxx index 8fcca8ee58f4..24be4a1be71f 100644 --- a/connectivity/source/drivers/mozab/MServices.cxx +++ b/connectivity/source/drivers/mozab/MServices.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -121,8 +121,8 @@ struct ProviderRequest extern "C" SAL_DLLPUBLIC_EXPORT void SAL_CALL component_getImplementationEnvironment( - const sal_Char **ppEnvTypeName, - uno_Environment ** /*ppEnv*/ + const sal_Char **ppEnvTypeName, + uno_Environment ** /*ppEnv*/ ) { *ppEnvTypeName = CPPU_CURRENT_LANGUAGE_BINDING_NAME; @@ -178,7 +178,7 @@ typedef void* (SAL_CALL * OMozillaBootstrap_CreateInstanceFunction)(const Refere OMozillaBootstrap_CreateInstanceFunction s_pCreationFunc = (OMozillaBootstrap_CreateInstanceFunction)osl_getFunctionSymbol(s_hModule, sFactoryCreationFunc.pData); if (NULL == s_pCreationFunc) - { // did not find the symbol + { // did not find the symbol OSL_ENSURE(sal_False, "MozabDriver::registerClient: could not find the symbol for creating the factory!"); osl_unloadModule(s_hModule); s_hModule = NULL; diff --git a/connectivity/source/drivers/mozab/MStatement.cxx b/connectivity/source/drivers/mozab/MStatement.cxx index 709676b21966..e00ab8db2a3e 100644 --- a/connectivity/source/drivers/mozab/MStatement.cxx +++ b/connectivity/source/drivers/mozab/MStatement.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -125,7 +125,7 @@ Any SAL_CALL OCommonStatement::queryInterface( const Type & rType ) throw(Runtim // ------------------------------------------------------------------------- Sequence< Type > SAL_CALL OCommonStatement::getTypes( ) throw(RuntimeException) { - ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), + ::cppu::OTypeCollection aTypes( ::getCppuType( (const Reference< XMultiPropertySet > *)0 ), ::getCppuType( (const Reference< XFastPropertySet > *)0 ), ::getCppuType( (const Reference< XPropertySet > *)0 )); @@ -157,7 +157,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) OSL_ENSURE(xCreateColumn.is(), "Need the Columns!!"); const OColumnAlias& aColumnAlias = m_pConnection->getColumnAlias(); - + OSQLColumns::Vector::const_iterator aIter = xCreateColumn->get().begin(); const ::rtl::OUString sProprtyName = OMetaConnection::getPropMap().getNameByIndex(PROPERTY_ID_NAME); ::rtl::OUString sName; @@ -166,7 +166,7 @@ void OCommonStatement::createTable( ) throw ( SQLException, RuntimeException ) (*aIter)->getPropertyValue(sProprtyName) >>= sName; if ( !aColumnAlias.hasAlias( sName ) ) { - + const ::rtl::OUString sError( getOwnConnection()->getResources().getResourceStringWithSubstitution( STR_INVALID_COLUMNNAME, "$columnname$", sName @@ -393,12 +393,12 @@ void SAL_CALL OCommonStatement::clearWarnings( ) throw(SQLException, RuntimeExc Sequence< Property > aProps(9); Property* pProperties = aProps.getArray(); sal_Int32 nPos = 0; - DECL_PROP0(CURSORNAME, ::rtl::OUString); + DECL_PROP0(CURSORNAME, ::rtl::OUString); DECL_BOOL_PROP0(ESCAPEPROCESSING); DECL_PROP0(FETCHDIRECTION,sal_Int32); - DECL_PROP0(FETCHSIZE, sal_Int32); + DECL_PROP0(FETCHSIZE, sal_Int32); DECL_PROP0(MAXFIELDSIZE,sal_Int32); - DECL_PROP0(MAXROWS, sal_Int32); + DECL_PROP0(MAXROWS, sal_Int32); DECL_PROP0(QUERYTIMEOUT,sal_Int32); DECL_PROP0(RESULTSETCONCURRENCY,sal_Int32); DECL_PROP0(RESULTSETTYPE,sal_Int32); @@ -491,7 +491,7 @@ void OCommonStatement::createColumnMapping() size_t i; // initialize the column index map (mapping select columns to table columns) - ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); + ::rtl::Reference<connectivity::OSQLColumns> xColumns = m_pSQLIterator->getSelectColumns(); m_aColMapping.resize(xColumns->get().size() + 1); for (i=0; i<m_aColMapping.size(); ++i) m_aColMapping[i] = i; @@ -535,7 +535,7 @@ void OCommonStatement::analyseSQL() } } //------------------------------------------------------------------ -void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, +void OCommonStatement::setOrderbyColumn( OSQLParseNode* pColumnRef, OSQLParseNode* pAscendingDescending) { ::rtl::OUString aColumnName; diff --git a/connectivity/source/drivers/mozab/MStatement.hxx b/connectivity/source/drivers/mozab/MStatement.hxx index 41775540713c..de1a75d68f9d 100644 --- a/connectivity/source/drivers/mozab/MStatement.hxx +++ b/connectivity/source/drivers/mozab/MStatement.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace connectivity { class OResultSet; - typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement, + typedef ::cppu::WeakComponentImplHelper3< ::com::sun::star::sdbc::XStatement, ::com::sun::star::sdbc::XWarningsSupplier, ::com::sun::star::sdbc::XCloseable> OCommonStatement_IBASE; @@ -70,9 +70,9 @@ namespace connectivity typedef ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE > OCommonStatement_SBASE; class OCommonStatement :public comphelper::OBaseMutex - ,public OCommonStatement_IBASE - ,public ::cppu::OPropertySetHelper - ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement > + ,public OCommonStatement_IBASE + ,public ::cppu::OPropertySetHelper + ,public ::comphelper::OPropertyArrayUsageHelper< OCommonStatement > ,public OCommonStatement_SBASE { friend class ::connectivity::OSubComponent< OCommonStatement, OCommonStatement_IBASE >; @@ -87,11 +87,11 @@ namespace connectivity // for this Statement - ::std::list< ::rtl::OUString> m_aBatchList; - - OTable* m_pTable; - OConnection* m_pConnection; // The owning Connection object + ::std::list< ::rtl::OUString> m_aBatchList; + OTable* m_pTable; + OConnection* m_pConnection; // The owning Connection object + OValueRow m_aRow; connectivity::OSQLParser m_aParser; @@ -100,7 +100,7 @@ namespace connectivity connectivity::OSQLParseNode* m_pParseTree; - ::std::vector<sal_Int32> m_aColMapping; + ::std::vector<sal_Int32> m_aColMapping; ::std::vector<sal_Int32> m_aOrderbyColumnNumber; ::std::vector<TAscendingOrder> m_aOrderbyAscending; @@ -120,7 +120,7 @@ namespace connectivity throw (::com::sun::star::lang::IllegalArgumentException); virtual void SAL_CALL setFastPropertyValue_NoBroadcast( sal_Int32 nHandle, - const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); + const ::com::sun::star::uno::Any& rValue) throw (::com::sun::star::uno::Exception); virtual void SAL_CALL getFastPropertyValue( ::com::sun::star::uno::Any& rValue, sal_Int32 nHandle) const; @@ -155,7 +155,7 @@ namespace connectivity void analyseSQL(); void setOrderbyColumn( connectivity::OSQLParseNode* pColumnRef, connectivity::OSQLParseNode* pAscendingDescending); - virtual void createTable( ) throw ( + virtual void createTable( ) throw ( ::com::sun::star::sdbc::SQLException, ::com::sun::star::uno::RuntimeException ); public: @@ -193,7 +193,7 @@ namespace connectivity using OPropertySetHelper::getFastPropertyValue; }; - class OStatement : public OCommonStatement, + class OStatement : public OCommonStatement, public ::com::sun::star::lang::XServiceInfo { protected: diff --git a/connectivity/source/drivers/mozab/MTable.cxx b/connectivity/source/drivers/mozab/MTable.cxx index ddfaed031770..d122794a64c1 100644 --- a/connectivity/source/drivers/mozab/MTable.cxx +++ b/connectivity/source/drivers/mozab/MTable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/MTable.hxx b/connectivity/source/drivers/mozab/MTable.hxx index 3cc6728fe156..7f1826257f15 100644 --- a/connectivity/source/drivers/mozab/MTable.hxx +++ b/connectivity/source/drivers/mozab/MTable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -39,13 +39,13 @@ namespace connectivity { typedef ::connectivity::OTableHelper OTable_Base; - class OTable : public OTable_Base + class OTable : public OTable_Base { OConnection* m_pConnection; public: - OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection); - OTable( sdbcx::OCollection* _pTables, + OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection); + OTable( sdbcx::OCollection* _pTables, OConnection* _pConnection, const ::rtl::OUString& _Name, const ::rtl::OUString& _Type, diff --git a/connectivity/source/drivers/mozab/MTables.cxx b/connectivity/source/drivers/mozab/MTables.cxx index b01c8fe9d6b2..ebc913845e30 100644 --- a/connectivity/source/drivers/mozab/MTables.cxx +++ b/connectivity/source/drivers/mozab/MTables.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,14 +61,14 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) ::rtl::OUString aName,aSchema; // sal_Int32 nLen = _rName.indexOf('.'); // aSchema = _rName.copy(0,nLen); - // aName = _rName.copy(nLen+1); + // aName = _rName.copy(nLen+1); aSchema = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); aName = _rName; Sequence< ::rtl::OUString > aTypes(1); aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("%")); - // aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")); - // aTypes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEMTABLE")); + // aTypes[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("TABLE")); + // aTypes[1] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("SYSTEMTABLE")); ::rtl::OUString sEmpty; Reference< XResultSet > xResult = m_xMetaData->getTables(Any(),aSchema,aName,aTypes); @@ -79,7 +79,7 @@ sdbcx::ObjectType OTables::createObject(const ::rtl::OUString& _rName) Reference< XRow > xRow(xResult,UNO_QUERY); if(xResult->next()) // there can be only one table with this name { - OTable* pRet = new OTable( this, static_cast<OCatalog&>(m_rParent).getConnection(), + OTable* pRet = new OTable( this, static_cast<OCatalog&>(m_rParent).getConnection(), aName,xRow->getString(4),xRow->getString(5)); xRet = pRet; } diff --git a/connectivity/source/drivers/mozab/MTables.hxx b/connectivity/source/drivers/mozab/MTables.hxx index 56ed3d001d3e..437bbbe6c558 100644 --- a/connectivity/source/drivers/mozab/MTables.hxx +++ b/connectivity/source/drivers/mozab/MTables.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -37,7 +37,7 @@ namespace connectivity class OTables : public sdbcx::OCollection { ::com::sun::star::uno::Reference< ::com::sun::star::sdbc::XDatabaseMetaData > m_xMetaData; - // OCatalog* m_pParent; + // OCatalog* m_pParent; protected: virtual sdbcx::ObjectType createObject(const ::rtl::OUString& _rName); virtual void impl_refresh() throw(::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx index b4cc37bb2f03..b50a03d50ca7 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -102,7 +102,7 @@ rtl::OUString MozillaBootstrap::getImplementationName_Static( ) throw(RuntimeEx //------------------------------------------------------------------------------ Sequence< ::rtl::OUString > MozillaBootstrap::getSupportedServiceNames_Static( ) throw (RuntimeException) { - // which service is supported + // which service is supported // for more information @see com.sun.star.mozilla.MozillaBootstrap Sequence< ::rtl::OUString > aSNS( 1 ); aSNS[0] = ::rtl::OUString( RTL_CONSTASCII_USTRINGPARAM("com.sun.star.mozilla.MozillaBootstrap")); @@ -227,7 +227,7 @@ Sequence< ::rtl::OUString > SAL_CALL MozillaBootstrap::getSupportedServiceNames( && ( aCode->getProductType() != currProduct || !profileName.equals(currProfileName)) ) setCurrentProfile(aCode->getProductType(),profileName); MNSRunnable xRunnable; - + return xRunnable.StartProxy(aCode);; #else (void)aCode; /* avoid warning about unused parameter */ diff --git a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx index 5a3f609ea90f..d605d4bb0a59 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MMozillaBootstrap.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -40,7 +40,7 @@ namespace connectivity { namespace mozab { - typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::mozilla::XMozillaBootstrap, + typedef ::cppu::WeakComponentImplHelper2< ::com::sun::star::mozilla::XMozillaBootstrap, ::com::sun::star::lang::XServiceInfo > OMozillaBootstrap_BASE; class ProfileAccess; class ProfileManager; @@ -49,11 +49,11 @@ namespace connectivity protected: const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XMultiServiceFactory > m_xMSFactory; - ::osl::Mutex m_aMutex; // mutex is need to control member access + ::osl::Mutex m_aMutex; // mutex is need to control member access virtual ~MozillaBootstrap(); protected: ProfileAccess * m_ProfileAccess; - ProfileManager * m_ProfileManager; + ProfileManager * m_ProfileManager; public: void Init(); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx index f16c8f481a6f..240d8a8a597e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ using namespace ::com::sun::star::mozilla; namespace { - #if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) + #if defined(XP_MAC) || defined(XP_MACOSX) || defined(MACOSX) #define APP_REGISTRY_NAME "Application Registry" #elif defined(XP_WIN) || defined(XP_OS2) #define APP_REGISTRY_NAME "registry.dat" diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx index e6de431e53a5..3ddf002c34fa 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSFolders.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx index 7e523f44e7fd..d8f8d6505532 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -35,10 +35,10 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce { OUString iniUrl; if (osl_File_E_None != osl_getFileURLFromSystemPath(rIniName.pData, &iniUrl.pData)) - return; - + return; + -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 OString sFile = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); OSL_TRACE(__FILE__" -- parser() - %s\n", sFile.getStr()); #endif @@ -50,17 +50,17 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce } catch(::com::sun::star::io::IOException e) { -#if OSL_DEBUG_LEVEL > 0 +#if OSL_DEBUG_LEVEL > 0 OString file_tmp = OUStringToOString(iniUrl, RTL_TEXTENCODING_ASCII_US); OSL_TRACE( __FILE__" -- couldn't open file: %s", file_tmp.getStr() ); #endif } - + if (osl_File_E_None == fileError) { rtl::ByteSequence seq; sal_uInt64 nSize = 0; - + osl_getFileSize(handle, &nSize); OUString sectionName = OUString::createFromAscii("no name section"); while (true) @@ -84,7 +84,7 @@ IniParser::IniParser(OUString const & rIniName) throw(com::sun::star::io::IOExce aSection->lList.push_back(nameValue); } - else + else { sal_Int32 nIndexStart = line.indexOf('['); sal_Int32 nIndexEnd = line.indexOf(']'); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx index 9fb0588ef26e..efe78e8a8ae4 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSINIParser.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx index 8e2cf5deed40..1cffe198ba46 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -45,9 +45,9 @@ #include <osl/thread.hxx> #include <MNSTerminateListener.hxx> -static nsIServiceManager* sServiceManager = nsnull; -static sal_Int32 sInitCounter = 0; -static sal_Bool s_bProfilePresentAfterInitialized = sal_False; +static nsIServiceManager* sServiceManager = nsnull; +static sal_Int32 sInitCounter = 0; +static sal_Bool s_bProfilePresentAfterInitialized = sal_False; static NS_DEFINE_CID(kProfileCID, NS_PROFILE_CID); static NS_DEFINE_CID(kPrefCID, NS_PREF_CID); @@ -84,9 +84,9 @@ extern "C" void NS_SetupRegistry(); { // compare the current and the preferred profile // (by looping through the characters) - const PRUnichar* pCurrent = *pLoop; - const PRUnichar* pPref = pPreferredProfile; - while ( *pCurrent && ( *pCurrent == *pPref ) ) // testing one of them against 0 is enough because of the second clause + const PRUnichar* pCurrent = *pLoop; + const PRUnichar* pPref = pPreferredProfile; + while ( *pCurrent && ( *pCurrent == *pPref ) ) // testing one of them against 0 is enough because of the second clause { ++pCurrent; ++pPref; @@ -152,8 +152,8 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) // Initialise XPCOM NS_InitXPCOM2(&sServiceManager, binDir, NULL); -// if (!sServiceManager) -// return sal_False; +// if (!sServiceManager) +// return sal_False; #ifdef HACK_AROUND_NONREENTRANT_INITXPCOM sXPCOMInitializedFlag = PR_TRUE; @@ -173,10 +173,10 @@ sal_Bool MNS_InitXPCOM(sal_Bool* aProfileExists) eventQService->CreateThreadEventQueue(); -// nsCOMPtr<nsIObserver> mStartupNotifier = do_CreateInstance(NS_APPSTARTUPNOTIFIER_CONTRACTID, &rv); -// if(NS_FAILED(rv)) -// return rv; -// mStartupNotifier->Observe(nsnull, APPSTARTUP_TOPIC, nsnull); +// nsCOMPtr<nsIObserver> mStartupNotifier = do_CreateInstance(NS_APPSTARTUPNOTIFIER_CONTRACTID, &rv); +// if(NS_FAILED(rv)) +// return rv; +// mStartupNotifier->Observe(nsnull, APPSTARTUP_TOPIC, nsnull); #ifdef HACK_AROUND_THREADING_ISSUES // XXX force certain objects to be created on the main thread @@ -275,7 +275,7 @@ extern "C" void MNS_Mozilla_UI_Thread( void *arg ) #endif } - m_aUI_Thread_Condition.set(); //release all blocks + m_aUI_Thread_Condition.set(); //release all blocks OSL_TRACE( "OUT : MNS_Mozilla_UI_Thread() \n" ); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx index 0ccd4322539c..bfc141cc582c 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSInit.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx index 71620b07475f..54d4879acb9e 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -276,7 +276,7 @@ nsProfile::SetCurrentProfile(const PRUnichar * aCurrentProfile) } // -// // Do the profile switch +// // Do the profile switch gDirServiceProvider->SetProfileDir(profileDir); mCurrentProfileName.Assign(aCurrentProfile); // gProfileDataAccess->SetCurrentProfile(aCurrentProfile); @@ -326,7 +326,7 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) // if shutDownType is not a well know value, skip the notifications // see DoOnShutdown() in nsAppRunner.cpp for where we use this behaviour to our benefit if (shutDownType == (PRUint32)SHUTDOWN_PERSIST || shutDownType == (PRUint32)SHUTDOWN_CLEANSE ) { - nsCOMPtr<nsIObserverService> observerService = + nsCOMPtr<nsIObserverService> observerService = do_GetService("@mozilla.org/observer-service;1", &rv); NS_ENSURE_TRUE(observerService, NS_ERROR_FAILURE); @@ -335,7 +335,7 @@ NS_IMETHODIMP nsProfile::ShutDownCurrentProfile(PRUint32 shutDownType) NS_NAMED_LITERAL_STRING(cleanseString, "shutdown-cleanse"); NS_NAMED_LITERAL_STRING(persistString, "shutdown-persist"); const nsAFlatString& context = (shutDownType == (PRUint32)SHUTDOWN_CLEANSE) ? cleanseString : persistString; - + // Phase 1: See if anybody objects to the profile being changed. mProfileChangeVetoed = PR_FALSE; observerService->NotifyObservers(subject, "profile-approve-change", context.get()); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx index 723af162ab5b..37939c4acc9f 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfile.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx index 279faa7f2318..ef6a88917b82 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx index 434c9e3af390..2efe91623318 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDirServiceProvider.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx index dbf1c598b5c8..dbcd90509226 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -116,7 +116,7 @@ namespace connectivity profileName = aProfileName; profilePath = aProfilePath; } - ::rtl::OUString ProfileStruct::getProfilePath() + ::rtl::OUString ProfileStruct::getProfilePath() { #ifdef MINIMAL_PROFILEDISCOVER return profilePath; @@ -149,7 +149,7 @@ namespace connectivity LoadMozillaProfiles(); #endif sal_Int32 count=static_cast<sal_Int32>(m_ProductProfileList[MozillaProductType_Mozilla].mProfileList.size()); - + //load thunderbird profiles to m_ProductProfileList count += LoadXPToolkitProfiles(MozillaProductType_Thunderbird); @@ -186,7 +186,7 @@ namespace connectivity nsCOMPtr<nsIEnumerator> enumKeys; nsRegistryKey profilesTreeKey; - + //step 3:Enumerator it rv = registry->GetKey(nsIRegistry::Common, // PRUnichar != sal_Unicode in mingw @@ -293,7 +293,7 @@ namespace connectivity ::rtl::OUString profilePath; ::rtl::OUString sIsRelative; ::rtl::OUString sIsDefault; - + for(NameValueList::iterator itor=aSection->lList.begin(); itor != aSection->lList.end(); itor++) @@ -323,7 +323,7 @@ namespace connectivity { isRelative = sIsRelative.toInt32(); } - + #ifndef MINIMAL_PROFILEDISCOVER nsCOMPtr<nsILocalFile> rootDir; rv = NS_NewLocalFile(EmptyString(), PR_TRUE, @@ -332,7 +332,7 @@ namespace connectivity OString sPath = OUStringToOString(profilePath, RTL_TEXTENCODING_UTF8); nsCAutoString filePath(sPath.getStr()); - + if (isRelative) { // PRUnichar != sal_Unicode in mingw nsAutoString registryDir( reinterpret_cast_mingw_only<const PRUnichar *>(regDir.getStr()) ); @@ -365,7 +365,7 @@ namespace connectivity m_Product.mCurrentProfileName = profileName; } - + } return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } @@ -374,7 +374,7 @@ namespace connectivity { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { //Profile not found return ::rtl::OUString(); @@ -403,7 +403,7 @@ namespace connectivity list[i] = aProfile->getProfileName(); i++; } - + return static_cast< ::sal_Int32 >(m_Product.mProfileList.size()); } @@ -431,11 +431,11 @@ namespace connectivity nsAutoString path; aFile->GetPath(path); rv = aFile->Exists(bExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!*bExist) { rv = aFile->IsSymlink(bExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); } return rv; } @@ -456,29 +456,29 @@ namespace connectivity PRBool isDir; rv = aFile->IsDirectory(&isDir); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!isDir) return NS_ERROR_FILE_NOT_DIRECTORY; nsCOMPtr<nsILocalFile> lockFile; rv = aFile->Clone((nsIFile **)((void **)getter_AddRefs(lockFile))); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); rv = lockFile->Append(LOCKFILE_NAME); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); PRBool nExist=PR_FALSE; rv = isExistFileOrSymlink(lockFile,&nExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); if (!nExist) // Check OLD_LOCKFILE_NAME { nsCOMPtr<nsILocalFile> oldlockFile; rv = aFile->Clone((nsIFile **)((void **)getter_AddRefs(oldlockFile))); - NS_ENSURE_SUCCESS(rv, rv); - + NS_ENSURE_SUCCESS(rv, rv); + rv = oldlockFile->Append(OLD_LOCKFILE_NAME); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); rv = isExistFileOrSymlink(oldlockFile,&nExist); - NS_ENSURE_SUCCESS(rv, rv); + NS_ENSURE_SUCCESS(rv, rv); } return nExist; } @@ -506,7 +506,7 @@ namespace connectivity PRBool exists = PR_FALSE; rv = localFile->Exists(&exists); - NS_ENSURE_SUCCESS(rv, sal_True); + NS_ENSURE_SUCCESS(rv, sal_True); if (!exists) return sal_True; @@ -522,7 +522,7 @@ namespace connectivity { sal_Int32 index=product; ProductStruct &m_Product = m_ProductProfileList[index]; - if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) + if (!m_Product.mProfileList.size() || m_Product.mProfileList.find(profileName) == m_Product.mProfileList.end()) { return sal_False; } diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx index f2f85ddd77ee..1ce1617bad81 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileDiscover.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -77,7 +77,7 @@ namespace connectivity ::rtl::OUString getProfileName(){ return profileName;} ::rtl::OUString getProfilePath() ; #ifndef MINIMAL_PROFILEDISCOVER - nsILocalFile *getProfileLocal(){ return profilePath;} + nsILocalFile *getProfileLocal(){ return profilePath;} #endif protected: MozillaProductType product; @@ -104,7 +104,7 @@ namespace connectivity { public: - virtual ~ProfileAccess(); + virtual ~ProfileAccess(); ProfileAccess(); ::rtl::OUString getProfilePath( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException); ::sal_Int32 getProfileCount( ::com::sun::star::mozilla::MozillaProductType product ) throw (::com::sun::star::uno::RuntimeException); diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx index 84684056f557..2978c16fa152 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx index 6e52c40b8f71..5cbc352684c2 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSProfileManager.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -58,7 +58,7 @@ namespace connectivity { public: - virtual ~ProfileManager(); + virtual ~ProfileManager(); ProfileManager(); ::sal_Int32 SAL_CALL bootupProfile( ::com::sun::star::mozilla::MozillaProductType product, const ::rtl::OUString& profileName ) throw (::com::sun::star::uno::RuntimeException) ; diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx index c950e4d0e7e0..646121553236 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ using namespace connectivity::mozab; /* Implementation file */ NS_IMPL_ISUPPORTS1(MNSRunnable, nsIRunnable) -static ::osl::Mutex m_aThreadMutex; +static ::osl::Mutex m_aThreadMutex; nsIRunnable * MNSRunnable::ProxiedObject() { diff --git a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx index 2f17ea53f556..093e2d157c07 100644 --- a/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx +++ b/connectivity/source/drivers/mozab/bootstrap/MNSRunnable.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -51,7 +51,7 @@ namespace connectivity virtual ~MNSRunnable(); NS_DECL_ISUPPORTS NS_DECL_NSIRUNNABLE - + public: sal_Int32 StartProxy(const ::com::sun::star::uno::Reference< ::com::sun::star::mozilla::XCodeProxy >& aCode); //Call this to start proxy diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h index f03d4a3bb208..e34bc21913d6 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsinit.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h index 3d01a103c9e2..4d65bc3cb54d 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofile.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h index ec9bd9d63d74..4bb836ed1355 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_nsprofiledirserviceprovider.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h index 75913dcd525c..03198dcab850 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profile_discover.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h index 4208eb6db606..1579b16947fc 100644 --- a/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h +++ b/connectivity/source/drivers/mozab/bootstrap/mozilla_profilemanager.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h index b029a0e23638..a33bd622ac88 100644 --- a/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h +++ b/connectivity/source/drivers/mozab/bootstrap/post_include_windows.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h index 15eeb5395195..792e8a34f46a 100644 --- a/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h +++ b/connectivity/source/drivers/mozab/bootstrap/pre_include_windows.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozab.xcu b/connectivity/source/drivers/mozab/mozab.xcu index c92209e09e5a..837e180ba50d 100755 --- a/connectivity/source/drivers/mozab/mozab.xcu +++ b/connectivity/source/drivers/mozab/mozab.xcu @@ -2,7 +2,7 @@ <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -34,7 +34,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Microsoft Outlook Address Book</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> @@ -49,7 +49,7 @@ <prop oor:name="DriverTypeDisplayName" oor:type="xs:string"> <value xml:lang="en-US">Microsoft Windows Address Book</value> </prop> - <node oor:name="Features"> + <node oor:name="Features"> <node oor:name="EscapeDateTime" oor:op="replace"> <prop oor:name="Value" oor:type="xs:boolean"> <value>true</value> diff --git a/connectivity/source/drivers/mozab/mozab.xml b/connectivity/source/drivers/mozab/mozab.xml index 6663387cf34c..33e9219a1610 100644 --- a/connectivity/source/drivers/mozab/mozab.xml +++ b/connectivity/source/drivers/mozab/mozab.xml @@ -11,8 +11,8 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.sdbc.Driver </supported-service> - <service-dependency> ... </service-dependency> + <supported-service> com.sun.star.sdbc.Driver </supported-service> + <service-dependency> ... </service-dependency> </component-description> <component-description> <Author>Wind Li</Author> @@ -23,57 +23,57 @@ <loader-name>com.sun.star.loader.SharedLibrary</loader-name> <language>c++</language> <status value="final"/> - <supported-service> com.sun.star.mozilla.MozillaBootstrap</supported-service> - <service-dependency> ... </service-dependency> + <supported-service> com.sun.star.mozilla.MozillaBootstrap</supported-service> + <service-dependency> ... </service-dependency> </component-description> - <project-build-dependency> cppuhelper </project-build-dependency> - <project-build-dependency> cppu </project-build-dependency> - <project-build-dependency> sal </project-build-dependency> + <project-build-dependency> cppuhelper </project-build-dependency> + <project-build-dependency> cppu </project-build-dependency> + <project-build-dependency> sal </project-build-dependency> - <runtime-module-dependency> cppuhelper </runtime-module-dependency> - <runtime-module-dependency> cppu1 </runtime-module-dependency> - <runtime-module-dependency> sal1 </runtime-module-dependency> + <runtime-module-dependency> cppuhelper </runtime-module-dependency> + <runtime-module-dependency> cppu1 </runtime-module-dependency> + <runtime-module-dependency> sal1 </runtime-module-dependency> - <type> com.sun.star.util.XCancellable </type> - <type> com.sun.star.util.XNumberFormatter </type> - <type> com.sun.star.uno.TypeClass </type> - <type> com.sun.star.uno.XWeak </type> - <type> com.sun.star.uno.XAggregation </type> - <type> com.sun.star.beans.XPropertyState </type> - <type> com.sun.star.beans.XPropertySet </type> - <type> com.sun.star.beans.PropertyValue </type> - <type> com.sun.star.beans.XMultiPropertySet </type> - <type> com.sun.star.beans.XFastPropertySet </type> - <type> com.sun.star.lang.XTypeProvider </type> - <type> com.sun.star.lang.EventObject </type> - <type> com.sun.star.lang.XComponent </type> - <type> com.sun.star.lang.IllegalArgumentException </type> - <type> com.sun.star.lang.XMultiServiceFactory </type> - <type> com.sun.star.java.XJavaThreadRegister_11 </type> - <type> com.sun.star.java.XJavaVM </type> - <type> com.sun.star.sdbc.XConnection </type> - <type> com.sun.star.sdbc.XStatement </type> - <type> com.sun.star.sdbc.XResultSet </type> - <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> - <type> com.sun.star.sdbc.XColumnLocate </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XWarningsSupplier </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbc.XMultipleResults </type> - <type> com.sun.star.sdbc.XBatchExecution </type> - <type> com.sun.star.sdbc.XPreparedBatchExecution </type> - <type> com.sun.star.sdbc.XParameters </type> - <type> com.sun.star.sdbc.XOutParameters </type> - <type> com.sun.star.sdbc.DriverPropertyInfo </type> - <type> com.sun.star.sdbc.XRow </type> - <type> com.sun.star.sdb.XColumnUpdate </type> - <type> com.sun.star.sdb.XColumn </type> - <type> com.sun.star.sdbc.XResultSetUpdate </type> - <type> com.sun.star.sdbc.XRowUpdate </type> - <type> com.sun.star.sdbcx.XRowLocate </type> - <type> com.sun.star.sdbcx.XDeleteRows </type> + <type> com.sun.star.util.XCancellable </type> + <type> com.sun.star.util.XNumberFormatter </type> + <type> com.sun.star.uno.TypeClass </type> + <type> com.sun.star.uno.XWeak </type> + <type> com.sun.star.uno.XAggregation </type> + <type> com.sun.star.beans.XPropertyState </type> + <type> com.sun.star.beans.XPropertySet </type> + <type> com.sun.star.beans.PropertyValue </type> + <type> com.sun.star.beans.XMultiPropertySet </type> + <type> com.sun.star.beans.XFastPropertySet </type> + <type> com.sun.star.lang.XTypeProvider </type> + <type> com.sun.star.lang.EventObject </type> + <type> com.sun.star.lang.XComponent </type> + <type> com.sun.star.lang.IllegalArgumentException </type> + <type> com.sun.star.lang.XMultiServiceFactory </type> + <type> com.sun.star.java.XJavaThreadRegister_11 </type> + <type> com.sun.star.java.XJavaVM </type> + <type> com.sun.star.sdbc.XConnection </type> + <type> com.sun.star.sdbc.XStatement </type> + <type> com.sun.star.sdbc.XResultSet </type> + <type> com.sun.star.sdbc.XResultSetMetaDataSupplier</type> + <type> com.sun.star.sdbc.XColumnLocate </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XWarningsSupplier </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbc.XMultipleResults </type> + <type> com.sun.star.sdbc.XBatchExecution </type> + <type> com.sun.star.sdbc.XPreparedBatchExecution </type> + <type> com.sun.star.sdbc.XParameters </type> + <type> com.sun.star.sdbc.XOutParameters </type> + <type> com.sun.star.sdbc.DriverPropertyInfo </type> + <type> com.sun.star.sdbc.XRow </type> + <type> com.sun.star.sdb.XColumnUpdate </type> + <type> com.sun.star.sdb.XColumn </type> + <type> com.sun.star.sdbc.XResultSetUpdate </type> + <type> com.sun.star.sdbc.XRowUpdate </type> + <type> com.sun.star.sdbcx.XRowLocate </type> + <type> com.sun.star.sdbcx.XDeleteRows </type> </module-description> diff --git a/connectivity/source/drivers/mozab/mozab2.xcu b/connectivity/source/drivers/mozab/mozab2.xcu index e7c24143f5a1..898c099fc7d2 100755 --- a/connectivity/source/drivers/mozab/mozab2.xcu +++ b/connectivity/source/drivers/mozab/mozab2.xcu @@ -2,7 +2,7 @@ <!--*********************************************************************** * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx index 28cc64d707ba..2e08d7754bd3 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -48,7 +48,7 @@ #include "MNSMozabProxy.hxx" #include <MNSDeclares.hxx> -static ::osl::Mutex m_aMetaMutex; +static ::osl::Mutex m_aMetaMutex; #include <osl/diagnose.h> #include <com/sun/star/uno/Reference.hxx> @@ -201,10 +201,10 @@ static nsresult insertPABDescription() #define NS_ABDIRECTORYDATASOURCE_CONTRACTID \ NS_RDF_DATASOURCE_CONTRACTID_PREFIX "addressdirectory" #define database_uri "@mozilla.org/rdf/datasource;1?name=addressdirectory" -#define NS_ABDIRECTORYDATASOURCE_CID \ -{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \ - 0xa79186d, 0xf754, 0x11d2, \ - {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ +#define NS_ABDIRECTORYDATASOURCE_CID \ +{ /* 0A79186D-F754-11d2-A2DA-001083003D0C */ \ + 0xa79186d, 0xf754, 0x11d2, \ + {0xa2, 0xda, 0x0, 0x10, 0x83, 0x0, 0x3d, 0xc} \ } // ------------------------------------------------------------------------- @@ -262,7 +262,7 @@ static nsresult enumSubs(nsISimpleEnumerator * subDirs,nsISupportsArray * array) { PRBool hasMore = PR_TRUE ; nsresult rv = NS_OK ; - while (NS_SUCCEEDED(subDirs->HasMoreElements(&hasMore)) && hasMore) { + while (NS_SUCCEEDED(subDirs->HasMoreElements(&hasMore)) && hasMore) { nsCOMPtr<nsISupports> newDirSupports ; rv = subDirs->GetNext(getter_AddRefs(newDirSupports)) ; @@ -482,9 +482,9 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* ::std::vector< ::rtl::OUString >& _rStrings, ::std::vector< ::rtl::OUString >& _rTypes) { - sal_Bool bGivenURI; - ::rtl::OUString sAbURI; - ::rtl::OString sAbURIString; + sal_Bool bGivenURI; + ::rtl::OUString sAbURI; + ::rtl::OString sAbURIString; OSL_TRACE( "IN MDatabaseMetaDataHelper::getTableStrings( 0x%08X, %s)\n", _pCon, _pCon->getForceLoadTables()?"True":"False" ); @@ -601,7 +601,7 @@ sal_Bool MDatabaseMetaDataHelper::getTableStrings( OConnection* args.arg4 = (void*)&m_aTableNames; args.arg5 = (void*)&m_aTableTypes; args.arg6 = (void*)&nErrorResourceId; - rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); + rv = xMProxy.StartProxy(&args,m_ProductType,m_ProfileName); m_aError.setResId( static_cast<sal_uInt16>(nErrorResourceId) ); if (NS_FAILED(rv)) @@ -720,7 +720,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) { args.funcIndex = ProxiedFunc::FUNC_TESTLDAP_IS_LDAP_CONNECTED; TimeValue timeValue = { 1, 0 }; // 1 * 30 Seconds timeout - sal_Int32 times=0; + sal_Int32 times=0; while ( times++ < 30 ) { rv = xMProxy.StartProxy( &args, m_ProductType, ::rtl::OUString() ); @@ -742,7 +742,7 @@ MDatabaseMetaDataHelper::testLDAPConnection( OConnection* _pCon ) sal_Bool MDatabaseMetaDataHelper::NewAddressBook(OConnection* _pCon,const ::rtl::OUString & aTableName) { - sal_Bool bIsMozillaAB; + sal_Bool bIsMozillaAB; bIsMozillaAB = !_pCon->usesFactory() && ! _pCon->isLDAP(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx index 77de88b2f07d..103903ac36d0 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MDatabaseMetaDataHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ namespace connectivity ::std::vector< ::rtl::OUString > m_aTableNames; ::std::vector< ::rtl::OUString > m_aTableTypes; ::com::sun::star::mozilla::MozillaProductType m_ProductType; - ::rtl::OUString m_ProfileName; + ::rtl::OUString m_ProfileName; ErrorDescriptor m_aError; public: diff --git a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx index c7f1dffd83c4..d6bfe02b23e9 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MErrorResource.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx index 2719c72dd98e..0064cca35160 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.cxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx index c7b5224893da..54461bfc2222 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MLdapAttributeMap.hxx @@ -1,7 +1,7 @@ /* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */ /************************************************************************* * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx index 0ef193cc3bd8..de53040895a7 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSDeclares.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -27,16 +27,16 @@ ************************************************************************/ #ifndef _CONNECTIVITY_MAB_NS_DECLARES_HXX_ -#define _CONNECTIVITY_MAB_NS_DECLARES_HXX_ +#define _CONNECTIVITY_MAB_NS_DECLARES_HXX_ #include <sal/types.h> -const sal_Int32 RowStates_Normal = 0; -const sal_Int32 RowStates_Inserted = 1; -const sal_Int32 RowStates_Updated = 2; -const sal_Int32 RowStates_Deleted = 4; -const sal_Int32 RowStates_Error = 32; +const sal_Int32 RowStates_Normal = 0; +const sal_Int32 RowStates_Inserted = 1; +const sal_Int32 RowStates_Updated = 2; +const sal_Int32 RowStates_Deleted = 4; +const sal_Int32 RowStates_Error = 32; namespace connectivity{ namespace mozab{ diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx index b3e75c3763bb..4dd1c511f1f2 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSInclude.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx index df81bb886b5e..02cdcea1fea4 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -64,7 +64,7 @@ using namespace connectivity::mozab; /* Implementation file */ -static ::osl::Mutex m_aThreadMutex; +static ::osl::Mutex m_aThreadMutex; extern nsresult NewAddressBook(const ::rtl::OUString * aName); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx index 06c13993edda..85d63373818a 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSMozabProxy.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -61,11 +61,11 @@ namespace connectivity { sal_Int32 funcIndex; //Function Index sal_Int32 argCount; //parameter count - void * arg1; - void * arg2; - void * arg3; - void * arg4; - void * arg5; + void * arg1; + void * arg2; + void * arg3; + void * arg4; + void * arg5; void * arg6; RunArgs() { diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx index d411119e5281..92967f77e8d6 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <com/sun/star/frame/XDesktop.hpp> #include <MNSInit.hxx> - + using namespace ::com::sun::star::uno; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::frame; diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx index 85e36e8abacd..16a27c7702ac 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNSTerminateListener.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -49,7 +49,7 @@ private: public: MNSTerminateListener(); - virtual ~MNSTerminateListener(); + virtual ~MNSTerminateListener(); public: static ::com::sun::star::uno::Reference< ::com::sun::star::frame::XTerminateListener> mxTerminateListener; static void addTerminateListener(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx index d3627772369b..e6e394474894 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx index 6fdbcea39938..46651383c4cb 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MNameMapper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -41,7 +41,7 @@ namespace connectivity { namespace mozab { - class MNameMapper + class MNameMapper { private: @@ -69,10 +69,10 @@ namespace connectivity // May modify the name passed in so that it's unique nsresult add( ::rtl::OUString& str, nsIAbDirectory* abook ); - + //reset dirs void reset(); - + // Get the directory corresponding to str bool getDir( const ::rtl::OUString& str, nsIAbDirectory* *abook ); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx index d3510e9d0d07..a78b9abed55c 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx index d068fc0315ba..8015c3a74cbd 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQuery.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -208,7 +208,7 @@ namespace connectivity const OColumnAlias& m_rColumnAlias; ::com::sun::star::mozilla::MozillaProductType m_Product; - ::rtl::OUString m_Profile; + ::rtl::OUString m_Profile; ErrorDescriptor m_aError; void construct(); @@ -226,14 +226,14 @@ namespace connectivity sal_Int32 executeQuery(OConnection* _pCon); sal_Int32 executeQueryProxied(OConnection* _pCon); //Used only by MNSMozabProxy - sal_Int32 createNewCard(); //return Row count number - sal_Int32 deleteRow(const sal_Int32 rowIndex); - sal_Int32 commitRow(const sal_Int32 rowIndex); - sal_Bool resyncRow(sal_Int32 nDBRow); + sal_Int32 createNewCard(); //return Row count number + sal_Int32 deleteRow(const sal_Int32 rowIndex); + sal_Int32 commitRow(const sal_Int32 rowIndex); + sal_Bool resyncRow(sal_Int32 nDBRow); - sal_Bool isWritable(OConnection* _pCon); + sal_Bool isWritable(OConnection* _pCon); - sal_uInt32 InsertLoginInfo(OConnection* _pCon); + sal_uInt32 InsertLoginInfo(OConnection* _pCon); void setAddressbook( ::rtl::OUString&); ::rtl::OUString getAddressbook(void) const; @@ -261,14 +261,14 @@ namespace connectivity sal_Int32 nDBRow, const rtl::OUString& aDBColumnName, sal_Int32 nType ) const; - sal_Int32 getRowStates(sal_Int32 nDBRow); - sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); + sal_Int32 getRowStates(sal_Int32 nDBRow); + sal_Bool setRowStates(sal_Int32 nDBRow,sal_Int32 aState); bool hadError() const { return m_aError.is(); } inline const ErrorDescriptor& getError() const { return m_aError; } public: -// MQuery(); +// MQuery(); MQuery( const OColumnAlias& _ca ); virtual ~MQuery(); static MNameMapper* CreateNameMapper(); diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx index b7b1f2bbc7f9..a6b9cbff8f83 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -173,7 +173,7 @@ sal_Bool MQueryHelper::waitForResultOrComplete( ) { TimeValue timeValue = { 1, 0 }; // 20 Seconds 0 NanoSecond timeout - sal_Int32 times=0; + sal_Int32 times=0; osl::Condition::Result rv = ::osl::Condition::result_ok; OSL_TRACE("In : waitForResultOrComplete()"); @@ -449,10 +449,10 @@ const char * getAddrURI(const nsIAbDirectory* directory) } #define ENSURE_GETUPDATECARD(x) \ - if (NS_FAILED(retCode)) \ - { \ - OSL_TRACE( x ); \ - return card; \ + if (NS_FAILED(retCode)) \ + { \ + OSL_TRACE( x ); \ + return card; \ } static NS_DEFINE_CID(kRDFServiceCID, NS_RDFSERVICE_CID); @@ -483,11 +483,11 @@ nsIAbCard * getUpdatedCard( nsIAbCard* card) return aNewCard; } -#define ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory) \ - if (getDirectoryType(directory) == SDBCAddress::Mozilla && isProfileLocked(NULL)) \ - { \ +#define ENSURE_MOZAB_PROFILE_NOT_LOOKED(directory) \ + if (getDirectoryType(directory) == SDBCAddress::Mozilla && isProfileLocked(NULL)) \ + { \ m_aError.setResId( STR_MOZILLA_IS_RUNNIG_NO_CHANGES ); \ - return sal_False; \ + return sal_False; \ } sal_Int32 MQueryHelper::commitCard(const sal_Int32 rowIndex,nsIAbDirectory * directory) diff --git a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx index 3daedc286d04..1da8f15464eb 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MQueryHelper.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -52,7 +52,7 @@ namespace connectivity mutable ::osl::Mutex m_aMutex; FieldMap m_Fields; nsCOMPtr<nsIAbCard> m_Card; - sal_Int32 m_RowStates; + sal_Int32 m_RowStates; public: MQueryHelperResultEntry(); @@ -129,13 +129,13 @@ namespace connectivity sal_Int32 getResultCount() const; sal_uInt32 getRealCount() const; - sal_Int32 createNewCard(); //return Row count number - sal_Bool resyncRow(sal_Int32 rowIndex); + sal_Int32 createNewCard(); //return Row count number + sal_Bool resyncRow(sal_Int32 rowIndex); void notifyQueryError() ; - sal_Bool setCardValues(const sal_Int32 rowIndex); - sal_Int32 commitCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); - sal_Int32 deleteCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); + sal_Bool setCardValues(const sal_Int32 rowIndex); + sal_Int32 commitCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); + sal_Int32 deleteCard(const sal_Int32 rowIndex, nsIAbDirectory * directory); }; } } diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx index 66f3c5fabba5..6e4d75831a56 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.cxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -43,7 +43,7 @@ void MTypeConverter::ouStringToNsString(::rtl::OUString const &ous, nsString &ns const char *cs = os.getStr(); PRUint32 csLen = os.getLength(); - + NS_ConvertUTF8toUCS2 mozString(cs, csLen); //const PRUnichar* uniMozString = (const PRUnichar*) mozString; nss = mozString; // temp. diff --git a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx index df903eaa003f..55c1246d4313 100644 --- a/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx +++ b/connectivity/source/drivers/mozab/mozillasrc/MTypeConverter.hxx @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite @@ -33,7 +33,7 @@ #include <rtl/ustring.hxx> #include<string> - + namespace connectivity { namespace mozab diff --git a/connectivity/source/drivers/mozab/post_include_mozilla.h b/connectivity/source/drivers/mozab/post_include_mozilla.h index a63db2b480c8..cf365e1008cc 100644 --- a/connectivity/source/drivers/mozab/post_include_mozilla.h +++ b/connectivity/source/drivers/mozab/post_include_mozilla.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite diff --git a/connectivity/source/drivers/mozab/pre_include_mozilla.h b/connectivity/source/drivers/mozab/pre_include_mozilla.h index a90c6a394fd8..4da60543cb50 100644 --- a/connectivity/source/drivers/mozab/pre_include_mozilla.h +++ b/connectivity/source/drivers/mozab/pre_include_mozilla.h @@ -2,7 +2,7 @@ /************************************************************************* * * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * + * * Copyright 2000, 2010 Oracle and/or its affiliates. * * OpenOffice.org - a multi-platform office productivity suite |