Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:59:18 Modified: dba/dbaccess/source/ui/dlg/indexdialog.cxx
Log: RESYNC: (1.24-1.25); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: indexdialog.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/indexdialog.cxx?r1=1.22.4.5&r2=1.22.4.6 Delta lines: +11 -11 --------------------- --- indexdialog.cxx 25 Apr 2006 13:03:00 -0000 1.22.4.5 +++ indexdialog.cxx 4 Jul 2006 07:59:15 -0000 1.22.4.6 @@ -441,8 +441,7 @@ } SvLBoxEntry* pNewEntry = m_aIndexes.InsertEntry(sNewIndexName); - Indexes::iterator aIndexDescriptor = m_pIndexes->insert(sNewIndexName); -// pNewEntry->SetUserData(aIndexDescriptor); + m_pIndexes->insert(sNewIndexName); // update the user data on the entries in the list box: // they're iterators of the index collection, and thus they have changed when removing the index @@ -494,7 +493,6 @@ DBG_ASSERT(aDropPos != m_pIndexes->end(), "DbaIndexDialog::OnDropIndex: did not find the index in my collection!"); SQLExceptionInfo aExceptionInfo; - sal_Bool bNewIndex = aDropPos->isNew(); sal_Bool bSuccess = sal_False; try { @@ -558,8 +556,10 @@ void DbaIndexDialog::OnSaveIndex() { // the selected index +#if OSL_DEBUG_LEVEL > 0 SvLBoxEntry* pSelected = m_aIndexes.FirstSelected(); - DBG_ASSERT(pSelected, "DbaIndexDialog::OnSaveIndex: invalid call!"); + OSL_ENSURE( pSelected, "DbaIndexDialog::OnSaveIndex: invalid call!" ); +#endif implCommitPreviouslySelected(); updateToolbox(); @@ -599,7 +599,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { sal_uInt16 nClicked = m_aActions.GetCurItemId(); switch (nClicked) @@ -624,7 +624,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) { if (m_aIndexes.IsEditingActive()) { @@ -806,7 +806,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnModified, void*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnModified, void*, /*NOTINTERESTEDIN*/ ) { DBG_ASSERT(m_pPreviousSelection, "DbaIndexDialog, OnModified: invalid call!"); Indexes::iterator aPosition = m_pIndexes->begin() + reinterpret_cast<sal_IntPtr>(m_pPreviousSelection->GetUserData()); @@ -848,7 +848,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnIndexSelected, DbaIndexList*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnIndexSelected, DbaIndexList*, /*NOTINTERESTEDIN*/ ) { m_aIndexes.EndSelection(); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
