User: rt      
Date: 2008-06-06 13:26:43+0000
Modified:
   dba/connectivity/source/sdbcx/VTable.cxx

Log:
 INTEGRATION: CWS dba30c (1.21.10); FILE MERGED
 2008/05/09 07:07:16 oj 1.21.10.2: #i87131# collect keys only once, getKeys 
always refetch the keys
 2008/05/05 10:57:51 oj 1.21.10.1: #i87131# collect keys only once, getKeys 
always refetch the keys

File Changes:

Directory: /dba/connectivity/source/sdbcx/
==========================================

File [changed]: VTable.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/connectivity/source/sdbcx/VTable.cxx?r1=1.21&r2=1.22
Delta lines:  +7 -3
-------------------
--- VTable.cxx  2008-04-10 12:02:22+0000        1.21
+++ VTable.cxx  2008-06-06 13:26:40+0000        1.22
@@ -211,10 +211,14 @@
        ::osl::MutexGuard aGuard(m_aMutex);
        checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed);
 
+    Reference< XIndexAccess > xKeys;
+
        try
        {
-               if(!m_pKeys)
                        refreshKeys();
+        xKeys = m_pKeys;
+        if(!isNew())
+            m_pKeys = NULL;
        }
        catch( const RuntimeException& )
        {
@@ -226,7 +230,7 @@
                // allowed
        }
 
-       return m_pKeys;
+       return xKeys;
 }
 // 
-----------------------------------------------------------------------------
 cppu::IPropertyArrayHelper* OTable::createArrayHelper( sal_Int32 /*_nId*/ ) 
const




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

Reply via email to