Tag: cws_src680_dba204a User: oj Date: 2006/07/06 00:04:54 Modified: dba/dbaccess/source/filter/xml/xmlExport.cxx dba/dbaccess/source/filter/xml/xmlfilter.cxx
Log: warnings removed File Changes: Directory: /dba/dbaccess/source/filter/xml/ =========================================== File [changed]: xmlExport.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlExport.cxx?r1=1.9.8.1&r2=1.9.8.2 Delta lines: +6 -8 ------------------- --- xmlExport.cxx 6 Jul 2006 06:21:08 -0000 1.9.8.1 +++ xmlExport.cxx 6 Jul 2006 07:04:52 -0000 1.9.8.2 @@ -4,9 +4,9 @@ * * $RCSfile: xmlExport.cxx,v $ * - * $Revision: 1.9.8.1 $ + * $Revision: 1.9.8.2 $ * - * last change: $Author: oj $ $Date: 2006/07/06 06:21:08 $ + * last change: $Author: oj $ $Date: 2006/07/06 07:04:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -232,8 +232,8 @@ const XMLPropertyState& /*rProperty*/, const SvXMLUnitConverter& /*rUnitConverter*/, const SvXMLNamespaceMap& /*rNamespaceMap*/, - const ::std::vector< XMLPropertyState > */*pProperties*/ = 0, - sal_uInt32 /*nIdx*/ = 0 ) const + const ::std::vector< XMLPropertyState > /*pProperties*/ , + sal_uInt32 /*nIdx*/ ) const { // nothing to do here } @@ -880,8 +880,7 @@ // ----------------------------------------------------------------------------- void ODBExport::exportAutoStyle(XPropertySet* _xProp) { - ::std::vector< XMLPropertyState > aPropertyStates; - m_xExportHelper->Filter(_xProp,aPropertyStates ); + ::std::vector< XMLPropertyState > aPropertyStates = m_xExportHelper->Filter(_xProp); Reference<XColumnsSupplier> xSup(_xProp,UNO_QUERY); if ( xSup.is() ) @@ -904,8 +903,7 @@ } else { // here I know I have a column - ::std::vector< XMLPropertyState > aPropStates; - m_xColumnExportHelper->Filter( _xProp ,aPropStates); + ::std::vector< XMLPropertyState > aPropStates = m_xColumnExportHelper->Filter( _xProp ); if ( !aPropStates.empty() ) { ::std::vector< XMLPropertyState >::iterator aItr = aPropStates.begin(); File [changed]: xmlfilter.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/filter/xml/xmlfilter.cxx?r1=1.12&r2=1.12.10.1 Delta lines: +12 -7 -------------------- --- xmlfilter.cxx 20 Jun 2006 02:52:57 -0000 1.12 +++ xmlfilter.cxx 6 Jul 2006 07:04:52 -0000 1.12.10.1 @@ -4,9 +4,9 @@ * * $RCSfile: xmlfilter.cxx,v $ * - * $Revision: 1.12 $ + * $Revision: 1.12.10.1 $ * - * last change: $Author: hr $ $Date: 2006/06/20 02:52:57 $ + * last change: $Author: oj $ $Date: 2006/07/06 07:04:52 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -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]
