sw/source/core/access/accmap.cxx | 6 ++----
sw/source/core/frmedt/fews.cxx | 2 +-
sw/source/core/inc/frame.hxx | 16 ++++++++--------
sw/source/core/layout/flylay.cxx | 6 +++---
sw/source/core/layout/frmtool.cxx | 10 +++++-----
sw/source/core/layout/ftnfrm.cxx | 4 ++--
sw/source/core/layout/pagechg.cxx | 4 ++--
sw/source/core/layout/paintfrm.cxx | 2 +-
sw/source/core/layout/wsfrm.cxx | 4 ++--
sw/source/core/text/EnhancedPDFExportHelper.cxx | 4 ++--
10 files changed, 28 insertions(+), 30 deletions(-)
New commits:
commit a6e4b89746fd778aeed3133a772b0487f8a05684
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 24 13:10:30 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 25 07:30:55 2025 +0200
sw a11y: Drop commented out code
This is unused for a long time, and
SwAccessibleMap::mnFootnote and SwAccessibleMap::mnEndnote
were finally dropped altoegether in
commit 4ae2c3c3dc0be4b511ab07b6f9bd1806f2789725
Date: Mon Dec 2 13:08:09 2013 +0200
WaE: unused private fields
Change-Id: I2084fa7cc0af9385b532c6beab0368bc2e45e29e
Change-Id: Ib6b5a9b37e8f70547f8c1fc7098a146f16b65d99
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184578
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 5a4f78b66988..b3a873e9b2d9 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1695,9 +1695,7 @@ rtl::Reference<SwAccessibleContext>
SwAccessibleMap::GetContextImpl(const SwFram
static_cast < const SwFootnoteFrame * >( pFrame );
bool bIsEndnote =
SwAccessibleFootnote::IsEndnote( pFootnoteFrame );
- xAcc = new SwAccessibleFootnote(shared_from_this(), bIsEndnote,
- /*(bIsEndnote ? mnEndnote++ : mnFootnote++),*/
- pFootnoteFrame );
+ xAcc = new SwAccessibleFootnote(shared_from_this(), bIsEndnote,
pFootnoteFrame);
}
break;
case SwFrameType::Fly:
commit 441e51dcfdcf7263cc945928bc4da24211c44bea
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Thu Apr 24 13:03:23 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 25 07:30:46 2025 +0200
sw: Rename SwFrameType::Ftn -> Footnote, FtnCont -> FootnoteContainer
Afford a few more characters to make this less
cryptic.
"FtnCont" means "FootnoteContainer", not "FootnoteContent",
see the documentation of class SwFootnoteContFrame:
// There exists a special container frame on a page for footnotes. It's
called
// SwFootnoteContFrame. Each footnote is separated by a SwFootnoteFrame
which contains
// the text frames of a footnote. SwFootnoteFrame can be split and will
then
// continue on another page.
class SwFootnoteContFrame final : public SwLayoutFrame
Change-Id: Ia8f9bf8cdf121e2172697ac292ac0b2bc43e59ff
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184577
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.gran...@collabora.co.uk>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 22318f4c7c84..5a4f78b66988 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1689,7 +1689,7 @@ rtl::Reference<SwAccessibleContext>
SwAccessibleMap::GetContextImpl(const SwFram
xAcc = new SwAccessibleHeaderFooter(shared_from_this(),
static_cast< const SwFooterFrame *>( pFrame ) );
break;
- case SwFrameType::Ftn:
+ case SwFrameType::Footnote:
{
const SwFootnoteFrame *pFootnoteFrame =
static_cast < const SwFootnoteFrame * >( pFrame );
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 31ea0a83157f..90d93f5a1004 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -280,7 +280,7 @@ FrameTypeFlags SwFEShell::GetFrameType( const Point *pPt,
bool bStopAtFly ) cons
if( pFrame->GetUpper()->IsPageFrame() ) // not for ColumnFrames
nReturn |= FrameTypeFlags::BODY;
break;
- case SwFrameType::Ftn:
+ case SwFrameType::Footnote:
nReturn |= FrameTypeFlags::FOOTNOTE;
break;
case SwFrameType::Fly:
diff --git a/sw/source/core/inc/frame.hxx b/sw/source/core/inc/frame.hxx
index df6adf0a5e38..24d7bb03a4d3 100644
--- a/sw/source/core/inc/frame.hxx
+++ b/sw/source/core/inc/frame.hxx
@@ -81,8 +81,8 @@ enum class SwFrameType
Column = 0x0004,
Header = 0x0008,
Footer = 0x0010,
- FtnCont = 0x0020,
- Ftn = 0x0040,
+ FootnoteContainer = 0x0020,
+ Footnote = 0x0040,
Body = 0x0080,
Fly = 0x0100,
Section = 0x0200,
@@ -104,11 +104,11 @@ namespace o3tl
#define FRM_ALL SwFrameType(0xfbff)
#define FRM_CNTNT (SwFrameType::Txt | SwFrameType::NoTxt)
#define FRM_FTNBOSS (SwFrameType::Page | SwFrameType::Column)
-#define FRM_ACCESSIBLE (SwFrameType::Root | SwFrameType::Page |
SwFrameType::Header | SwFrameType::Footer | SwFrameType::Ftn | SwFrameType::Fly
| SwFrameType::Tab | SwFrameType::Cell | SwFrameType::Txt)
+#define FRM_ACCESSIBLE (SwFrameType::Root | SwFrameType::Page |
SwFrameType::Header | SwFrameType::Footer | SwFrameType::Footnote |
SwFrameType::Fly | SwFrameType::Tab | SwFrameType::Cell | SwFrameType::Txt)
#define FRM_NEIGHBOUR (SwFrameType::Column | SwFrameType::Cell)
-#define FRM_NOTE_VERT (SwFrameType::FtnCont | SwFrameType::Ftn |
SwFrameType::Section | SwFrameType::Tab | SwFrameType::Row | SwFrameType::Cell
| SwFrameType::Txt)
+#define FRM_NOTE_VERT (SwFrameType::FootnoteContainer |
SwFrameType::Footnote | SwFrameType::Section | SwFrameType::Tab |
SwFrameType::Row | SwFrameType::Cell | SwFrameType::Txt)
#define FRM_HEADFOOT (SwFrameType::Header | SwFrameType::Footer)
-#define FRM_BODYFTNC (SwFrameType::FtnCont | SwFrameType::Body)
+#define FRM_BODYFTNC (SwFrameType::FootnoteContainer | SwFrameType::Body)
// for GetNextLeaf/GetPrevLeaf.
enum MakePageType
@@ -1237,11 +1237,11 @@ inline bool SwFrame::IsFooterFrame() const
}
inline bool SwFrame::IsFootnoteContFrame() const
{
- return mnFrameType == SwFrameType::FtnCont;
+ return mnFrameType == SwFrameType::FootnoteContainer;
}
inline bool SwFrame::IsFootnoteFrame() const
{
- return mnFrameType == SwFrameType::Ftn;
+ return mnFrameType == SwFrameType::Footnote;
}
inline bool SwFrame::IsBodyFrame() const
{
@@ -1285,7 +1285,7 @@ inline bool SwFrame::IsFlowFrame() const
}
inline bool SwFrame::IsRetoucheFrame() const
{
- return bool(GetType() &
(FRM_CNTNT|SwFrameType::Tab|SwFrameType::Section|SwFrameType::Ftn));
+ return bool(GetType() &
(FRM_CNTNT|SwFrameType::Tab|SwFrameType::Section|SwFrameType::Footnote));
}
inline bool SwFrame::IsAccessibleFrame() const
{
diff --git a/sw/source/core/layout/flylay.cxx b/sw/source/core/layout/flylay.cxx
index fedcef628a2c..3c543fa0030b 100644
--- a/sw/source/core/layout/flylay.cxx
+++ b/sw/source/core/layout/flylay.cxx
@@ -1346,9 +1346,9 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect
&rRect, bool bMove )
const SwFrame *pCell = pUp->IsCellFrame() ? pUp : nullptr;
const SwFrameType nType = bMove
? SwFrameType::Root | SwFrameType::Fly
| SwFrameType::Header |
- SwFrameType::Footer | SwFrameType::Ftn
+ SwFrameType::Footer |
SwFrameType::Footnote
: SwFrameType::Body | SwFrameType::Fly
| SwFrameType::Header |
- SwFrameType::Footer |
SwFrameType::Cell| SwFrameType::Ftn;
+ SwFrameType::Footer |
SwFrameType::Cell| SwFrameType::Footnote;
while ( !(pUp->GetType() & nType) || pUp->IsColBodyFrame() )
{
@@ -1378,7 +1378,7 @@ bool CalcClipRect( const SdrObject *pSdrObj, SwRect
&rRect, bool bMove )
}
else
{
- if( ( pUp->GetType() & (SwFrameType::Fly |
SwFrameType::Ftn ) ) &&
+ if( ( pUp->GetType() & (SwFrameType::Fly |
SwFrameType::Footnote ) ) &&
!pUp->getFrameArea().Contains(
pFly->getFrameArea().Pos() ) )
{
if( pUp->IsFlyFrame() )
diff --git a/sw/source/core/layout/frmtool.cxx
b/sw/source/core/layout/frmtool.cxx
index 94311597f942..d452f26921f5 100644
--- a/sw/source/core/layout/frmtool.cxx
+++ b/sw/source/core/layout/frmtool.cxx
@@ -624,7 +624,7 @@ void SwLayNotify::ImplDestroy()
!(pLay->GetType()&(SwFrameType::Fly|SwFrameType::Section) &&
pLower && pLower->IsColumnFrame()) &&
(bPos || bNotify) &&
- !(pLay->GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FtnCont|SwFrameType::Page|SwFrameType::Root)))
+ !(pLay->GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FootnoteContainer|SwFrameType::Page|SwFrameType::Root)))
{
// #i44016# - force unlock of position of lower objects.
// #i43913# - no unlock of position of objects,
@@ -3670,8 +3670,8 @@ bool Is_Lower_Of(const SwFrame *pCurrFrame, const
SdrObject* pObj)
/// provides the area of a frame in that no Fly from another area can overlap
const SwFrame *FindContext( const SwFrame *pFrame, SwFrameType
nAdditionalContextType )
{
- const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header |
SwFrameType::Footer | SwFrameType::FtnCont |
- SwFrameType::Ftn | SwFrameType::Fly |
+ const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header |
SwFrameType::Footer | SwFrameType::FootnoteContainer |
+ SwFrameType::Footnote | SwFrameType::Fly |
SwFrameType::Tab | SwFrameType::Row |
SwFrameType::Cell |
nAdditionalContextType;
do
@@ -3686,8 +3686,8 @@ bool IsFrameInSameContext( const SwFrame *pInnerFrame,
const SwFrame *pFrame )
{
const SwFrame *pContext = FindContext( pInnerFrame, SwFrameType::None );
- const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header |
SwFrameType::Footer | SwFrameType::FtnCont |
- SwFrameType::Ftn | SwFrameType::Fly |
+ const SwFrameType nTyp = SwFrameType::Root | SwFrameType::Header |
SwFrameType::Footer | SwFrameType::FootnoteContainer |
+ SwFrameType::Footnote | SwFrameType::Fly |
SwFrameType::Tab | SwFrameType::Row |
SwFrameType::Cell;
do
{ if ( pFrame->GetType() & nTyp )
diff --git a/sw/source/core/layout/ftnfrm.cxx b/sw/source/core/layout/ftnfrm.cxx
index 5bb3e3f4623b..9ae9a5004aa3 100644
--- a/sw/source/core/layout/ftnfrm.cxx
+++ b/sw/source/core/layout/ftnfrm.cxx
@@ -188,7 +188,7 @@ static sal_uInt16 lcl_ColumnNum( const SwFrame* pBoss )
SwFootnoteContFrame::SwFootnoteContFrame( SwFrameFormat *pFormat, SwFrame*
pSib ):
SwLayoutFrame( pFormat, pSib )
{
- mnFrameType = SwFrameType::FtnCont;
+ mnFrameType = SwFrameType::FootnoteContainer;
}
SwFootnoteFrame* SwFootnoteContFrame::AddChained(bool bAppend, SwFrame* pThis,
bool bDefaultFormat)
@@ -559,7 +559,7 @@ SwFootnoteFrame::SwFootnoteFrame( SwFrameFormat *pFormat,
SwFrame* pSib, SwConte
// #i49383#
mbUnlockPosOfLowerObjs( true )
{
- mnFrameType = SwFrameType::Ftn;
+ mnFrameType = SwFrameType::Footnote;
}
void SwFootnoteFrame::InvalidateNxtFootnoteCnts( SwPageFrame const *pPage )
diff --git a/sw/source/core/layout/pagechg.cxx
b/sw/source/core/layout/pagechg.cxx
index fcc96ff2083b..61eb3f325286 100644
--- a/sw/source/core/layout/pagechg.cxx
+++ b/sw/source/core/layout/pagechg.cxx
@@ -400,8 +400,8 @@ static void lcl_FormatLay( SwLayoutFrame *pLay )
while ( pTmp )
{
const SwFrameType nTypes = SwFrameType::Root | SwFrameType::Page |
SwFrameType::Column
- | SwFrameType::Header | SwFrameType::Footer |
SwFrameType::FtnCont
- | SwFrameType::Ftn | SwFrameType::Body;
+ | SwFrameType::Header | SwFrameType::Footer |
SwFrameType::FootnoteContainer
+ | SwFrameType::Footnote | SwFrameType::Body;
if ( pTmp->GetType() & nTypes )
::lcl_FormatLay( static_cast<SwLayoutFrame*>(pTmp) );
pTmp = pTmp->GetNext();
diff --git a/sw/source/core/layout/paintfrm.cxx
b/sw/source/core/layout/paintfrm.cxx
index 75d96c097c54..be1700419be8 100644
--- a/sw/source/core/layout/paintfrm.cxx
+++ b/sw/source/core/layout/paintfrm.cxx
@@ -5512,7 +5512,7 @@ void SwFrame::PaintSwFrameShadowAndBorder(
const SwBorderAttrs& rAttrs) const
{
// There's nothing (Row,Body,Footnote,Root,Column,NoText) need to do here
- if (GetType() &
(SwFrameType::NoTxt|SwFrameType::Row|SwFrameType::Body|SwFrameType::Ftn|SwFrameType::Column|SwFrameType::Root))
+ if (GetType() &
(SwFrameType::NoTxt|SwFrameType::Row|SwFrameType::Body|SwFrameType::Footnote|SwFrameType::Column|SwFrameType::Root))
return;
if (IsCellFrame() && !gProp.pSGlobalShell->GetViewOptions()->IsTable())
diff --git a/sw/source/core/layout/wsfrm.cxx b/sw/source/core/layout/wsfrm.cxx
index d41c951eb7fb..babb08e45203 100644
--- a/sw/source/core/layout/wsfrm.cxx
+++ b/sw/source/core/layout/wsfrm.cxx
@@ -2905,7 +2905,7 @@ SwTwips SwLayoutFrame::GrowFrame(SwTwips nDist,
SwResizeLimitReason& reason, boo
InvalidateAll_();
InvalidatePage( pPage );
}
- if (!(GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FtnCont|SwFrameType::Page|SwFrameType::Root)))
+ if (!(GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FootnoteContainer|SwFrameType::Page|SwFrameType::Root)))
NotifyLowerObjs();
if( IsCellFrame() )
@@ -3148,7 +3148,7 @@ SwTwips SwLayoutFrame::ShrinkFrame( SwTwips nDist, bool
bTst, bool bInfo )
SetCompletePaint();
}
- if (!(GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FtnCont|SwFrameType::Page|SwFrameType::Root)))
+ if (!(GetType() &
(SwFrameType::Row|SwFrameType::Tab|SwFrameType::FootnoteContainer|SwFrameType::Page|SwFrameType::Root)))
NotifyLowerObjs();
if( IsCellFrame() )
diff --git a/sw/source/core/text/EnhancedPDFExportHelper.cxx
b/sw/source/core/text/EnhancedPDFExportHelper.cxx
index e3a0324eaddd..9ea0d87efe03 100644
--- a/sw/source/core/text/EnhancedPDFExportHelper.cxx
+++ b/sw/source/core/text/EnhancedPDFExportHelper.cxx
@@ -1420,7 +1420,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
nPDFType = sal_uInt16(vcl::pdf::StructElement::NonStructElement);
break;
- case SwFrameType::FtnCont :
+ case SwFrameType::FootnoteContainer:
// Footnote container: Division
@@ -1428,7 +1428,7 @@ void SwTaggedPDFHelper::BeginBlockStructureElements()
aPDFType = aDivString;
break;
- case SwFrameType::Ftn :
+ case SwFrameType::Footnote:
// Footnote frame: Note
