sw/source/core/layout/paintfrm.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 2a15e5839c399b312a53da80c983503368a8ac47
Author: László Németh <nem...@numbertext.org>
AuthorDate: Mon Jun 3 16:27:55 2024 +0200
Commit: Adolfo Jayme Barrientos <fit...@ubuntu.com>
CommitDate: Fri Jun 14 19:26:22 2024 +0200
tdf#77388 sw: fix missing table border at cropped images
At images cropped by the bottom or right cell boundaries,
or at images with zero padding in table cells (e.g, in
test document of tdf#160836), table borders were hovered
by the image, resulting missing table borders.
First paint the cell content, and after that the DOCX-like
"collapsing" cell borders in SwTabFrame::PaintSwFrame.
Note: this doesn't modify painting of the objects
anchored to characters (which still hovers the cell borders),
and painting of the text content of the cells (which are
still hovered by the cell borders at zero padding, despite
their non-transparent background color).
Change-Id: Ie41ab275fd101bb9e26d4165362063f0332ac3c4
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168384
Tested-by: Jenkins
Reviewed-by: László Németh <nem...@numbertext.org>
(cherry picked from commit 03aa8a1d9bfe4af2f37df0bde42193c2cf90ffb4)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/168320
Reviewed-by: Adolfo Jayme Barrientos <fit...@ubuntu.com>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 5472695e9732..2375fae0db3c 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -4645,6 +4645,8 @@ void SwTabFrame::PaintSwFrame(vcl::RenderContext&
rRenderContext, SwRect const&
const SwViewOption* pViewOption = gProp.pSGlobalShell->GetViewOptions();
if (pViewOption->IsTable())
{
+ SwLayoutFrame::PaintSwFrame( rRenderContext, rRect );
+
// #i29550#
if ( IsCollapsingBorders() )
{
@@ -4662,8 +4664,6 @@ void SwTabFrame::PaintSwFrame(vcl::RenderContext&
rRenderContext, SwRect const&
SwTabFramePainter aHelper(*this);
aHelper.PaintLines(rRenderContext, rRect);
}
-
- SwLayoutFrame::PaintSwFrame( rRenderContext, rRect );
}
// #i6467# - no light grey rectangle for page preview
else if ( gProp.pSGlobalShell->GetWin() &&
!gProp.pSGlobalShell->IsPreview() )
