Tag: cws_src680_oj14 User: oj Date: 2006/07/04 00:59:38 Modified: dba/dbaccess/source/ui/dlg/indexfieldscontrol.cxx
Log: RESYNC: (1.14-1.15); FILE MERGED File Changes: Directory: /dba/dbaccess/source/ui/dlg/ ======================================= File [changed]: indexfieldscontrol.cxx Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/dlg/indexfieldscontrol.cxx?r1=1.14.4.3&r2=1.14.4.4 Delta lines: +9 -9 ------------------- --- indexfieldscontrol.cxx 25 Apr 2006 13:03:00 -0000 1.14.4.3 +++ indexfieldscontrol.cxx 4 Jul 2006 07:59:35 -0000 1.14.4.4 @@ -417,7 +417,7 @@ } //------------------------------------------------------------------ - void IndexFieldsControl::InitController(CellControllerRef& _rController, long _nRow, sal_uInt16 _nColumnId) + void IndexFieldsControl::InitController(CellControllerRef& /*_rController*/, long _nRow, sal_uInt16 _nColumnId) { ConstIndexFieldsIterator aFieldDescription; sal_Bool bNewField = !implGetFieldDesc(_nRow, aFieldDescription); @@ -451,18 +451,18 @@ { // and we're in one of the last two rows String sSelectedEntry = m_pFieldNameCell->GetSelectEntry(); sal_Int32 nCurrentRow = GetCurRow(); - sal_Int32 nRowCount = GetRowCount(); + sal_Int32 rowCount = GetRowCount(); - OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == nRowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!"); + OSL_ENSURE(((sal_Int32)(m_aFields.size() + 1)) == rowCount, "IndexFieldsControl::OnListEntrySelected: inconsistence!"); - if (sSelectedEntry.Len() && (nCurrentRow == nRowCount - 1) /*&& (!m_nMaxColumnsInIndex || nRowCount < m_nMaxColumnsInIndex )*/ ) + if (sSelectedEntry.Len() && (nCurrentRow == rowCount - 1) /*&& (!m_nMaxColumnsInIndex || rowCount < m_nMaxColumnsInIndex )*/ ) { // in the last row, an non-empty string has been selected // -> insert a new row m_aFields.push_back(OIndexField()); RowInserted(GetRowCount(), 1); Invalidate(GetRowRectPixel(nCurrentRow)); } - else if (!sSelectedEntry.Len() && (nCurrentRow == nRowCount - 2)) + else if (!sSelectedEntry.Len() && (nCurrentRow == rowCount - 2)) { // in the (last-1)th row, an empty entry has been selected // -> remove the last row m_aFields.erase(m_aFields.end() - 1); @@ -507,7 +507,7 @@ return String(); } //------------------------------------------------------------------ - sal_Bool IndexFieldsControl::IsTabAllowed(sal_Bool bForward) const + sal_Bool IndexFieldsControl::IsTabAllowed(sal_Bool /*bForward*/) const { return sal_False; } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
