User: rt      
Date: 2008-01-30 07:47:36+0000
Modified:
   dba/connectivity/source/commontools/TPrivilegesResultSet.cxx

Log:
 INTEGRATION: CWS dba24d (1.5.152); FILE MERGED
 2007/12/05 14:15:43 fs 1.5.152.2: next: don't call the base classes 'next' 
when it just returned FALSE - it will throw nowadays in case of such a wrong 
usage
 2007/11/21 12:38:41 oj 1.5.152.1: #i68854# impl TypeSettingInfo for Oracle and 
some clean up

File Changes:

Directory: /dba/connectivity/source/commontools/
================================================

File [changed]: TPrivilegesResultSet.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/commontools/TPrivilegesResultSet.cxx?r1=1.5&r2=1.6
Delta lines:  +2 -3
-------------------
--- TPrivilegesResultSet.cxx    2006-09-17 02:00:54+0000        1.5
+++ TPrivilegesResultSet.cxx    2008-01-30 07:47:33+0000        1.6
@@ -52,7 +52,8 @@
                                                                                
   , const Any& catalog
                                                                                
   , const ::rtl::OUString& schemaPattern
                                                                                
   , const ::rtl::OUString& tableNamePattern)
-                                                                               
   : m_bResetValues(sal_True)
+                                                                               
   : ODatabaseMetaDataResultSet(eTablePrivileges)
+                                           , m_bResetValues(sal_True)
 {
        osl_incrementInterlockedCount( &m_refCount );
        {
@@ -77,7 +78,6 @@
                {
                }
 
-               setTablePrivilegesMap();
                ODatabaseMetaDataResultSet::ORows aRows;
                static ODatabaseMetaDataResultSet::ORow aRow(8);
                aRow[5] = new ORowSetValueDecorator(sUserWorkingFor);
@@ -157,7 +157,6 @@
         if ( !bReturn )
                {
                        m_bBOF = sal_False;
-                       ODatabaseMetaDataResultSet::next();
                        m_bResetValues = bReturn = m_xTables->next();
                }
        }




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

Reply via email to