[Libreoffice-commits] .: svtools/source

[Libreoffice Gerrit user]

 svtools/source/table/tablecontrol_impl.cxx |    6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

New commits:
commit 906cce25456604d1eeac723c3862168797ab8f48
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Mon Sep 3 19:27:48 2012 -0500

    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 <vmiklos at suse.cz>
    Tested-by: Miklos Vajna <vmiklos at suse.cz>

diff --git a/svtools/source/table/tablecontrol_impl.cxx b/svtools/source/table/tablecontrol_impl.cxx
index 26ee5d0..da7adb4 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;