From 906cce25456604d1eeac723c3862168797ab8f48 Mon Sep 17 00:00:00 2001 From: Norbert Thiebaud Date: Mon, 3 Sep 2012 19:27:48 -0500 Subject: gridfixes: impl_getColumnForOrdinate:no need to subs m_nRowHeaderWidthPixel m_aColumnWidths already contains it Change-Id: I404c58fb0b32db7b7b7bf60be997f81709908ceb Reviewed-on: https://gerrit.libreoffice.org/556 Reviewed-by: Miklos Vajna Tested-by: Miklos Vajna --- svtools/source/table/tablecontrol_impl.cxx | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'svtools/source/table') diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx index 26ee5d00a298..da7adb401538 100644 --- a/svtools/source/table/tablecontrol_impl.cxx +++ b/svtools/source/table/tablecontrol_impl.cxx @@ -2491,18 +2491,16 @@ namespace svt { namespace table if ( i_ordinate < m_nRowHeaderWidthPixel ) return COL_ROW_HEADERS; - long const ordinate = i_ordinate - m_nRowHeaderWidthPixel; - ColumnPositions::const_iterator lowerBound = ::std::lower_bound( m_aColumnWidths.begin(), m_aColumnWidths.end(), - MutableColumnMetrics(ordinate+1, ordinate+1), + MutableColumnMetrics(i_ordinate+1, i_ordinate+1), ColumnInfoPositionLess() ); if ( lowerBound == m_aColumnWidths.end() ) { // point is *behind* the start of the last column ... - if ( ordinate < m_aColumnWidths.rbegin()->getEnd() ) + if ( i_ordinate < m_aColumnWidths.rbegin()->getEnd() ) // ... but still before its end return m_nColumnCount - 1; return COL_INVALID; -- cgit