sw/source/core/layout/paintfrm.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit d5fcc8ea25e416a4d2bea5e0f92c0e403997d845
Author: Michael Stahl <michael.st...@allotropia.de>
AuthorDate: Wed Oct 2 18:51:44 2024 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Oct 2 21:27:13 2024 +0200
tdf#163032 sw: fix painting of row frame with rowspan > 1 cell
Super non intuitive representation of a rowspan > 1 cell split across
pages is that the follow frame will be in a row that's 0 height, but its
own height extends to the bottom of the following merged rows.
(regression from commit 13495926390ba54fbcd45ec00fbe613b1f2b734b)
Change-Id: I0e32477613ceb5b6dbcc590bf70e0b5fc62a5d0a
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/174399
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index e6088c22a778..5cad611eab7e 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -3718,8 +3718,8 @@ SwShortCut::SwShortCut( const SwFrame& rFrame, const
SwRect& rRect )
void SwLayoutFrame::PaintSwFrame(vcl::RenderContext& rRenderContext, SwRect
const& rRect, PaintFrameMode ePaintFrameMode) const
{
- if (!getFramePrintArea().HasArea())
- {
+ if (!getFramePrintArea().HasArea() && !IsRowFrame())
+ { // tdf#163032 row frame may contain rowspan>1 cell that must be painted
return; // do not paint hidden frame
}
