User: hr Date: 06/06/19 20:08:19 Modified: /dba/dbaccess/source/ui/dlg/ indexdialog.cxx
Log: INTEGRATION: CWS warnings01 (1.24.22); FILE MERGED 2006/03/24 15:36:12 fs 1.24.22.1: #i57457# warning-free code (unxlngi6/.pro + unxsoli4.pro) 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.24&r2=1.25 Delta lines: +8 -8 ------------------- --- indexdialog.cxx 5 Jan 2006 18:01:55 -0000 1.24 +++ indexdialog.cxx 20 Jun 2006 03:08:17 -0000 1.25 @@ -444,8 +444,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 @@ -497,7 +496,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 { @@ -561,8 +559,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(); @@ -602,7 +602,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnIndexAction, ToolBox*, /*NOTINTERESTEDIN*/ ) { sal_uInt16 nClicked = m_aActions.GetCurItemId(); switch (nClicked) @@ -627,7 +627,7 @@ } //------------------------------------------------------------------ - IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, NOTINTERESTEDIN ) + IMPL_LINK( DbaIndexDialog, OnCloseDialog, void*, /*NOTINTERESTEDIN*/ ) { if (m_aIndexes.IsEditingActive()) { @@ -809,7 +809,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()); @@ -851,7 +851,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]
