Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:51:51 Modified: dba/dbaccess/source/core/api/query.cxx
Log: RESYNC: (1.29-1.30); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: query.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/query.cxx?r1=1.29.124.3&r2=1.29.124.4 Delta lines: +11 -10 --------------------- --- query.cxx 6 Jun 2006 13:59:41 -0000 1.29.124.3 +++ query.cxx 27 Jun 2006 11:51:49 -0000 1.29.124.4 @@ -132,19 +132,19 @@ OQuery::OQuery( const Reference< XPropertySet >& _rxCommandDefinition ,const Reference< XConnection >& _rxConn ,const Reference< XMultiServiceFactory >& _xORB) - :OQueryDescriptor_Base(m_aMutex,*this) + :OContentHelper(_xORB,NULL,TContentPtr(new OContentHelper_Impl)) + ,OQueryDescriptor_Base(m_aMutex,*this) ,ODataSettings(m_aBHelper,sal_True) - ,OContentHelper(_xORB,NULL,TContentPtr(new OContentHelper_Impl)) - ,m_bCaseSensitiv(sal_True) ,m_xCommandDefinition(_rxCommandDefinition) - ,m_eDoingCurrently(NONE) ,m_xConnection(_rxConn) - ,m_pWarnings( NULL ) ,m_pMediator(NULL) + ,m_pWarnings( NULL ) + ,m_bCaseSensitiv(sal_True) + ,m_eDoingCurrently(NONE) { DBG_CTOR(OQuery, NULL); registerProperties(); - ODataSettings::registerProperties(this); + ODataSettings::registerPropertiesFor(this); osl_incrementInterlockedCount(&m_refCount); DBG_ASSERT(m_xCommandDefinition.is(), "OQuery::OQuery : invalid CommandDefinition object !"); @@ -314,6 +314,7 @@ { MutexGuard aGuard(m_aMutex); + (void)_rSource; DBG_ASSERT(_rSource.Source.get() == Reference< XInterface >(m_xCommandDefinition, UNO_QUERY).get(), "OQuery::disposing : where did this call come from ?"); @@ -387,7 +388,7 @@ return new ::cppu::OPropertyArrayHelper(aProps); } // ----------------------------------------------------------------------------- -OColumn* OQuery::createColumn(const ::rtl::OUString& _rName) const +OColumn* OQuery::createColumn(const ::rtl::OUString& /*_rName*/) const { return NULL; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
