Tag: cws_src680_odbmacros2 User: fs Date: 2007-12-19 07:17:39+0000 Modified: dba/dbaccess/source/ui/browser/dbloader.cxx
Log: #i10000# File Changes: Directory: /dba/dbaccess/source/ui/browser/ =========================================== File [changed]: dbloader.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/browser/dbloader.cxx?r1=1.31.64.1&r2=1.31.64.2 Delta lines: +11 -11 --------------------- --- dbloader.cxx 2007-12-19 06:13:26+0000 1.31.64.1 +++ dbloader.cxx 2007-12-19 07:17:36+0000 1.31.64.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbloader.cxx,v $ * - * $Revision: 1.31.64.1 $ + * $Revision: 1.31.64.2 $ * - * last change: $Author: fs $ $Date: 2007/12/19 06:13:26 $ + * last change: $Author: fs $ $Date: 2007/12/19 07:17:36 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -282,29 +282,29 @@ if(bSuccess) { PropertyValue aValue; - const PropertyValue* pIter = m_aArgs.getConstArray(); - const PropertyValue* pEnd = pIter + m_aArgs.getLength(); + const PropertyValue* pArg = m_aArgs.getConstArray(); + const PropertyValue* pArgsEnd = pArg + m_aArgs.getLength(); - for ( ; ( pIter != pEnd ) && !xModel.is(); ++pIter ) + for ( ; ( pArg != pArgsEnd ) && !xModel.is(); ++pArg ) { - if(0 == pIter->Name.compareToAscii(PROPERTY_DATASOURCE)) + if(0 == pArg->Name.compareToAscii(PROPERTY_DATASOURCE)) { - Reference<XDataSource> xProp(pIter->Value,UNO_QUERY); + Reference<XDataSource> xProp(pArg->Value,UNO_QUERY); xModel.set(getDataSourceOrModel(xProp),UNO_QUERY); break; } - else if(0 == pIter->Name.compareToAscii(PROPERTY_DATASOURCENAME)) + else if(0 == pArg->Name.compareToAscii(PROPERTY_DATASOURCENAME)) { ::rtl::OUString sDataSource; - pIter->Value >>= sDataSource; + pArg->Value >>= sDataSource; Reference< XNameAccess > xDatabaseContext(m_xServiceFactory->createInstance(SERVICE_SDB_DATABASECONTEXT), UNO_QUERY); xModel.set(getDataSourceOrModel(getDataSourceByName_displayError(xDatabaseContext,sDataSource,NULL,m_xServiceFactory,sal_False)),UNO_QUERY); break; } - else if ( 0 == pIter->Name.compareToAscii( PROPERTY_ACTIVECONNECTION ) ) + else if ( 0 == pArg->Name.compareToAscii( PROPERTY_ACTIVECONNECTION ) ) { - Reference< XChild > xAsChild( pIter->Value, UNO_QUERY ); + Reference< XChild > xAsChild( pArg->Value, UNO_QUERY ); if ( xAsChild.is() ) { OSL_ENSURE( Reference< XDataSource >( xAsChild->getParent(), UNO_QUERY ).is(), --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
