User: hr Date: 06/06/19 20:21:50 Modified: /dba/dbaccess/source/ui/misc/ WColumnSelect.cxx
Log: INTEGRATION: CWS warnings01 (1.17.4); FILE MERGED 2006/05/23 23:58:36 sb 1.17.4.2: RESYNC: (1.17-1.19); FILE MERGED 2006/03/24 15:36:22 fs 1.17.4.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WColumnSelect.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WColumnSelect.cxx?r1=1.19&r2=1.20 Delta lines: +12 -11 --------------------- --- WColumnSelect.cxx 4 May 2006 08:44:54 -0000 1.19 +++ WColumnSelect.cxx 20 Jun 2006 03:21:48 -0000 1.20 @@ -100,14 +100,14 @@ DBG_NAME(OWizColumnSelect); //======================================================================== OWizColumnSelect::OWizColumnSelect( Window* pParent) - :OWizardPage( pParent, ModuleRes( TAB_WIZ_COLUMN_SELECT )), - m_flColumns( this, ModuleRes( FL_COLUMN_SELECT ) ), - m_lbOrgColumnNames( this, ModuleRes( LB_ORG_COLUMN_NAMES ) ), - m_ibColumn_RH( this, ModuleRes( IB_COLUMN_RH ) ), - m_ibColumn_LH( this, ModuleRes( IB_COLUMN_LH ) ), - m_ibColumns_RH( this, ModuleRes( IB_COLUMNS_RH ) ), - m_ibColumns_LH( this, ModuleRes( IB_COLUMNS_LH ) ), - m_lbNewColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) ) + :OWizardPage( pParent, ModuleRes( TAB_WIZ_COLUMN_SELECT )) + ,m_flColumns( this, ModuleRes( FL_COLUMN_SELECT ) ) + ,m_lbOrgColumnNames( this, ModuleRes( LB_ORG_COLUMN_NAMES ) ) + ,m_ibColumn_RH( this, ModuleRes( IB_COLUMN_RH ) ) + ,m_ibColumns_RH( this, ModuleRes( IB_COLUMNS_RH ) ) + ,m_ibColumn_LH( this, ModuleRes( IB_COLUMN_LH ) ) + ,m_ibColumns_LH( this, ModuleRes( IB_COLUMNS_LH ) ) + ,m_lbNewColumnNames( this, ModuleRes( LB_NEW_COLUMN_NAMES ) ) { DBG_CTOR(OWizColumnSelect,NULL); m_ibColumn_RH.SetClickHdl(LINK(this,OWizColumnSelect,ButtonClickHdl)); @@ -207,7 +207,9 @@ clearListBox(m_lbNewColumnNames); - if(m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_NEXT || m_pParent->WasButtonPressed() == OCopyTableWizard::WIZARD_FINISH) + if ( m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_NEXT + || m_pParent->GetPressedButton() == OCopyTableWizard::WIZARD_FINISH + ) return m_pParent->getDestColumns()->size(); else return sal_True; @@ -332,8 +334,7 @@ const ::rtl::OUString& _sColumnName, const ::rtl::OUString& _sExtraChars, sal_Int32 _nMaxNameLen, - const ::comphelper::TStringMixEqualFunctor& _aCase, - USHORT nPos) + const ::comphelper::TStringMixEqualFunctor& _aCase) { ::rtl::OUString sConvertedName = m_pParent->convertColumnName(TMultiListBoxEntryFindFunctor(&_rRightColumns,_aCase), _sColumnName, --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
