User: kz Date: 2008-06-25 12:34:33+0000 Modified: dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx
Log: INTEGRATION: CWS dba30d (1.10.30); FILE MERGED 2008/06/02 06:46:05 oj 1.10.30.1: #i88793# check which prop we are currently importing File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlDataSourceInfo.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlDataSourceInfo.cxx?r1=1.10&r2=1.11 Delta lines: +16 -12 --------------------- --- xmlDataSourceInfo.cxx 2008-04-10 13:25:02+0000 1.10 +++ xmlDataSourceInfo.cxx 2008-06-25 12:34:30+0000 1.11 @@ -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")); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
