sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e6a5fa797333ebc526a5ff75e8ec866f3e1cf95c
Author: Justin Luth <jl...@mail.com>
AuthorDate: Wed Aug 7 20:41:04 2024 -0400
Commit: Justin Luth <jl...@mail.com>
CommitDate: Sat Aug 17 23:05:28 2024 +0200
tdf#162304 layoutInCell: native ODT handling from top of PRINT_AREA
Making ODF work the same way that MSO does.
Since this was the intention all along,
I'm not going to bother with a compat flag
for older documents.
It is highly unlikely that a native ODF user would have all these:
-turned on follow text flow
-used "page text area" when trying to orient from top of cell
(more likely to use "entire page" if they do associate page<->cell.
-set a larger border spacing (since default is a miniscule 0.05cm).
-this code-path is only in effect with FROM_TOP,
an unlikely combination with "page text area".
Change-Id: I979e6e0526102004c56285db6e7479c0ff6d660e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/171610
Tested-by: Jenkins
Reviewed-by: Justin Luth <jl...@mail.com>
diff --git a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
index 710adff493eb..71b062232907 100644
--- a/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
+++ b/sw/source/core/objectpositioning/tocntntanchoredobjectposition.cxx
@@ -609,7 +609,7 @@ void SwToContentAnchoredObjectPosition::CalcPosition()
aRectFnSet.GetTop(aPgPrtRect),
nTopOfOrient );
- if (bMSOLayoutInCell && rPageAlignLayFrame.IsCellFrame())
+ if (rPageAlignLayFrame.IsCellFrame())
{
// Cell upper/lower comes from the max margin of the
entire row of cells
const auto pRow =
const_cast<SwLayoutFrame&>(rPageAlignLayFrame).FindRowFrame();
