Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:12:43 Modified: dba/dbaccess/source/ui/misc/TokenWriter.cxx
Log: RESYNC: (1.28-1.29); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: TokenWriter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/TokenWriter.cxx?r1=1.27.4.4&r2=1.27.4.5 Delta lines: +17 -22 --------------------- --- TokenWriter.cxx 25 Apr 2006 13:03:15 -0000 1.27.4.4 +++ TokenWriter.cxx 4 Jul 2006 08:12:40 -0000 1.27.4.5 @@ -152,17 +152,17 @@ #define SBA_FORMAT_SELECTION_COUNT 4 -DBG_NAME(ODatabaseImportExport); +DBG_NAME(ODatabaseImportExport) //====================================================================== ODatabaseImportExport::ODatabaseImportExport(const ::svx::ODataAccessDescriptor& _aDataDescriptor, const Reference< XMultiServiceFactory >& _rM, const Reference< ::com::sun::star::util::XNumberFormatter >& _rxNumberF, const String& rExchange) - :m_pReader(NULL) - ,m_pRowMarker(NULL) - ,m_xFormatter(_rxNumberF) + :m_xFormatter(_rxNumberF) ,m_xFactory(_rM) ,m_nCommandType(CommandType::TABLE) + ,m_pReader(NULL) + ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) ,m_bCheckOnly(sal_False) { @@ -184,12 +184,12 @@ // import data ODatabaseImportExport::ODatabaseImportExport( const ::dbtools::SharedConnection& _rxConnection, const Reference< XNumberFormatter >& _rxNumberF, const Reference< XMultiServiceFactory >& _rM ) - : m_xConnection(_rxConnection) - ,m_pReader(NULL) - ,m_pRowMarker(NULL) + :m_xConnection(_rxConnection) ,m_xFormatter(_rxNumberF) ,m_xFactory(_rM) ,m_nCommandType(::com::sun::star::sdb::CommandType::TABLE) + ,m_pReader(NULL) + ,m_pRowMarker(NULL) ,m_bInInitialize(sal_False) ,m_bCheckOnly(sal_False) { @@ -512,7 +512,6 @@ Reference<XNameAccess> xColumns = xColSup->getColumns(); Sequence< ::rtl::OUString> aNames(xColumns->getElementNames()); const ::rtl::OUString* pIter = aNames.getConstArray(); - const ::rtl::OUString* pEnd = pIter + aNames.getLength(); sal_Int32 nCount = aNames.getLength(); sal_Bool bUseResultMetaData = sal_False; @@ -522,8 +521,7 @@ bUseResultMetaData = sal_True; } - sal_Int32 i; - for(i=1;i<=nCount;++i) + for( sal_Int32 i=1; i<=nCount; ++i ) { (*m_pStream) << aCell1; m_pStream->WriteNumber(i*nCellx); @@ -537,7 +535,7 @@ ::rtl::OString* pHorzChar = new ::rtl::OString[nCount]; - for(i=1;i <= nCount;++i) + for ( sal_Int32 i=1; i <= nCount; ++i ) { sal_Int32 nAlign = 0; ::rtl::OUString sColumnName; @@ -598,7 +596,7 @@ m_pStream->WriteNumber(40); (*m_pStream) << ODatabaseImportExport::sNewLine; - for(i=1;i<=nCount;++i) + for ( sal_Int32 i=1; i<=nCount; ++i ) { (*m_pStream) << aCell2; m_pStream->WriteNumber(i*nCellx); @@ -607,7 +605,7 @@ (*m_pStream) << '{'; (*m_pStream) << aTRRH; - for(sal_Int32 i=1;i<=nCount;++i) + for ( sal_Int32 i=1; i<=nCount; ++i ) { (*m_pStream) << ODatabaseImportExport::sNewLine; (*m_pStream) << '{'; @@ -811,7 +809,6 @@ Reference<XColumnsSupplier> xColSup(m_xObject,UNO_QUERY); xColumns = xColSup->getColumns(); aNames = xColumns->getElementNames(); - sal_Bool bUseResultMetaData = sal_False; if ( !aNames.getLength() ) { sal_Int32 nCount = m_xResultSetMetaData->getColumnCount(); @@ -876,7 +873,7 @@ const ::rtl::OUString* pIter = aNames.getConstArray(); const ::rtl::OUString* pEnd = pIter + aNames.getLength(); - for(sal_Int32 i=0;pIter != pEnd;++pIter,++i) + for( sal_Int32 i=0;pIter != pEnd; ++pIter,++i ) { sal_Int32 nAlign = 0; pFormat[i] = 0; @@ -997,9 +994,7 @@ double fVal = 0.0; Reference< ::com::sun::star::util::XNumberFormatsSupplier > xSupplier = m_xFormatter->getNumberFormatsSupplier(); - - Reference< XUnoTunnel > xTunnel(xSupplier,UNO_QUERY); - SvNumberFormatsSupplierObj* pSupplierImpl = (SvNumberFormatsSupplierObj*)xTunnel->getSomething(SvNumberFormatsSupplierObj::getUnoTunnelId()); + SvNumberFormatsSupplierObj* pSupplierImpl = SvNumberFormatsSupplierObj::getImplementation( xSupplier ); SvNumberFormatter* pFormatter = pSupplierImpl ? pSupplierImpl->GetNumberFormatter() : NULL; if(pFormatter) { --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
