tdf#128399 sw btlr: fix clicking to lower rotated cell
In case a table has more than 1 btlr cells in multiple rows, the first
captured the mouse.
This was because SwFrame::GetPaintArea() assumed that left and right
edges can be compared directly, without going via the SwRectFnSet
abstraction. This works for hozizontal and plain vertical directions,
but not for btlr.
(cherry picked from commit 435ab51ec8920033b7865f27f4afee8a852a0b31)
Conflicts:
sw/qa/extras/layout/layout.cxx
Change-Id: Ia3bd7623a5d8d9ad3bdfabceb10adc0dbf105059
Reviewed-on: https://gerrit.libreoffice.org/81733
Tested-by: Jenkins
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
diff --git a/sw/qa/extras/layout/data/tdf128399.docx b/sw/qa/extras/layout/data/tdf128399.docx
new file mode 100644
index 0000000..04e1424
--- /dev/null
+++ b/sw/qa/extras/layout/data/tdf128399.docx
Binary files differ
diff --git a/sw/qa/extras/layout/layout.cxx b/sw/qa/extras/layout/layout.cxx
index c4dacb04..8404cac 100644
--- a/sw/qa/extras/layout/layout.cxx
+++ b/sw/qa/extras/layout/layout.cxx
@@ -3208,6 +3208,33 @@ CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf124770)
assertXPath(pXmlDoc, "/root/page/body/txt[1]/LineBreak", 1);
}
CPPUNIT_TEST_FIXTURE(SwLayoutWriter, testTdf128399)
{
SwDoc* pDoc = createDoc("tdf128399.docx");
SwRootFrame* pLayout = pDoc->getIDocumentLayoutAccess().GetCurrentLayout();
SwFrame* pPage = pLayout->GetLower();
SwFrame* pBody = pPage->GetLower();
SwFrame* pTable = pBody->GetLower();
SwFrame* pRow1 = pTable->GetLower();
SwFrame* pRow2 = pRow1->GetNext();
const SwRect& rRow2Rect = pRow2->getFrameArea();
Point aPoint = rRow2Rect.Center();
SwWrtShell* pWrtShell = pDoc->GetDocShell()->GetWrtShell();
SwPosition aPosition = *pWrtShell->GetCursor()->Start();
SwPosition aFirstRow(aPosition);
SwCursorMoveState aState(MV_NONE);
pLayout->GetCursorOfst(&aPosition, aPoint, &aState);
// Second row is +3: end node, start node and the first text node in the 2nd row.
sal_uLong nExpected = aFirstRow.nNode.GetIndex() + 3;
// Without the accompanying fix in place, this test would have failed with:
// - Expected: 14
// - Actual : 11
// i.e. clicking on the center of the 2nd row placed the cursor in the 1st row.
CPPUNIT_ASSERT_EQUAL(nExpected, aPosition.nNode.GetIndex());
}
CPPUNIT_PLUGIN_IMPLEMENT();
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index 8ff4732..90b5e29 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -623,6 +623,7 @@ const SwRect SwFrame::GetPaintArea() const
SwRect aRect = IsRowFrame() ? GetUpper()->getFrameArea() : getFrameArea();
const bool bVert = IsVertical();
SwRectFn fnRect = bVert ? ( IsVertLR() ? (IsVertLRBT() ? fnRectVertL2RB2T : fnRectVertL2R) : fnRectVert ) : fnRectHori;
SwRectFnSet aRectFnSet(this);
long nRight = (aRect.*fnRect->fnGetRight)();
long nLeft = (aRect.*fnRect->fnGetLeft)();
const SwFrame* pTmp = this;
@@ -651,9 +652,9 @@ const SwRect SwFrame::GetPaintArea() const
pTmp->IsCellFrame() || pTmp->IsRowFrame() || //nobody leaves a table!
pTmp->IsRootFrame() )
{
if( bLeft || nLeft < nTmpLeft )
if( bLeft || aRectFnSet.XDiff(nTmpLeft, nLeft) > 0 )
nLeft = nTmpLeft;
if( bRight || nTmpRight < nRight )
if( bRight || aRectFnSet.XDiff(nRight, nTmpRight) > 0 )
nRight = nTmpRight;
if( pTmp->IsPageFrame() || pTmp->IsFlyFrame() || pTmp->IsRootFrame() )
break;
@@ -666,14 +667,14 @@ const SwRect SwFrame::GetPaintArea() const
// the first column has _no_ influence to the left range
if( bR2L ? pTmp->GetNext() : pTmp->GetPrev() )
{
if( bLeft || nLeft < nTmpLeft )
if( bLeft || aRectFnSet.XDiff(nTmpLeft, nLeft) > 0 )
nLeft = nTmpLeft;
bLeft = false;
}
// the last column has _no_ influence to the right range
if( bR2L ? pTmp->GetPrev() : pTmp->GetNext() )
{
if( bRight || nTmpRight < nRight )
if( bRight || aRectFnSet.XDiff(nRight, nTmpRight) > 0 )
nRight = nTmpRight;
bRight = false;
}
@@ -686,14 +687,14 @@ const SwRect SwFrame::GetPaintArea() const
// the next frame of a body frame may be a footnotecontainer or
// a footer. The footnotecontainer has the same direction like
// the body frame.
if( pTmp->GetPrev() && ( bLeft || nLeft < nTmpLeft ) )
if( pTmp->GetPrev() && ( bLeft || aRectFnSet.XDiff(nTmpLeft, nLeft) > 0 ) )
{
nLeft = nTmpLeft;
bLeft = false;
}
if( pTmp->GetNext() &&
( pTmp->GetNext()->IsFooterFrame() || pTmp->GetNext()->GetNext() )
&& ( bRight || nTmpRight < nRight ) )
&& ( bRight || aRectFnSet.XDiff(nRight, nTmpRight) > 0 ) )
{
nRight = nTmpRight;
bRight = false;
