User: hr      
Date: 06/06/19 18:31:21

Modified:
 /dba/connectivity/source/drivers/hsqldb/
  HUser.cxx

Log:
 INTEGRATION: CWS warnings01 (1.3.30); FILE MERGED
 2005/11/16 12:59:07 fs 1.3.30.1: #i57457# warning free code

File Changes:

Directory: /dba/connectivity/source/drivers/hsqldb/
===================================================

File [changed]: HUser.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/drivers/hsqldb/HUser.cxx?r1=1.3&r2=1.4
Delta lines:  +7 -1
-------------------
--- HUser.cxx   8 Sep 2005 06:05:15 -0000       1.3
+++ HUser.cxx   20 Jun 2006 01:31:18 -0000      1.4
@@ -250,6 +250,9 @@
 // -------------------------------------------------------------------------
 void SAL_CALL OHSQLUser::grantPrivileges( const ::rtl::OUString& objName, 
sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, 
RuntimeException)
 {
+    if ( objType != PrivilegeObject::TABLE )
+        ::dbtools::throwSQLException( "Privilege not granted: Only table 
privileges can be granted", "01007", *this );
+
        ::osl::MutexGuard aGuard(m_aMutex);
 
        ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
@@ -273,6 +276,9 @@
 // -------------------------------------------------------------------------
 void SAL_CALL OHSQLUser::revokePrivileges( const ::rtl::OUString& objName, 
sal_Int32 objType, sal_Int32 objPrivileges ) throw(SQLException, 
RuntimeException)
 {
+    if ( objType != PrivilegeObject::TABLE )
+        ::dbtools::throwSQLException( "Privilege not revoked: Only table 
privileges can be revoked", "01006", *this );
+
        ::osl::MutexGuard aGuard(m_aMutex);
        checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);
     ::rtl::OUString sPrivs = getPrivilegeString(objPrivileges);
@@ -295,7 +301,7 @@
 }
 // 
-----------------------------------------------------------------------------
 // XUser
-void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& oldPassword, 
const ::rtl::OUString& newPassword ) throw(SQLException, RuntimeException)
+void SAL_CALL OHSQLUser::changePassword( const ::rtl::OUString& 
/*oldPassword*/, const ::rtl::OUString& newPassword ) throw(SQLException, 
RuntimeException)
 {
        ::osl::MutexGuard aGuard(m_aMutex);
        checkDisposed(OUser_BASE_RBHELPER::rBHelper.bDisposed);




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to