Tag: cws_src680_hsqlcsv User: fs Date: 2008-01-17 01:58:27+0000 Modified: dba/dbaccess/source/core/api/TableDeco.cxx
Log: RESYNC: (1.30-1.32); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: TableDeco.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/TableDeco.cxx?r1=1.29.16.2&r2=1.29.16.3 Delta lines: +21 -30 --------------------- --- TableDeco.cxx 2006-12-18 07:44:39+0000 1.29.16.2 +++ TableDeco.cxx 2008-01-17 01:58:25+0000 1.29.16.3 @@ -174,11 +174,9 @@ m_pTables = NULL; m_xColumnDefinitions = NULL; m_xNumberFormats = NULL; - m_xColumnMediator = NULL; if ( m_pColumns ) - { m_pColumns->disposing(); - } + m_xColumnMediator = NULL; } // ----------------------------------------------------------------------------- sal_Bool SAL_CALL ODBTableDecorator::convertFastPropertyValue( @@ -398,22 +396,22 @@ Reference<XPropertySetInfo> xInfo = xProp->getPropertySetInfo(); Sequence< Property > aTableProps = xInfo->getProperties(); - Property* pBegin = aTableProps.getArray(); - Property* pEnd = pBegin + aTableProps.getLength(); - for (;pBegin != pEnd ; ++pBegin) - { - if (0 == pBegin->Name.compareToAscii(PROPERTY_CATALOGNAME)) - pBegin->Handle = PROPERTY_ID_CATALOGNAME; - else if (0 ==pBegin->Name.compareToAscii(PROPERTY_SCHEMANAME)) - pBegin->Handle = PROPERTY_ID_SCHEMANAME; - else if (0 ==pBegin->Name.compareToAscii(PROPERTY_NAME)) - pBegin->Handle = PROPERTY_ID_NAME; - else if (0 ==pBegin->Name.compareToAscii(PROPERTY_DESCRIPTION)) - pBegin->Handle = PROPERTY_ID_DESCRIPTION; - else if (0 ==pBegin->Name.compareToAscii(PROPERTY_TYPE)) - pBegin->Handle = PROPERTY_ID_TYPE; - else if (0 ==pBegin->Name.compareToAscii(PROPERTY_PRIVILEGES)) - pBegin->Handle = PROPERTY_ID_PRIVILEGES; + Property* pIter = aTableProps.getArray(); + Property* pEnd = pIter + aTableProps.getLength(); + for (;pIter != pEnd ; ++pIter) + { + if (0 == pIter->Name.compareToAscii(PROPERTY_CATALOGNAME)) + pIter->Handle = PROPERTY_ID_CATALOGNAME; + else if (0 ==pIter->Name.compareToAscii(PROPERTY_SCHEMANAME)) + pIter->Handle = PROPERTY_ID_SCHEMANAME; + else if (0 ==pIter->Name.compareToAscii(PROPERTY_NAME)) + pIter->Handle = PROPERTY_ID_NAME; + else if (0 ==pIter->Name.compareToAscii(PROPERTY_DESCRIPTION)) + pIter->Handle = PROPERTY_ID_DESCRIPTION; + else if (0 ==pIter->Name.compareToAscii(PROPERTY_TYPE)) + pIter->Handle = PROPERTY_ID_TYPE; + else if (0 ==pIter->Name.compareToAscii(PROPERTY_PRIVILEGES)) + pIter->Handle = PROPERTY_ID_PRIVILEGES; } describeProperties(aTableProps); @@ -421,13 +419,6 @@ return new ::cppu::OPropertyArrayHelper(aTableProps); } // ----------------------------------------------------------------------------- -void ODBTableDecorator::setTable(const ::com::sun::star::uno::Reference< ::com::sun::star::sdbcx::XColumnsSupplier >& _rxTable) -{ - ::osl::MutexGuard aGuard(m_aMutex); - ::connectivity::checkDisposed(OTableDescriptor_BASE::rBHelper.bDisposed); - m_xTable = _rxTable; -} -// ----------------------------------------------------------------------------- ::cppu::IPropertyArrayHelper & SAL_CALL ODBTableDecorator::getInfoHelper() { Reference<XPropertySet> xProp(m_xTable,UNO_QUERY); @@ -654,10 +645,10 @@ if(xNames.is()) { Sequence< ::rtl::OUString> aNames = xNames->getElementNames(); - const ::rtl::OUString* pBegin = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pBegin + aNames.getLength(); - for(;pBegin != pEnd;++pBegin) - aVector.push_back(*pBegin); + const ::rtl::OUString* pIter = aNames.getConstArray(); + const ::rtl::OUString* pEnd = pIter + aNames.getLength(); + for(;pIter != pEnd;++pIter) + aVector.push_back(*pIter); } } if(!m_pColumns) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
