User: hr      
Date: 06/06/19 19:38:35

Modified:
 /dba/dbaccess/source/core/api/
  column.cxx

Log:
 INTEGRATION: CWS warnings01 (1.49.50); FILE MERGED
 2006/06/14 10:57:44 fs 1.49.50.2: removed useless include
 2006/03/24 15:35:48 fs 1.49.50.1: #i57457# warning-free code (unxlngi6/.pro + 
unxsoli4.pro)

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&r2=1.50
Delta lines:  +16 -16
---------------------
--- column.cxx  8 Sep 2005 10:05:07 -0000       1.49
+++ column.cxx  20 Jun 2006 02:38:33 -0000      1.50
@@ -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
@@ -123,7 +120,7 @@
 using namespace ::comphelper;
 using namespace ::cppu;
 
-DBG_NAME(OColumn);
+DBG_NAME(OColumn)
 
 //============================================================
 //= OColumn
@@ -295,8 +292,9 @@
        m_sName = _rName;
 }
 // 
-----------------------------------------------------------------------------
-void OColumn::fireValueChange(const ::connectivity::ORowSetValue& _rOldValue)
+void OColumn::fireValueChange(const ::connectivity::ORowSetValue& 
/*_rOldValue*/)
 {
+    DBG_ERROR( "OColumn::fireValueChange: not implemented!" );
 }
 // 
-----------------------------------------------------------------------------
 //============================================================
@@ -391,7 +389,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 )
                        {
@@ -461,8 +460,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!");
@@ -534,13 +534,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);
 }
@@ -554,13 +554,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]

Reply via email to