summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Hung <marklh9@gmail.com>2017-04-10 21:28:35 +0800
committerMark Hung <marklh9@gmail.com>2017-04-11 14:02:35 +0200
commitb0459b45f431490b8fcf94ecc6b01365efe0a11e (patch)
tree33487d600098a2d8611ca9298cb6a773768c5eee
parentec25d34fa3ac900950ff24fcb224f7e827352803 (diff)
tdf#107057 revert the logic of SwFrame::PaintArea
It seems that getting the minimum of all the bottom the window doesn't work when there are merged cells. This reverts commit b13a0a27444ffbf9ef45cb16ad69fdff0dc64306. Change-Id: I39a22a477874794912e44d4f56c2de27bc5e7179 Reviewed-on: https://gerrit.libreoffice.org/36382 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Mark Hung <marklh9@gmail.com>
-rw-r--r--sw/source/core/layout/ssfrm.cxx5
1 files changed, 0 insertions, 5 deletions
diff --git a/sw/source/core/layout/ssfrm.cxx b/sw/source/core/layout/ssfrm.cxx
index fa2e5673ea49..2a4fd7421347 100644
--- a/sw/source/core/layout/ssfrm.cxx
+++ b/sw/source/core/layout/ssfrm.cxx
@@ -562,7 +562,6 @@ const SwRect SwFrame::PaintArea() const
SwRectFn fnRect = bVert ? ( IsVertLR() ? fnRectVertL2R : fnRectVert ) : fnRectHori;
long nRight = (aRect.*fnRect->fnGetRight)();
long nLeft = (aRect.*fnRect->fnGetLeft)();
- long nBottom = (aRect.*fnRect->fnGetBottom)();
const SwFrame* pTmp = this;
bool bLeft = true;
bool bRight = true;
@@ -574,7 +573,6 @@ const SwRect SwFrame::PaintArea() const
nRowSpan = static_cast<const SwCellFrame*>(pTmp)->GetTabBox()->getRowSpan();
long nTmpRight = (pTmp->Frame().*fnRect->fnGetRight)();
long nTmpLeft = (pTmp->Frame().*fnRect->fnGetLeft)();
- long nTmpBottom = (pTmp->Frame().*fnRect->fnGetBottom)();
if( pTmp->IsRowFrame() && nRowSpan > 1 )
{
const SwFrame* pNxt = pTmp;
@@ -590,8 +588,6 @@ const SwRect SwFrame::PaintArea() const
pTmp->IsCellFrame() || pTmp->IsRowFrame() || //nobody leaves a table!
pTmp->IsRootFrame() )
{
- if( nTmpBottom < nBottom )
- nBottom = nTmpBottom;
if( bLeft || nLeft < nTmpLeft )
nLeft = nTmpLeft;
if( bRight || nTmpRight < nRight )
@@ -644,7 +640,6 @@ const SwRect SwFrame::PaintArea() const
}
(aRect.*fnRect->fnSetLeft)( nLeft );
(aRect.*fnRect->fnSetRight)( nRight );
- (aRect.*fnRect->fnSetBottom)( nBottom );
return aRect;
}