User: vg Date: 2007/03/26 06:58:42 Modified: dba/connectivity/source/drivers/ado/AUser.cxx
Log: INTEGRATION: CWS mingwport03 (1.17.60); FILE MERGED 2006/11/07 12:31:52 vg 1.17.60.2: RESYNC: (1.17-1.18); FILE MERGED 2006/09/07 10:22:04 vg 1.17.60.1: #i53572# MinGW port File Changes: Directory: /dba/connectivity/source/drivers/ado/ ================================================ File [changed]: AUser.cxx Url: http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/ado/AUser.cxx?r1=1.18&r2=1.19 Delta lines: +7 -7 ------------------- --- AUser.cxx 17 Sep 2006 02:16:15 -0000 1.18 +++ AUser.cxx 26 Mar 2007 13:58:39 -0000 1.19 @@ -189,12 +189,12 @@ } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::acquire() throw(RuntimeException) +void SAL_CALL OAdoUser::acquire() throw() { OUser_TYPEDEF::acquire(); } // ----------------------------------------------------------------------------- -void SAL_CALL OAdoUser::release() throw(RuntimeException) +void SAL_CALL OAdoUser::release() throw() { OUser_TYPEDEF::release(); } @@ -202,7 +202,7 @@ sal_Int32 SAL_CALL OAdoUser::getPrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); return ADOS::mapAdoRights2Sdbc(m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType))); } @@ -210,7 +210,7 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objName, sal_Int32 objType ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); sal_Int32 nRights = 0; RightsEnum eRights = m_aUser.GetPermissions(objName, ADOS::mapObjectType2Ado(objType)); @@ -223,7 +223,7 @@ void SAL_CALL OAdoUser::grantPrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessGrant,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } @@ -231,7 +231,7 @@ void SAL_CALL OAdoUser::revokePrivileges( const ::rtl::OUString& objName, sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.SetPermissions(objName,ADOS::mapObjectType2Ado(objType),adAccessRevoke,RightsEnum(ADOS::mapRights2Ado(objPrivileges))); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } @@ -240,7 +240,7 @@ void SAL_CALL OAdoUser::changePassword( const ::rtl::OUString& objPassword, const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException) { ::osl::MutexGuard aGuard(m_aMutex); - checkDisposed(OUser_TYPEDEF::rBHelper.bDisposed); + checkDisposed(OUser_BASE_TYPEDEF::rBHelper.bDisposed); m_aUser.ChangePassword(objPassword,newPassword); ADOS::ThrowException(*m_pCatalog->getConnection()->getConnection(),*this); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
