Kaydet (Commit) bd1e5791 authored tarafından karth's avatar karth Kaydeden (comit) Tor Lillqvist

Resolves fdo#62673 Table cells non-editable on cell merge

Change-Id: I2d9244115d08e31b46dbe1a4998e6a763ee38361
Reviewed-on: https://gerrit.libreoffice.org/3273Reviewed-by: 's avatarTor Lillqvist <tml@iki.fi>
Tested-by: 's avatarTor Lillqvist <tml@iki.fi>
üst c31824af
......@@ -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;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment