sw/source/core/layout/paintfrm.cxx | 22 ----------------------
1 file changed, 22 deletions(-)
New commits:
commit cfa763a408366d84a49285fe312409945a7d33a2
Author: Justin Luth <jl...@mail.com>
AuthorDate: Thu Nov 7 09:59:20 2024 -0500
Commit: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
CommitDate: Fri Nov 8 14:23:27 2024 +0100
tdf#163537 Revert "tdf#131253 sw: draw frame text boundary
... on when show formatting marks"
This reverts my 24.8 commit 5bf7df62645f73ad69772f318ea3058dfd6fce12.
Bug 163537 explains that frames with content should always
show the text boundaries - which would be easy to fix.
However, 25.2 is making major changes to the way
text boundaries and show formatting marks interact,
so instead of having 24.8 contain some interim change,
just revert altogether and let it all play out in master.
Change-Id: Ie84daeae31979728c28327a4e88f46fb799b2167
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176241
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
(cherry picked from commit 12fa0ecad4c9182c811236e8d90782741a21625a)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/176225
Tested-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Reviewed-by: Xisco Fauli <xiscofa...@libreoffice.org>
Reviewed-by: Michael Stahl <michael.st...@allotropia.de>
Reviewed-by: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 966748d7302c..6fdbe66cf2da 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -7573,28 +7573,6 @@ void SwLayoutFrame::PaintSubsidiaryLines( const
SwPageFrame *pPage,
const bool bFlys = pPage->GetSortedObjs() != nullptr;
const bool bCell = IsCellFrame();
-
- 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())
- return;
-
- // if the frame is wrap none or wrap through, then text boundary lines
have no meaning
- // (unless the frame itself contains text)
- const text::WrapTextMode aSurround =
GetFormat()->GetSurround().GetSurround();
- if (GetFormat()->GetAnchor().GetAnchorId() != RndStdIds::FLY_AS_CHAR
- && (!Lower() || !Lower()->IsTextFrame())
- && (aSurround == text::WrapTextMode::WrapTextMode_THROUGH
- || aSurround == text::WrapTextMode::WrapTextMode_NONE))
- {
- return;
- }
- }
-
// #i3662# - use frame area for cells for section use also frame area
const bool bUseFrameArea = bCell || IsSctFrame();
SwRect aOriginal( bUseFrameArea ? getFrameArea() : getFramePrintArea() );
