diff options
| author | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:58:39 +0000 |
|---|---|---|
| committer | Vladimir Glazounov <vg@openoffice.org> | 2007-03-26 12:58:39 +0000 |
| commit | 9e248d2c1a55f63a6e5b285d78a5ab0302fe3c84 (patch) | |
| tree | dff895e7a4eb74e8ca2e5a97d5f6addf75698200 /connectivity/source/drivers/ado/AUser.cxx | |
| parent | ee62385dd4b8163ec57a654bc6d68c8ef8353d75 (diff) | |
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
Diffstat (limited to 'connectivity/source/drivers/ado/AUser.cxx')
| -rw-r--r-- | connectivity/source/drivers/ado/AUser.cxx | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/connectivity/source/drivers/ado/AUser.cxx b/connectivity/source/drivers/ado/AUser.cxx index 2fcc9ef24c3e..5bee7e0263de 100644 --- a/connectivity/source/drivers/ado/AUser.cxx +++ b/connectivity/source/drivers/ado/AUser.cxx @@ -4,9 +4,9 @@ * * $RCSfile: AUser.cxx,v $ * - * $Revision: 1.18 $ + * $Revision: 1.19 $ * - * last change: $Author: obo $ $Date: 2006-09-17 02:16:15 $ + * last change: $Author: vg $ $Date: 2007-03-26 13:58:39 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -189,12 +189,12 @@ cppu::IPropertyArrayHelper & OUserExtend::getInfoHelper() } // ----------------------------------------------------------------------------- // ----------------------------------------------------------------------------- -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 @@ void SAL_CALL OAdoUser::release() throw(RuntimeException) 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::getPrivileges( const ::rtl::OUString& objName, sal_ 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 @@ sal_Int32 SAL_CALL OAdoUser::getGrantablePrivileges( const ::rtl::OUString& objN 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::grantPrivileges( const ::rtl::OUString& objName, sal_Int 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::revokePrivileges( const ::rtl::OUString& objName, sal_In 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); } |