Tag: cws_src680_oj14 User: oj Date: 2006/07/04 01:13:56 Modified: dba/dbaccess/source/ui/misc/WNameMatch.cxx
Log: RESYNC: (1.16-1.17); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/misc/ ======================================== File [changed]: WNameMatch.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/misc/WNameMatch.cxx?r1=1.16.8.3&r2=1.16.8.4 Delta lines: +19 -21 --------------------- --- WNameMatch.cxx 25 Apr 2006 13:03:18 -0000 1.16.8.3 +++ WNameMatch.cxx 4 Jul 2006 08:13:53 -0000 1.16.8.4 @@ -66,7 +66,7 @@ using namespace ::dbaui; //======================================================================== // OWizColumnSelect -DBG_NAME(OWizNameMatching); +DBG_NAME(OWizNameMatching) //======================================================================== OWizNameMatching::OWizNameMatching( Window* pParent) :OWizardPage( pParent, ModuleRes( TAB_WIZ_NAME_MATCHING ) ) @@ -176,8 +176,8 @@ m_pParent->m_vColumnPos.clear(); m_pParent->m_vColumnTypes.clear(); - m_pParent->m_vColumnPos.resize(pSrcColumns->size(),ODatabaseExport::TPositions::value_type(CONTAINER_ENTRY_NOTFOUND,CONTAINER_ENTRY_NOTFOUND)); - m_pParent->m_vColumnTypes.resize(pSrcColumns->size(),CONTAINER_ENTRY_NOTFOUND); + m_pParent->m_vColumnPos.resize( pSrcColumns->size() ,ODatabaseExport::TPositions::value_type( COLUMN_POSITION_NOT_FOUND, COLUMN_POSITION_NOT_FOUND ) ); + m_pParent->m_vColumnTypes.resize( pSrcColumns->size(), COLUMN_POSITION_NOT_FOUND ); sal_Int32 nParamPos = 0; @@ -215,8 +215,8 @@ } else { - m_pParent->m_vColumnPos[nPos].first = CONTAINER_ENTRY_NOTFOUND; - m_pParent->m_vColumnPos[nPos].second = CONTAINER_ENTRY_NOTFOUND; + m_pParent->m_vColumnPos[nPos].first = COLUMN_POSITION_NOT_FOUND; + m_pParent->m_vColumnPos[nPos].second = COLUMN_POSITION_NOT_FOUND; } pLeftEntry = m_CTRL_LEFT.GetModel()->Next(pLeftEntry); @@ -283,24 +283,23 @@ return 0; } //------------------------------------------------------------------------------ -IMPL_LINK( OWizNameMatching, TableListClickHdl, SvTreeListBox *, pListBox ) +IMPL_LINK( OWizNameMatching, TableListClickHdl, SvTreeListBox *, /*pListBox*/ ) { SvLBoxEntry* pEntry = m_CTRL_LEFT.FirstSelected(); if(pEntry) { - sal_uInt32 nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_LEFT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_RIGHT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry)) { if(pOldEntry) m_CTRL_RIGHT.Select(pOldEntry,sal_False); - sal_uInt32 nOldPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry); pOldEntry = m_CTRL_RIGHT.GetEntry(nPos); if(pOldEntry) { - sal_uInt32 nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView()); - if(nPos - nNewPos == -1) - nNewPos--; + ULONG nNewPos = m_CTRL_LEFT.GetModel()->GetAbsPos(m_CTRL_LEFT.GetFirstEntryInView()); + if ( nNewPos - nPos == 1 ) + --nNewPos; m_CTRL_RIGHT.MakeVisible(m_CTRL_RIGHT.GetEntry(nNewPos),sal_True); m_CTRL_RIGHT.Select(pOldEntry,sal_True); } @@ -318,23 +317,22 @@ return 0; } //------------------------------------------------------------------------------ -IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox *, pListBox ) +IMPL_LINK( OWizNameMatching, TableListRightSelectHdl, SvTreeListBox *, /*pListBox*/ ) { SvLBoxEntry* pEntry = m_CTRL_RIGHT.FirstSelected(); if(pEntry) { - sal_uInt32 nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); + ULONG nPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pEntry); SvLBoxEntry* pOldEntry = m_CTRL_LEFT.FirstSelected(); if(pOldEntry && nPos != m_CTRL_LEFT.GetModel()->GetAbsPos(pOldEntry)) { if(pOldEntry) m_CTRL_LEFT.Select(pOldEntry,sal_False); - sal_uInt32 nOldPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(pOldEntry); pOldEntry = m_CTRL_LEFT.GetEntry(nPos); if(pOldEntry) { - sal_uInt32 nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView()); - if(nPos - nNewPos == -1) + ULONG nNewPos = m_CTRL_RIGHT.GetModel()->GetAbsPos(m_CTRL_RIGHT.GetFirstEntryInView()); + if ( nNewPos - nPos == 1 ) nNewPos--; m_CTRL_LEFT.MakeVisible(m_CTRL_LEFT.GetEntry(nNewPos),sal_True); m_CTRL_LEFT.Select(pOldEntry,sal_True); @@ -393,7 +391,7 @@ } */ //------------------------------------------------------------------------ -void OColumnString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 nFlags, SvLBoxEntry* pEntry ) +void OColumnString::Paint(const Point& rPos, SvLBox& rDev, sal_uInt16 /*nFlags*/, SvLBoxEntry* /*pEntry*/ ) { if(m_bReadOnly) { @@ -451,7 +449,7 @@ { SvLBoxEntry* pEntry = InsertEntry((*aIter)->first,0,sal_False,LIST_APPEND,(*aIter)->second); SvButtonState eState = !(m_bReadOnly && (*aIter)->second->IsAutoIncrement()) ? SV_BUTTON_CHECKED : SV_BUTTON_UNCHECKED; - SetCheckButtonState( pEntry, SV_BUTTON_CHECKED); + SetCheckButtonState( pEntry, eState ); } } // ----------------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
