Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:20:01 Modified: dba/dbaccess/source/ui/querydesign/TableWindow.cxx
Log: RESYNC: (1.30-1.31); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/querydesign/ =============================================== File [changed]: TableWindow.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/querydesign/TableWindow.cxx?r1=1.30.6.3&r2=1.30.6.4 Delta lines: +12 -13 --------------------- --- TableWindow.cxx 25 Apr 2006 12:49:34 -0000 1.30.6.3 +++ TableWindow.cxx 4 Jul 2006 08:19:58 -0000 1.30.6.4 @@ -132,16 +132,15 @@ OTableWindow::OTableWindow( Window* pParent, OTableWindowData* pTabWinData ) :Window( pParent, WB_3DLOOK|WB_MOVEABLE ) ,m_aTitle( this ) - ,m_nSizingFlags( SIZING_NONE ) - ,m_bActive( FALSE ) ,m_pListBox(NULL) + ,m_pAccessible(NULL) + ,m_pData( pTabWinData ) ,m_nMoveCount(0) ,m_nMoveIncrement(1) - ,m_pAccessible(NULL) + ,m_nSizingFlags( SIZING_NONE ) + ,m_bActive( FALSE ) { DBG_CTOR(OTableWindow,NULL); - // ich uebernehme nicht die Verantwortung fuer die Daten, ich merke mir nur den Zeiger darauf - m_pData = pTabWinData; // Position und Groesse bestimmen if( GetData()->HasPosition() ) @@ -222,7 +221,7 @@ //------------------------------------------------------------------------------ OTableWindowListBox* OTableWindow::CreateListBox() { - return new OTableWindowListBox(this, GetComposedName(), GetTableName()); + return new OTableWindowListBox(this); } //------------------------------------------------------------------------------ @@ -310,7 +309,7 @@ return TRUE; } // ----------------------------------------------------------------------------- -void* OTableWindow::createUserData(const Reference< XPropertySet>& _xColumn,bool _bPrimaryKey) +void* OTableWindow::createUserData(const Reference< XPropertySet>& /*_xColumn*/,bool /*_bPrimaryKey*/) { return NULL; } @@ -723,7 +722,7 @@ } } // ----------------------------------------------------------------------------- -void OTableWindow::_disposing( const ::com::sun::star::lang::EventObject& _rSource ) +void OTableWindow::_disposing( const ::com::sun::star::lang::EventObject& /*_rSource*/ ) { ::osl::MutexGuard aGuard( m_aMutex ); m_xTable = NULL; @@ -753,7 +752,7 @@ { SvLBoxEntry* pCurrent = m_pListBox->GetCurEntry(); if ( pCurrent ) - ptWhere = m_pListBox->GetEntryPos(pCurrent); + ptWhere = m_pListBox->GetEntryPosition(pCurrent); else ptWhere = m_aTitle.GetPosPixel(); } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
