diff options
| author | karth <karthikeyan@kacst.edu.sa> | 2013-04-25 22:28:16 +0530 |
|---|---|---|
| committer | Tor Lillqvist <tml@iki.fi> | 2013-04-26 07:46:12 +0000 |
| commit | bd1e5791951c0e8eae6e79f1789ba1115cdead53 (patch) | |
| tree | dc0edbba98d8591f43b5d41864d865da4f32ad95 /svx | |
| parent | c31824afc633c24b03c9f6f84b582c5a2ded51de (diff) | |
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@iki.fi>
Tested-by: Tor Lillqvist <tml@iki.fi>
Diffstat (limited to 'svx')
| -rw-r--r-- | svx/source/table/svdotable.cxx | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/svx/source/table/svdotable.cxx b/svx/source/table/svdotable.cxx index 3717e46855b4..a9a7030cef3d 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; } |