[Libreoffice-commits] core.git: svx/source

[karth]

 svx/source/table/svdotable.cxx |   12 ++++++++++++
 1 file changed, 12 insertions(+)

New commits:
commit bd1e5791951c0e8eae6e79f1789ba1115cdead53
Author: karth <karthikeyan at kacst.edu.sa>
Date:   Thu Apr 25 22:28:16 2013 +0530

    Resolves fdo#62673 Table cells non-editable on cell merge
    
    Change-Id: I2d9244115d08e31b46dbe1a4998e6a763ee38361
    Reviewed-on: https://gerrit.libreoffice.org/3273
    Reviewed-by: Tor Lillqvist <tml at iki.fi>
    Tested-by: Tor Lillqvist <tml at iki.fi>

diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx
index 3717e46..a9a7030 100644
--- a/svx/source/table/svdotable.cxx
+++ b/svx/source/table/svdotable.cxx
@@ -1144,6 +1144,18 @@ TableHitKind SdrTableObj::CheckTableHit( const Point& rPos, sal_Int32& rnX, sal_
     if( xCell.is() )
     {
         nX += mpImpl->mpLayouter->getColumnWidth( rnX );
+        //Fix for fdo#62673 : non-editable cell in table on cell merge
+        sal_Int32 i=0;
+        while(xCell.is() && xCell->isMerged())
+        {
+            nX += mpImpl->mpLayouter->getColumnWidth( rnX+i );
+            i++;
+            if(rnX+i < nColCount)
+                xCell=mpImpl->getCell( CellPos( rnX+i, rnY) );
+            else
+                break;
+        }
+
         if( nX < xCell->GetTextLeftDistance() )
             return SDRTABLEHIT_CELL;
     }