sw/source/core/inc/flyfrm.hxx | 1 +
sw/source/core/layout/tabfrm.cxx | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
New commits:
commit 8f9bbeb5618060504ed77ad7f05c45f4b00abc6d
Author: Michael Stahl <michael.st...@cib.de>
AuthorDate: Fri Nov 13 11:07:06 2020 +0100
Commit: Michael Stahl <michael.st...@cib.de>
CommitDate: Mon Nov 16 11:00:15 2020 +0100
sw: fix misleading comments - SwFlyFrame::m_bAtCnt is set...
... for both AT_PARA and AT_CHAR.
Change-Id: I13a9c9cc6f4c45b08bf178336826a37126055b3f
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/105808
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.st...@cib.de>
diff --git a/sw/source/core/inc/flyfrm.hxx b/sw/source/core/inc/flyfrm.hxx
index 464eadd7ec02..fec9a4936e5b 100644
--- a/sw/source/core/inc/flyfrm.hxx
+++ b/sw/source/core/inc/flyfrm.hxx
@@ -108,6 +108,7 @@ protected:
bool m_bInCnt :1; ///< RndStdIds::FLY_AS_CHAR, anchored as character
bool m_bAtCnt :1; ///< RndStdIds::FLY_AT_PARA, anchored at paragraph
+ ///< or RndStdIds::FLY_AT_CHAR
bool m_bLayout :1; ///< RndStdIds::FLY_AT_PAGE,
RndStdIds::FLY_AT_FLY, at page or at frame
bool m_bAutoPosition :1; ///< RndStdIds::FLY_AT_CHAR, anchored at character
diff --git a/sw/source/core/layout/tabfrm.cxx b/sw/source/core/layout/tabfrm.cxx
index 619afa8ba8a0..663db1974eb1 100644
--- a/sw/source/core/layout/tabfrm.cxx
+++ b/sw/source/core/layout/tabfrm.cxx
@@ -2770,7 +2770,7 @@ bool SwTabFrame::CalcFlyOffsets( SwTwips& rUpper,
// #i46807# - do not consider invalid
// Writer fly frames.
(pFly->isFrameAreaDefinitionValid() ||
bAddVerticalFlyOffsets) &&
- // fly anchored at character
+ // fly anchored at character or at paragraph
pFly->IsFlyAtContentFrame() &&
// fly overlaps with corresponding table rectangle
aFlyRect.IsOver( aRect ) &&
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
