User: rt      
Date: 2008-06-06 14:13:37+0000
Modified:
   dba/dbaccess/source/ui/querydesign/TableWindow.cxx

Log:
 INTEGRATION: CWS dba30c (1.39.8); FILE MERGED
 2008/05/05 11:13:38 oj 1.39.8.1: #i87131# collect keys only once, getKeys 
always refetch keys

File Changes:

Directory: /dba/dbaccess/source/ui/querydesign/
===============================================

File [changed]: TableWindow.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindow.cxx?r1=1.39&r2=1.40
Delta lines:  +15 -19
---------------------
--- TableWindow.cxx     2008-04-10 16:25:50+0000        1.39
+++ TableWindow.cxx     2008-06-06 14:13:34+0000        1.40
@@ -242,14 +242,11 @@
        try
        {
                // first we need the keys from the table
-               Reference< XKeysSupplier > xKeys( m_pData->getTable(), 
UNO_QUERY );
-               if ( xKeys.is() )
-               {
-                       Reference< XIndexAccess> xKeyIndex = xKeys->getKeys();
-                       Reference<XColumnsSupplier> xColumnsSupplier;
+               Reference< XIndexAccess> xKeyIndex = m_pData->getKeys();
                        // search the one and only primary key
                        if ( xKeyIndex.is() )
                        {
+            Reference<XColumnsSupplier> xColumnsSupplier;
                                for(sal_Int32 i=0;i< xKeyIndex->getCount();++i)
                                {
                                        Reference<XPropertySet> xProp;
@@ -269,7 +266,6 @@
                                        xPKeyColumns = 
xColumnsSupplier->getColumns();
                        }
                }
-       }
        catch(Exception&)
        {
                OSL_ENSURE(0,"Exception occured!");




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

Reply via email to