Tag: cws_dev300_dba30d User: oj Date: 2008-06-02 06:46:08+0000 Modified: dba/dbaccess/source/filter/xml/xmlDataSource.cxx dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx dba/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx
Log: #i88793# check which prop we are currently importing File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlDataSource.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSource.cxx?r1=1.12&r2=1.12.30.1 Delta lines: +5 -4 ------------------- --- xmlDataSource.cxx 2008-04-10 13:24:31+0000 1.12 +++ xmlDataSource.cxx 2008-06-02 06:46:05+0000 1.12.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlDataSource.cxx,v $ - * $Revision: 1.12 $ + * $Revision: 1.12.30.1 $ * * This file is part of OpenOffice.org. * @@ -254,8 +254,9 @@ { SvXMLImportContext *pContext = 0; const SvXMLTokenMap& rTokenMap = GetOwnImport().GetDataSourceElemTokenMap(); + const sal_uInt16 nToken = rTokenMap.Get( nPrefix, rLocalName ); - switch( rTokenMap.Get( nPrefix, rLocalName ) ) + switch( nToken ) { case XML_TOK_LOGIN: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); @@ -272,7 +273,7 @@ case XML_TOK_FONT_CHARSET: case XML_TOK_CHARACTER_SET: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); - pContext = new OXMLDataSourceInfo( GetOwnImport(), nPrefix, rLocalName,xAttrList); + pContext = new OXMLDataSourceInfo( GetOwnImport(), nPrefix, rLocalName,xAttrList,nToken); break; case XML_TOK_DATA_SOURCE_SETTINGS: GetOwnImport().GetProgressBarHelper()->Increment( PROGRESS_BAR_STEP ); File [changed]: xmlDataSourceInfo.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx?r1=1.10&r2=1.10.30.1 Delta lines: +18 -14 --------------------- --- xmlDataSourceInfo.cxx 2008-04-10 13:25:02+0000 1.10 +++ xmlDataSourceInfo.cxx 2008-06-02 06:46:05+0000 1.10.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlDataSourceInfo.cxx,v $ - * $Revision: 1.10 $ + * $Revision: 1.10.30.1 $ * * This file is part of OpenOffice.org. * @@ -71,7 +71,8 @@ OXMLDataSourceInfo::OXMLDataSourceInfo( ODBFilter& rImport ,sal_uInt16 nPrfx ,const ::rtl::OUString& _sLocalName - ,const Reference< XAttributeList > & _xAttrList) : + ,const Reference< XAttributeList > & _xAttrList + ,const sal_uInt16 _nToken) : SvXMLImportContext( rImport, nPrfx, _sLocalName ) { DBG_CTOR(OXMLDataSourceInfo,NULL); @@ -139,6 +140,8 @@ } if ( rImport.isNewFormat() ) { + if ( XML_TOK_DELIMITER == _nToken ) + { if ( !bFoundField ) { aProperty.Name = INFO_FIELDDELIMITER; @@ -150,8 +153,9 @@ aProperty.Name = INFO_THOUSANDSDELIMITER; aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(",")); rImport.addInfo(aProperty); + } // if ( !bFoundThousand ) } - if ( !bFoundCharset ) + if ( XML_TOK_FONT_CHARSET == _nToken && !bFoundCharset ) { aProperty.Name = INFO_CHARSET; aProperty.Value <<= ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("utf8")); File [changed]: xmlDataSourceInfo.hxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceInfo.hxx?r1=1.5&r2=1.5.30.1 Delta lines: +4 -3 ------------------- --- xmlDataSourceInfo.hxx 2008-04-10 13:25:18+0000 1.5 +++ xmlDataSourceInfo.hxx 2008-06-02 06:46:05+0000 1.5.30.1 @@ -7,7 +7,7 @@ * OpenOffice.org - a multi-platform office productivity suite * * $RCSfile: xmlDataSourceInfo.hxx,v $ - * $Revision: 1.5 $ + * $Revision: 1.5.30.1 $ * * This file is part of OpenOffice.org. * @@ -44,7 +44,8 @@ OXMLDataSourceInfo( ODBFilter& rImport, sal_uInt16 nPrfx, const ::rtl::OUString& rLName, - const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList); + const ::com::sun::star::uno::Reference< ::com::sun::star::xml::sax::XAttributeList > & xAttrList + ,const sal_uInt16 _nToken); virtual ~OXMLDataSourceInfo(); }; // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
