User: kz Date: 2008-06-25 12:34:18+0000 Modified: dba/dbaccess/source/filter/xml/xmlDataSource.cxx
Log: INTEGRATION: CWS dba30d (1.12.30); FILE MERGED 2008/06/02 06:46:05 oj 1.12.30.1: #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.13 Delta lines: +3 -2 ------------------- --- xmlDataSource.cxx 2008-04-10 13:24:31+0000 1.12 +++ xmlDataSource.cxx 2008-06-25 12:34:15+0000 1.13 @@ -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 ); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
