sw/source/core/layout/paintfrm.cxx | 19 ++++++-------------
1 file changed, 6 insertions(+), 13 deletions(-)
New commits:
commit 1a5b1552d8cee042466fc4c4ae5383c0ffbeb194
Author: Heiko Tietze <tietze.he...@gmail.com>
AuthorDate: Wed Oct 30 16:59:51 2024 +0100
Commit: Heiko Tietze <heiko.tie...@documentfoundation.org>
CommitDate: Thu Oct 31 16:14:56 2024 +0100
Resolves tdf#163537 && tdf#131253 - Make Boundaries independent from NPC
Sections and Objects are now toggled on/off independently from Text
Boundaries. Both, single and multi-column sections receive a frame
(multi-column in addition one for text boundaries).
Partially resolves 5bf7df62645f73ad69772f318ea3058dfd6fce12ommit.
Change-Id: I6d43f936c3d2e1c454fdc39f1bbbb2c6f7bef3e7
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/175832
Tested-by: Jenkins
Reviewed-by: Heiko Tietze <heiko.tie...@documentfoundation.org>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index a69ebc64ff4a..9c3fcf77eec8 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7099,9 +7099,10 @@ void SwPageFrame::RefreshSubsidiary( const SwRect &rRect
) const
void SwLayoutFrame::RefreshLaySubsidiary( const SwPageFrame *pPage,
const SwRect &rRect ) const
{
- const bool bSubsOpt
- = isSubsidiaryLinesEnabled() || (IsSctFrame() &&
isSubsidiaryLinesForSectionsEnabled());
- if ( bSubsOpt )
+ const bool bSubsOpt = isSubsidiaryLinesEnabled()
+ || (IsSctFrame() &&
isSubsidiaryLinesForSectionsEnabled())
+ || (IsFlyFrame() && isSubsidiaryLinesFlysEnabled());
+ if (bSubsOpt)
PaintSubsidiaryLines( pPage, rRect );
const SwFrame *pLow = Lower();
@@ -7482,11 +7483,7 @@ void SwSectionFrame::PaintSubsidiaryLines( const
SwPageFrame * pPage,
if (!gProp.pSGlobalShell->GetViewOptions()->IsSectionBoundaries())
return;
- const bool bNoLowerColumn = !Lower() || !Lower()->IsColumnFrame();
- if ( bNoLowerColumn )
- {
- SwLayoutFrame::PaintSubsidiaryLines( pPage, rRect );
- }
+ SwLayoutFrame::PaintSubsidiaryLines( pPage, rRect );
}
/**
@@ -7578,11 +7575,7 @@ void SwLayoutFrame::PaintSubsidiaryLines( const
SwPageFrame *pPage,
if (!bCell && IsFlyFrame())
{
- // particularly with images (but also plausible for any kind of frame),
- // it is very disconcerting to see a fake border,
- // so (just like the page boundary) only show fly "text boundaries"
- // when "Show Formatting Marks" is turned on
- if (!gProp.pSGlobalShell->GetViewOptions()->IsViewMetaChars())
+ if (!gProp.pSGlobalShell->GetViewOptions()->IsObjectBoundaries())
return;
// if the frame is wrap none or wrap through, then text boundary lines
have no meaning
