Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:56:23 Modified: dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx
Log: RESYNC: (1.13-1.14); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: SingleSelectQueryComposer.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/SingleSelectQueryComposer.cxx?r1=1.13.18.8&r2=1.13.18.9 Delta lines: +20 -19 --------------------- --- SingleSelectQueryComposer.cxx 9 Jun 2006 11:58:14 -0000 1.13.18.8 +++ SingleSelectQueryComposer.cxx 27 Jun 2006 11:56:20 -0000 1.13.18.9 @@ -239,18 +239,18 @@ OSingleSelectQueryComposer::OSingleSelectQueryComposer(const Reference< XNameAccess>& _rxTables, const Reference< XConnection>& _xConnection, const Reference< XMultiServiceFactory >& _xServiceFactory) - : OSubComponent(m_aMutex,_xConnection) + :OSubComponent(m_aMutex,_xConnection) ,OPropertyContainer(m_aBHelper) - , m_xConnection(_xConnection) - , m_xMetaData(_xConnection->getMetaData()) - , m_aSqlParser(_xServiceFactory) - , m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) - , m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) - , m_xConnectionTables( _rxTables ) + ,m_aSqlParser(_xServiceFactory) + ,m_aSqlIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) + ,m_aAdditiveIterator( _xConnection, _rxTables, m_aSqlParser, NULL ) + ,m_aElementaryParts( (size_t)SQLPartCount ) + ,m_xConnection(_xConnection) + ,m_xMetaData(_xConnection->getMetaData()) + ,m_xConnectionTables( _rxTables ) ,m_xServiceFactory(_xServiceFactory) ,m_pTables(NULL) ,m_nBoolCompareMode(BOOL_COMPARISON_DEFAULT) - ,m_aElementaryParts( (size_t)SQLPartCount ) { DBG_CTOR(OSingleSelectQueryComposer,NULL); @@ -598,7 +598,7 @@ } catch( const Exception& e ) { - e; + (void)e; DBG_ERROR( "OSingleSelectQueryComposer::setElementaryQuery: there should be no error anymore for the additive statement!" ); // every part of the additive statement should have passed other tests already, and should not // be able to cause any errors ... me thinks @@ -675,7 +675,7 @@ } catch( const Exception& e ) { - e; + (void)e; DBG_ERROR( "OSingleSelectQueryComposer::setSingleAdditiveClause: there should be no error anymore for the additive statement!" ); // every part of the additive statement should have passed other tests already, and should not // be able to cause any errors ... me thinks @@ -1069,7 +1069,7 @@ { nPos = pCondition->count()-1; - sal_uInt32 i = pCondition->count() - 2; + sal_Int32 i = pCondition->count() - 2; switch (pCondition->getChild(i)->getNodeType()) { case SQL_NODE_EQUAL: @@ -1105,6 +1105,8 @@ aValue = ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM("<")); aItem.Handle = SQLFilterOperator::LESS; break; + default: + break; } // go backward @@ -1583,7 +1585,6 @@ aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" TRUE ")); else aSql += ::rtl::OUString(RTL_CONSTASCII_USTRINGPARAM(" FALSE ")); - break; break; case BOOL_COMPARISON_ACCESS: if ( bValue ) --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
