Tag: cws_src680_qiq User: fs Date: 2006/06/27 04:56:13 Modified: dba/dbaccess/source/core/api/column.cxx
Log: RESYNC: (1.49-1.50); FILE MERGED File Changes: Directory: /dba/dbaccess/source/core/api/ ========================================= File [changed]: column.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/core/api/column.cxx?r1=1.49.124.1&r2=1.49.124.2 Delta lines: +19 -19 --------------------- --- column.cxx 16 Jun 2006 11:47:36 -0000 1.49.124.1 +++ column.cxx 27 Jun 2006 11:56:11 -0000 1.49.124.2 @@ -87,9 +87,6 @@ #ifndef _TOOLS_DEBUG_HXX #include <tools/debug.hxx> #endif -#ifndef _CONNECTIVITY_SDBCX_COLUMN_HXX_ -#include <connectivity/sdbcx/VColumn.hxx> -#endif #ifndef CONNECTIVITY_TABLEHELPER_HXX #include <connectivity/TTableHelper.hxx> #endif @@ -127,7 +124,7 @@ using namespace ::comphelper; using namespace ::cppu; -DBG_NAME(OColumn); +DBG_NAME(OColumn) //============================================================ //= OColumn @@ -299,8 +296,9 @@ m_sName = _rName; } // ----------------------------------------------------------------------------- -void OColumn::fireValueChange(const ::connectivity::ORowSetValue& _rOldValue) +void OColumn::fireValueChange(const ::connectivity::ORowSetValue& /*_rOldValue*/) { + DBG_ERROR( "OColumn::fireValueChange: not implemented!" ); } // ----------------------------------------------------------------------------- //============================================================ @@ -395,7 +393,8 @@ bModified = !uno_type_equalData( const_cast< void* >( m_aAlignment.getValue() ), m_aAlignment.getValueType().getTypeLibType(), const_cast< void* >( rValue.getValue() ), rValue.getValueType().getTypeLibType(), - cpp_queryInterface, cpp_release + reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ), + reinterpret_cast< uno_ReleaseFunc >( cpp_release ) ); if ( bModified ) { @@ -465,8 +464,9 @@ uno_type_assignData( static_cast< void* >( &nAlign ), ::getCppuType(static_cast< sal_Int32* >(NULL)).getTypeLibType(), const_cast< void* >( rValue.getValue() ), rValue.getValueType().getTypeLibType(), - cpp_queryInterface, - cpp_acquire, cpp_release ); + reinterpret_cast< uno_QueryInterfaceFunc >( cpp_queryInterface ), + reinterpret_cast< uno_AcquireFunc >( cpp_acquire ), + reinterpret_cast< uno_ReleaseFunc >( cpp_release ) ); OSL_ENSURE( bSuccess, "OPropertyStateContainer::setFastPropertyValue_NoBroadcast : ooops .... the value could not be assigned!"); @@ -538,13 +538,13 @@ sal_Bool _bDropColumn, sal_Bool _bUseHardRef) : OColumns_BASE(_rParent,_bCaseSensitive,_rMutex,_rVector,_bUseHardRef) - ,m_bInitialized(sal_False) - ,m_bAddColumn(_bAddColumn) - ,m_bDropColumn(_bDropColumn) + ,m_pMediator(NULL) ,m_xDrvColumns(NULL) ,m_pColFactoryImpl(_pColFactory) ,m_pRefreshColumns(_pRefresh) - ,m_pMediator(NULL) + ,m_bInitialized(sal_False) + ,m_bAddColumn(_bAddColumn) + ,m_bDropColumn(_bDropColumn) { DBG_CTOR(OColumns, NULL); } @@ -558,13 +558,13 @@ sal_Bool _bDropColumn, sal_Bool _bUseHardRef) : OColumns_BASE(_rParent,_bCaseSensitive,_rMutex,_rVector,_bUseHardRef) - ,m_bInitialized(sal_False) - ,m_bAddColumn(_bAddColumn) - ,m_bDropColumn(_bDropColumn) + ,m_pMediator(NULL) ,m_xDrvColumns(_rxDrvColumns) ,m_pColFactoryImpl(_pColFactory) ,m_pRefreshColumns(_pRefresh) - ,m_pMediator(NULL) + ,m_bInitialized(sal_False) + ,m_bAddColumn(_bAddColumn) + ,m_bDropColumn(_bDropColumn) { DBG_CTOR(OColumns, NULL); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
