sw/inc/PostItMgr.hxx | 3 +--
sw/inc/crsrsh.hxx | 2 +-
sw/source/core/access/acccontext.cxx | 6 ++++--
sw/source/core/access/acccontext.hxx | 2 +-
sw/source/core/access/accfrmobjmap.cxx | 3 +--
sw/source/core/access/accfrmobjmap.hxx | 15 +--------------
sw/source/core/crsr/crstrvl.cxx | 10 +++++-----
sw/source/uibase/docvw/PostItMgr.cxx | 9 ++++-----
sw/source/uibase/docvw/edtwin.cxx | 6 +++---
sw/source/uibase/docvw/edtwin2.cxx | 4 ++--
sw/source/uibase/docvw/frmsidebarwincontainer.cxx | 9 +++++----
sw/source/uibase/docvw/frmsidebarwincontainer.hxx | 3 +--
sw/source/uibase/utlui/content.cxx | 4 ++--
13 files changed, 31 insertions(+), 45 deletions(-)
New commits:
commit 9e7f4c95e4c232c0ea7c7108e996215019431a14
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 08:12:24 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 25 13:45:19 2025 +0200
sw a11y: Drop SwAccessibleChildMapKey::m_nPosNum
The ctor initializes it to Point(0, 0), and it's never
changed afterwards. Since it's always the same, it is pointless
to compare whether it differs for different objects
of that class.
Change-Id: I9db440faf18a6abbb1ccedbc7d4724a9d0e8684d
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184606
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/source/core/access/accfrmobjmap.hxx
b/sw/source/core/access/accfrmobjmap.hxx
index ed4ecafece0f..79466980939f 100644
--- a/sw/source/core/access/accfrmobjmap.hxx
+++ b/sw/source/core/access/accfrmobjmap.hxx
@@ -38,30 +38,18 @@ public:
SwAccessibleChildMapKey()
: m_eLayerId( INVALID )
, m_nOrdNum( 0 )
- , m_nPosNum( 0, 0 )
{}
SwAccessibleChildMapKey( LayerId eId, sal_uInt32 nOrd )
: m_eLayerId( eId )
, m_nOrdNum( nOrd )
- , m_nPosNum( 0, 0 )
{}
bool operator()( const SwAccessibleChildMapKey& r1,
const SwAccessibleChildMapKey& r2 ) const
{
if(r1.m_eLayerId == r2.m_eLayerId)
- {
- if(r1.m_nPosNum == r2.m_nPosNum)
- return r1.m_nOrdNum < r2.m_nOrdNum;
- else
- {
- if(r1.m_nPosNum.getY() == r2.m_nPosNum.getY())
- return r1.m_nPosNum.getX() < r2.m_nPosNum.getX();
- else
- return r1.m_nPosNum.getY() < r2.m_nPosNum.getY();
- }
- }
+ return r1.m_nOrdNum < r2.m_nOrdNum;
else
return r1.m_eLayerId < r2.m_eLayerId;
}
@@ -79,7 +67,6 @@ public:
private:
LayerId m_eLayerId;
sal_uInt32 m_nOrdNum;
- Point m_nPosNum;
};
commit 8d382bc373d38827bbc6af9cb02d51af0bdd8a5e
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 08:01:09 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 25 13:45:13 2025 +0200
sw a11y: Return vector instead of using out param
Change-Id: I23ef959b5744d1730f3937b876a0ceb187096d2b
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184605
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/sw/inc/PostItMgr.hxx b/sw/inc/PostItMgr.hxx
index 8d75d8bd7920..3ee4ed00eec6 100644
--- a/sw/inc/PostItMgr.hxx
+++ b/sw/inc/PostItMgr.hxx
@@ -245,8 +245,7 @@ class SAL_DLLPUBLIC_RTTI SwPostItMgr final : public
SfxListener,
bool HasFrameConnectedSidebarWins( const SwFrame& rFrame );
vcl::Window* GetSidebarWinForFrameByIndex( const SwFrame& rFrame,
const sal_Int32 nIndex );
- void GetAllSidebarWinForFrame( const SwFrame& rFrame,
- std::vector< vcl::Window* >* pChildren );
+ std::vector<vcl::Window*> GetAllSidebarWinForFrame(const SwFrame&
rFrame);
void DrawNotesForPage(OutputDevice *pOutDev, sal_uInt32 nPage);
void PaintTile(OutputDevice& rRenderContext);
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index df10a2b256ee..efc6d5a5d126 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -1442,16 +1442,18 @@ vcl::Window*
SwAccessibleContext::GetAdditionalAccessibleChild( const sal_Int32
}
/** #i88070# - get all additional accessible children */
-void SwAccessibleContext::GetAdditionalAccessibleChildren( std::vector<
vcl::Window* >* pChildren )
+std::vector<vcl::Window*>
SwAccessibleContext::GetAdditionalAccessibleChildren()
{
if ( GetFrame()->IsTextFrame() )
{
SwPostItMgr* pPostItMgr = GetMap()->GetShell().GetPostItMgr();
if ( pPostItMgr && pPostItMgr->HasNotes() && pPostItMgr->ShowNotes() )
{
- pPostItMgr->GetAllSidebarWinForFrame( *(GetFrame()), pChildren );
+ return pPostItMgr->GetAllSidebarWinForFrame(*(GetFrame()));
}
}
+
+ return {};
}
bool SwAccessibleContext::SetSelectedState(bool const bSelected)
diff --git a/sw/source/core/access/acccontext.hxx
b/sw/source/core/access/acccontext.hxx
index 9a08540ac3a8..1c66bf72a84d 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -325,7 +325,7 @@ public:
vcl::Window* GetAdditionalAccessibleChild( const sal_Int32 nIndex );
// #i88070# - get all additional accessible children
- void GetAdditionalAccessibleChildren( std::vector< vcl::Window* >*
pChildren );
+ std::vector<vcl::Window*> GetAdditionalAccessibleChildren();
const OUString& GetName() const { return m_sName; }
diff --git a/sw/source/core/access/accfrmobjmap.cxx
b/sw/source/core/access/accfrmobjmap.cxx
index 210f44ada1f7..5f4d7863c93c 100644
--- a/sw/source/core/access/accfrmobjmap.cxx
+++ b/sw/source/core/access/accfrmobjmap.cxx
@@ -99,8 +99,7 @@ SwAccessibleChildMap::SwAccessibleChildMap( const SwRect&
rVisArea,
if ( pAccImpl &&
pAccImpl->HasAdditionalAccessibleChildren() )
{
- std::vector< vcl::Window* > aAdditionalChildren;
- pAccImpl->GetAdditionalAccessibleChildren(
&aAdditionalChildren );
+ std::vector<vcl::Window*> aAdditionalChildren =
pAccImpl->GetAdditionalAccessibleChildren();
sal_Int32 nCounter( 0 );
for ( const auto& rpChild : aAdditionalChildren )
diff --git a/sw/source/uibase/docvw/PostItMgr.cxx
b/sw/source/uibase/docvw/PostItMgr.cxx
index 2e0b35ac128e..79ff948e33f9 100644
--- a/sw/source/uibase/docvw/PostItMgr.cxx
+++ b/sw/source/uibase/docvw/PostItMgr.cxx
@@ -2737,13 +2737,12 @@ vcl::Window* SwPostItMgr::GetSidebarWinForFrameByIndex(
const SwFrame& rFrame,
return pSidebarWin;
}
-void SwPostItMgr::GetAllSidebarWinForFrame( const SwFrame& rFrame,
- std::vector< vcl::Window* >*
pChildren )
+std::vector<vcl::Window*> SwPostItMgr::GetAllSidebarWinForFrame(const SwFrame&
rFrame)
{
if ( mpFrameSidebarWinContainer != nullptr )
- {
- mpFrameSidebarWinContainer->getAll( rFrame, pChildren );
- }
+ return mpFrameSidebarWinContainer->getAll(rFrame);
+
+ return {};
}
void SwPostItMgr::ShowHideResolvedNotes(bool visible) {
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
index 17da0beee4f8..6d286cdf6797 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.cxx
@@ -150,10 +150,9 @@ sw::annotation::SwAnnotationWin*
SwFrameSidebarWinContainer::get( const SwFrame&
return pRet;
}
-void SwFrameSidebarWinContainer::getAll( const SwFrame& rFrame,
- std::vector< vcl::Window* >*
pSidebarWins )
+std::vector<vcl::Window*> SwFrameSidebarWinContainer::getAll(const SwFrame&
rFrame)
{
- pSidebarWins->clear();
+ std::vector<vcl::Window*> aSidebarWins;
FrameKey aFrameKey( &rFrame );
FrameSidebarWinContainer::iterator aFrameIter =
mpFrameSidebarWinContainer->find( aFrameKey );
@@ -162,9 +161,11 @@ void SwFrameSidebarWinContainer::getAll( const SwFrame&
rFrame,
SidebarWinContainer& rSidebarWinContainer = (*aFrameIter).second;
for ( const auto& rEntry : rSidebarWinContainer )
{
- pSidebarWins->push_back( rEntry.second );
+ aSidebarWins.push_back(rEntry.second);
}
}
+
+ return aSidebarWins;
}
} // eof of namespace sw::sidebarwindows
diff --git a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
index 33ae9a9d4da1..760c2f66341e 100644
--- a/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
+++ b/sw/source/uibase/docvw/frmsidebarwincontainer.hxx
@@ -50,8 +50,7 @@ class SwFrameSidebarWinContainer
sw::annotation::SwAnnotationWin* get( const SwFrame& rFrame,
const sal_Int32 nIndex );
- void getAll( const SwFrame& rFrame,
- std::vector< vcl::Window* >* pSidebarWins );
+ std::vector<vcl::Window*> getAll(const SwFrame& rFrame);
private:
std::unique_ptr<FrameSidebarWinContainer> mpFrameSidebarWinContainer;
commit 5d44a4d0f7dca219ab9ddafdca7221d3a9914a05
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Fri Apr 25 07:33:07 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Fri Apr 25 13:45:07 2025 +0200
sw: Rename IsAttrAtPos::Ftn -> IsAttrAtPos::Footnote
Make name less cryptic. See also
commit 441e51dcfdcf7263cc945928bc4da24211c44bea
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Thu Apr 24 13:03:23 2025 +0200
sw: Rename SwFrameType::Ftn -> Footnote, FtnCont ->
FootnoteContainer
doing the same in another enum class.
Change-Id: Iddc35b2bb14dd177a910187e75e9c0635076aeeb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184601
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/inc/crsrsh.hxx b/sw/inc/crsrsh.hxx
index 0eebfb673cc2..5f0317250484 100644
--- a/sw/inc/crsrsh.hxx
+++ b/sw/inc/crsrsh.hxx
@@ -77,7 +77,7 @@ enum class IsAttrAtPos
NONE = 0x0000,
Field = 0x0001,
ClickField = 0x0002,
- Ftn = 0x0004,
+ Footnote = 0x0004,
InetAttr = 0x0008,
TableBoxFml = 0x0010,
Redline = 0x0020,
diff --git a/sw/source/core/crsr/crstrvl.cxx b/sw/source/core/crsr/crstrvl.cxx
index 48665ea86359..a95ec37264ac 100644
--- a/sw/source/core/crsr/crstrvl.cxx
+++ b/sw/source/core/crsr/crstrvl.cxx
@@ -1704,7 +1704,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
}
}
- if( !bRet && IsAttrAtPos::Ftn & rContentAtPos.eContentAtPos )
+ if( !bRet && IsAttrAtPos::Footnote & rContentAtPos.eContentAtPos )
{
if( aTmpState.m_bFootnoteNoInfo )
{
@@ -1717,7 +1717,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
bRet = false;
}
if( bRet )
- rContentAtPos.eContentAtPos = IsAttrAtPos::Ftn;
+ rContentAtPos.eContentAtPos = IsAttrAtPos::Footnote;
}
else if ( nullptr != ( pTextAttr =
pTextNd->GetTextAttrForCharAt(
aPos.GetContentIndex(), RES_TXTATR_FTN )) )
@@ -1749,7 +1749,7 @@ bool SwCursorShell::GetContentAtPos( const Point& rPt,
if( bRet )
{
- rContentAtPos.eContentAtPos = IsAttrAtPos::Ftn;
+ rContentAtPos.eContentAtPos = IsAttrAtPos::Footnote;
rContentAtPos.pFndTextAttr = pTextAttr;
rContentAtPos.aFnd.pAttr = &pTextAttr->GetAttr();
@@ -2239,7 +2239,7 @@ bool SwContentAtPos::IsInProtectSect() const
pNd = static_txtattr_cast<SwTextField
const*>(pFndTextAttr)->GetpTextNode();
break;
- case IsAttrAtPos::Ftn:
+ case IsAttrAtPos::Footnote:
pNd = &static_cast<const
SwTextFootnote*>(pFndTextAttr)->GetTextNode();
break;
@@ -2264,7 +2264,7 @@ bool SwContentAtPos::IsInProtectSect() const
bool SwContentAtPos::IsInRTLText()const
{
const SwTextNode* pNd = nullptr;
- if (!pFndTextAttr || (eContentAtPos != IsAttrAtPos::Ftn))
+ if (!pFndTextAttr || (eContentAtPos != IsAttrAtPos::Footnote))
return false;
const SwTextFootnote* pTextFootnote = static_cast<const
SwTextFootnote*>(pFndTextAttr);
diff --git a/sw/source/uibase/docvw/edtwin.cxx
b/sw/source/uibase/docvw/edtwin.cxx
index dafbceb71622..bac056f7ae9d 100644
--- a/sw/source/uibase/docvw/edtwin.cxx
+++ b/sw/source/uibase/docvw/edtwin.cxx
@@ -569,7 +569,7 @@ void SwEditWin::UpdatePointer(const Point &rLPt, sal_uInt16
nModifier )
IsAttrAtPos::Field |
IsAttrAtPos::ClickField |
IsAttrAtPos::InetAttr |
- IsAttrAtPos::Ftn |
+ IsAttrAtPos::Footnote |
IsAttrAtPos::SmartTag);
if( rSh.GetContentAtPos( rLPt, aSwContentAtPos) )
{
@@ -3914,7 +3914,7 @@ void SwEditWin::MouseButtonDown(const MouseEvent& _rMEvt)
if( bExecHyperlinks )
{
SwContentAtPos aContentAtPos(
- IsAttrAtPos::Ftn |
+ IsAttrAtPos::Footnote |
IsAttrAtPos::InetAttr );
if( rSh.GetContentAtPos( aDocPos,
aContentAtPos ) )
@@ -5194,7 +5194,7 @@ void SwEditWin::MouseButtonUp(const MouseEvent& rMEvt)
}
else
{
- aContentAtPos = SwContentAtPos( IsAttrAtPos::Ftn );
+ aContentAtPos = SwContentAtPos(
IsAttrAtPos::Footnote );
if( !rSh.GetContentAtPos( aDocPt, aContentAtPos,
true ) && bExecHyperlinks )
{
SdrViewEvent aVEvt;
diff --git a/sw/source/uibase/docvw/edtwin2.cxx
b/sw/source/uibase/docvw/edtwin2.cxx
index 31fd3ca13a1a..26804b33d3d1 100644
--- a/sw/source/uibase/docvw/edtwin2.cxx
+++ b/sw/source/uibase/docvw/edtwin2.cxx
@@ -354,7 +354,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
SwRect aFieldRect;
SwContentAtPos aContentAtPos( IsAttrAtPos::Field |
IsAttrAtPos::InetAttr |
- IsAttrAtPos::Ftn |
+ IsAttrAtPos::Footnote |
IsAttrAtPos::Redline |
IsAttrAtPos::ToxMark |
IsAttrAtPos::RefMark |
@@ -481,7 +481,7 @@ void SwEditWin::RequestHelp(const HelpEvent &rEvt)
break;
}
- case IsAttrAtPos::Ftn:
+ case IsAttrAtPos::Footnote:
if( aContentAtPos.pFndTextAttr && aContentAtPos.aFnd.pAttr )
{
const SwFormatFootnote* pFootnote = static_cast<const
SwFormatFootnote*>(aContentAtPos.aFnd.pAttr);
diff --git a/sw/source/uibase/utlui/content.cxx
b/sw/source/uibase/utlui/content.cxx
index 044fe4fab7a4..f41fe06ac9f5 100644
--- a/sw/source/uibase/utlui/content.cxx
+++ b/sw/source/uibase/utlui/content.cxx
@@ -4761,7 +4761,7 @@ void SwContentTree::UpdateTracking()
return;
}
// footnotes and endnotes
- if (SwContentAtPos aContentAtPos(IsAttrAtPos::Ftn);
+ if (SwContentAtPos aContentAtPos(IsAttrAtPos::Footnote);
m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(),
aContentAtPos)
&& aContentAtPos.pFndTextAttr &&
!(m_bIsRoot && (m_nRootType != ContentTypeId::FOOTNOTE &&
@@ -5224,7 +5224,7 @@ bool
SwContentTree::IsSelectedEntryCurrentDocCursorPosition(const weld::TreeIter
return false;
}
// footnotes and endnotes
- if (SwContentAtPos aContentAtPos(IsAttrAtPos::Ftn);
+ if (SwContentAtPos aContentAtPos(IsAttrAtPos::Footnote);
m_pActiveShell->GetContentAtPos(m_pActiveShell->GetCursorDocPos(),
aContentAtPos)
&& aContentAtPos.pFndTextAttr)
{
