User: obo Date: 2006/07/13 08:23:17 Modified: dba/dbaccess/source/filter/xml/xmlfilter.cxx
Log: INTEGRATION: CWS dba204a (1.12.10); FILE MERGED 2006/07/06 07:04:52 oj 1.12.10.1: warnings removed File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.12&r2=1.13 Delta lines: +9 -4 ------------------- --- xmlfilter.cxx 20 Jun 2006 02:52:57 -0000 1.12 +++ xmlfilter.cxx 13 Jul 2006 15:23:14 -0000 1.13 @@ -191,9 +191,9 @@ { xParser->parseStream( aParserInput ); } +#if OSL_DEBUG_LEVEL > 1 catch( SAXParseException& r ) { -#if OSL_DEBUG_LEVEL > 1 ByteString aError( "SAX parse exception catched while importing:\n" ); aError += ByteString( String( r.Message), RTL_TEXTENCODING_ASCII_US ); aError += ByteString::CreateFromInt32( r.LineNumber ); @@ -201,9 +201,14 @@ aError += ByteString::CreateFromInt32( r.ColumnNumber ); DBG_ERROR( aError.GetBuffer() ); -#endif return 1; } +#else + catch( SAXParseException& ) + { + return 1; + } +#endif catch( SAXException& ) { return 1; @@ -362,8 +367,8 @@ } - sal_Bool bRet; - if ( bRet = (sFileName.getLength() != 0) ) + sal_Bool bRet = (sFileName.getLength() != 0); + if ( bRet ) { Reference<XComponent> xCom(GetModel(),UNO_QUERY); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
