diff options
| author | Justin Luth <justin.luth@collabora.com> | 2021-09-20 15:25:01 +0200 |
|---|---|---|
| committer | Justin Luth <justin_luth@sil.org> | 2021-09-20 18:46:33 +0200 |
| commit | eb830ad284f245165b6ab5e8647d48834622f2d5 (patch) | |
| tree | aaf7764f93d04bddf5672c8b4bb24c753102667a /sw | |
| parent | 85b4b15bb02f8d2fdbead0c836763621096b995e (diff) | |
Revert "tdf#99492 sw layout: always paint merged cell grids"
This reverts LO 7.1 commit c016fe2b5918d6e53113e100b1126076b6e1a6a3.
This failed for two reasons.
1.) If it is not a solid color (like a graphic for example)
then the graphic is going to be repeated in each cell.
2.) This is NOT actually repainting the visible cell's background.
It is painting the hidden cell - which MIGHT be different
from the visible cell (in the case of a solid color).
Since this will require a completely different approach,
I am just reverting this. Thanks Mike for finding an
example document that shows the flaws.
Change-Id: Icdc21e09118e7c33ac9f7ede23c913b95ad69c93
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122366
Tested-by: Jenkins
Reviewed-by: Justin Luth <justin_luth@sil.org>
Diffstat (limited to 'sw')
| -rw-r--r-- | sw/source/core/layout/paintfrm.cxx | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sw/source/core/layout/paintfrm.cxx b/sw/source/core/layout/paintfrm.cxx index 59b6922ddc04..1ff9e4eda7db 100644 --- a/sw/source/core/layout/paintfrm.cxx +++ b/sw/source/core/layout/paintfrm.cxx @@ -6295,6 +6295,10 @@ void SwFrame::PaintSwFrameBackground( const SwRect &rRect, const SwPageFrame *pP return; } + // nothing to do for covered table cells: + if( IsCellFrame() && IsCoveredCell() ) + return; + SwViewShell *pSh = gProp.pSGlobalShell; // #i16816# tagged pdf support |