User: rt Date: 2008-06-06 14:11:35+0000 Modified: dba/dbaccess/source/ui/misc/UITools.cxx
Log: INTEGRATION: CWS dba30c (1.78.4); FILE MERGED 2008/05/09 08:24:29 oj 1.78.4.2: RESYNC: (1.78-1.79); FILE MERGED 2008/05/05 11:13:37 oj 1.78.4.1: #i87131# collect keys only once, getKeys always refetch keys File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: UITools.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/UITools.cxx?r1=1.79&r2=1.80 Delta lines: +4 -10 -------------------- --- UITools.cxx 2008-05-05 16:00:36+0000 1.79 +++ UITools.cxx 2008-06-06 14:11:33+0000 1.80 @@ -487,24 +487,18 @@ } // ----------------------------------------------------------------------------- -::std::vector< Reference<XNameAccess> > getKeyColumns(const Reference<XPropertySet >& _rxTable, +::std::vector< Reference<XNameAccess> > getKeyColumns(const Reference<XIndexAccess >& _rxKeys, sal_Int32 _nKeyType) { // use keys and indexes for excat postioning // first the keys - Reference<XKeysSupplier> xKeySup(_rxTable,UNO_QUERY); - Reference<XIndexAccess> xKeys; - if(xKeySup.is()) - xKeys = xKeySup->getKeys(); - ::std::vector< Reference<XNameAccess> > vRet; - - if(xKeys.is()) + if(_rxKeys.is()) { Reference<XPropertySet> xProp; - for(sal_Int32 i=0;i< xKeys->getCount();++i) + for(sal_Int32 i=0;i< _rxKeys->getCount();++i) { - xKeys->getByIndex(i) >>= xProp; + _rxKeys->getByIndex(i) >>= xProp; sal_Int32 nKeyType = 0; xProp->getPropertyValue(PROPERTY_TYPE) >>= nKeyType; if(_nKeyType == nKeyType) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
