User: hr Date: 05/09/23 05:36:27 Modified: /dba/dbaccess/source/ui/misc/ DExport.cxx
Log: INTEGRATION: CWS dba201b (1.24.94); FILE MERGED 2005/09/21 09:50:23 oj 1.24.94.3: RESYNC: (1.24-1.25); FILE MERGED 2005/07/20 09:56:49 fs 1.24.94.2: #i51255# XConnection replaced with SharedConnection, and DataSourceHolder replaced with SharedModel 2005/07/11 13:37:23 fs 1.24.94.1: merging CWS dba201 into CWS dba201b File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: DExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/DExport.cxx?r1=1.25&r2=1.26 Delta lines: +6 -6 ------------------- --- DExport.cxx 8 Sep 2005 16:06:47 -0000 1.25 +++ DExport.cxx 23 Sep 2005 12:36:23 -0000 1.26 @@ -218,7 +218,7 @@ SetColumnTypes(pList,_pInfoMap); } //--------------------------------------------------------------------------- -ODatabaseExport::ODatabaseExport(const Reference< XConnection >& _rxConnection, +ODatabaseExport::ODatabaseExport(const SharedConnection& _rxConnection, const Reference< XNumberFormatter >& _rxNumberF, const Reference< ::com::sun::star::lang::XMultiServiceFactory >& _rM, const TColumnVector* pList, @@ -314,7 +314,7 @@ OFieldDescription* pField = m_vDestVector[m_nColumnPos]->second; if(pField) { - OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos) < m_vColumns.size(),"Illegal index for vector"); + OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector"); sal_Int32 nPos = m_vColumns[m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos].first; if(nPos != CONTAINER_ENTRY_NOTFOUND) { @@ -327,7 +327,7 @@ { sal_Int32 nNumberFormat = 0; double fOutNumber = 0.0; - OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos) < m_vColumnTypes.size(),"Illegal index for vector"); + OSL_ENSURE((m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos) < static_cast<sal_Int32>(m_vColumnTypes.size()),"Illegal index for vector"); if (m_vColumnTypes[m_bIsAutoIncrement ? m_nColumnPos+1 : m_nColumnPos] != DataType::VARCHAR) { Reference<XNumberFormatTypes> xNumType(m_xFormatter->getNumberFormatsSupplier()->getNumberFormats(),UNO_QUERY); @@ -398,7 +398,7 @@ fOutNumber = m_xFormatter->convertStringToNumber(nFormat,aCheckToken); { - OSL_ENSURE((m_nColumnPos) < m_vColumns.size(),"Illegal index for vector"); + OSL_ENSURE((m_nColumnPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector"); m_vFormatKey[m_vColumns[m_nColumnPos].first] = nFormat; // wird sp"ater f"ur die Column gebraucht switch(nType) { @@ -500,7 +500,7 @@ } catch(Exception&) { - OSL_ENSURE((m_nColumnPos) < m_vColumns.size(),"Illegal index for vector"); + OSL_ENSURE((m_nColumnPos) < static_cast<sal_Int32>(m_vColumns.size()),"Illegal index for vector"); m_vFormatKey[m_vColumns[m_nColumnPos].first] = 100; nFormat = NumberFormat::TEXT; // Text "uberschreibt alles } @@ -630,7 +630,7 @@ { ::rtl::OUString sDestName = ::dbtools::composeTableName(m_xConnection->getMetaData(),m_xTable,sal_False,::dbtools::eInDataManipulation); - xProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,makeAny(m_xConnection)); + xProp->setPropertyValue(PROPERTY_ACTIVECONNECTION,makeAny(m_xConnection.getTyped())); xProp->setPropertyValue(PROPERTY_COMMANDTYPE,makeAny(CommandType::TABLE)); xProp->setPropertyValue(PROPERTY_COMMAND,makeAny(sDestName)); xProp->setPropertyValue(PROPERTY_IGNORERESULT,::cppu::bool2any(sal_True)); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
