sw/source/core/access/acccell.cxx | 6 -
sw/source/core/access/acccontext.cxx | 83 +++++++-----------------
sw/source/core/access/acccontext.hxx | 3
sw/source/core/access/accdoc.cxx | 14 +---
sw/source/core/access/accframebase.cxx | 13 +--
sw/source/core/access/accmap.cxx | 103 ++++++++++---------------------
sw/source/core/access/accnotextframe.cxx | 14 +---
sw/source/core/access/accpara.cxx | 40 +++---------
sw/source/core/access/acctable.cxx | 43 +++---------
sw/source/core/access/acctextframe.cxx | 14 +---
10 files changed, 102 insertions(+), 231 deletions(-)
New commits:
commit 793dadb5d75ca34f58b156952bbc997ef83d771a
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 14 15:24:46 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 15 08:07:44 2025 +0200
sw a11y: Get rid of need to static_cast
Instead of letting the two SwAccessibleMap::GetContextImpl
call the corresponding SwAccessibleMap::GetContext
implementations that return an XAccessible and casting
that to SwAccessibleContext, rather do it the other way
around:
Move the existing logic (that already has an
rtl::Referenc<SwAccessibleContext> to
SwAccessibleMap::GetContextImpl and let
SwAccessibleMap::GetContext call the former.
This avoids the need static_cast.
Change-Id: I55cc3502adccb8fd6eece1dab467c8295a8137f3
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184163
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 dc9612b0ae4e..8b8e5180a17c 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1753,8 +1753,8 @@ uno::Reference<XAccessible>
SwAccessibleMap::GetDocumentPreview(
return xAcc;
}
-uno::Reference< XAccessible> SwAccessibleMap::GetContext( const SwFrame
*pFrame,
- bool bCreate )
+rtl::Reference<SwAccessibleContext> SwAccessibleMap::GetContextImpl(const
SwFrame* pFrame,
+ bool
bCreate)
{
DBG_TESTSOLARMUTEX();
@@ -1878,22 +1878,14 @@ uno::Reference< XAccessible>
SwAccessibleMap::GetContext( const SwFrame *pFrame,
return xAcc;
}
-::rtl::Reference < SwAccessibleContext > SwAccessibleMap::GetContextImpl(
- const SwFrame *pFrame,
- bool bCreate )
+uno::Reference<XAccessible> SwAccessibleMap::GetContext(const SwFrame* pFrame,
bool bCreate)
{
- uno::Reference < XAccessible > xAcc( GetContext( pFrame, bCreate ) );
-
- ::rtl::Reference < SwAccessibleContext > xAccImpl(
- static_cast< SwAccessibleContext * >( xAcc.get() ) );
-
- return xAccImpl;
+ return GetContextImpl(pFrame, bCreate);
}
-uno::Reference< XAccessible> SwAccessibleMap::GetContext(
- const SdrObject *pObj,
- SwAccessibleContext *pParentImpl,
- bool bCreate )
+rtl::Reference<::accessibility::AccessibleShape>
+SwAccessibleMap::GetContextImpl(const SdrObject* pObj, SwAccessibleContext*
pParentImpl,
+ bool bCreate)
{
DBG_TESTSOLARMUTEX();
@@ -1943,6 +1935,12 @@ uno::Reference< XAccessible> SwAccessibleMap::GetContext(
return xAcc;
}
+uno::Reference<XAccessible>
+SwAccessibleMap::GetContext(const SdrObject* pObj, SwAccessibleContext*
pParentImpl, bool bCreate)
+{
+ return GetContextImpl(pObj, pParentImpl, bCreate);
+}
+
bool SwAccessibleMap::IsInSameLevel(const SdrObject* pObj, const SwFEShell*
pFESh)
{
if (pFESh)
@@ -2027,19 +2025,6 @@ void SwAccessibleMap::AddGroupContext(const SdrObject
*pParentObj, uno::Referenc
}
}
-::rtl::Reference < ::accessibility::AccessibleShape >
SwAccessibleMap::GetContextImpl(
- const SdrObject *pObj,
- SwAccessibleContext *pParentImpl,
- bool bCreate )
-{
- uno::Reference < XAccessible > xAcc( GetContext( pObj, pParentImpl,
bCreate ) );
-
- ::rtl::Reference < ::accessibility::AccessibleShape > xAccImpl(
- static_cast< ::accessibility::AccessibleShape* >( xAcc.get() ) );
-
- return xAccImpl;
-}
-
void SwAccessibleMap::RemoveContext( const SwFrame *pFrame )
{
DBG_TESTSOLARMUTEX();
commit fd3fecd59db557e0f3b79163019c2827ea3637a0
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 14 15:06:52 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 15 08:07:37 2025 +0200
sw a11y: Drop unused typedef
Change-Id: I33b3ad65b6e0c0ddafa84adba218a46d0f2a6293
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184162
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 3e0eec3900ad..dc9612b0ae4e 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -610,7 +610,6 @@ class SwAccessibleEventMap_Impl
public:
typedef SwAccessibleChild
key_type;
typedef std::list<SwAccessibleEvent_Impl>::iterator
mapped_type;
- typedef std::pair<const key_type,mapped_type>
value_type;
typedef SwAccessibleChildFunc
key_compare;
typedef std::map<key_type,mapped_type,key_compare>::iterator
iterator;
typedef std::map<key_type,mapped_type,key_compare>::const_iterator
const_iterator;
commit 9498b8d0092e6d903063c279b82101a77decbaf9
Author: Michael Weghorn <m.wegh...@posteo.de>
AuthorDate: Mon Apr 14 14:13:53 2025 +0200
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Apr 15 08:07:30 2025 +0200
sw a11y: Deduplicate code for AccessibleEventObject creation
This is basically the Writer equivalent of
Calc commit
commit b997fd92359c00bb91fd3d25bf992c4b3cd82543
Author: Michael Weghorn <m.wegh...@posteo.de>
Date: Wed Apr 9 14:44:35 2025 +0200
sc a11y: Deduplicate code for AccessibleEventObject creation
Behavior should be unchanged except that the
AccessibleEventId::SELECTION_CHANGED_WITHIN event in
SwAccessibleTable::FireSelectionEvent previously
had the AccessibleEventObject::NewValue set to whatever
would have been set last in the loop above, but that doesn't look
intended/desirable, so leave it unset now.
Change-Id: Ib108473a02fe109d791e70677714be7e5fab418e
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/184150
Tested-by: Jenkins
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
diff --git a/sw/source/core/access/acccell.cxx
b/sw/source/core/access/acccell.cxx
index 2f8d16e28710..fb955b104a3f 100644
--- a/sw/source/core/access/acccell.cxx
+++ b/sw/source/core/access/acccell.cxx
@@ -194,10 +194,8 @@ void SwAccessibleCell::InvalidateCursorPos_()
::rtl::Reference < SwAccessibleContext > xChildImpl(
GetMap()->GetContextImpl( aChild.GetSwFrame()) );
if (xChildImpl.is())
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::STATE_CHANGED;
- aEvent.NewValue <<= AccessibleStateType::FOCUSED;
- xChildImpl->FireAccessibleEvent( aEvent );
+
xChildImpl->FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, uno::Any(),
+
uno::Any(AccessibleStateType::FOCUSED));
}
}
}
diff --git a/sw/source/core/access/acccontext.cxx
b/sw/source/core/access/acccontext.cxx
index d33b6e786085..4239fe1b41ab 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -296,18 +296,13 @@ void SwAccessibleContext::ScrolledIn()
const SwFrame* pParent = GetParent();
::rtl::Reference< SwAccessibleContext > xParentImpl(
GetMap()->GetContextImpl( pParent, false ) );
- uno::Reference < XAccessibleContext > xThis( this );
if( !xParentImpl.is() )
return;
SetParent( xParentImpl.get() );
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xThis;
- aEvent.IndexHint = -1;
-
- xParentImpl->FireAccessibleEvent( aEvent );
+ uno::Reference<XAccessibleContext> xThis(this);
+ xParentImpl->FireAccessibleEvent(AccessibleEventId::CHILD, uno::Any(),
uno::Any(xThis));
if( HasCursor() )
{
@@ -436,7 +431,9 @@ void SwAccessibleContext::InvalidateFocus_()
{
}
-void SwAccessibleContext::FireAccessibleEvent( AccessibleEventObject& rEvent )
+void SwAccessibleContext::FireAccessibleEvent(const sal_Int16 nEventId,
+ const css::uno::Any& rOldValue,
+ const css::uno::Any& rNewValue,
sal_Int32 nIndexHint)
{
if( !GetFrame() )
{
@@ -444,36 +441,30 @@ void SwAccessibleContext::FireAccessibleEvent(
AccessibleEventObject& rEvent )
return;
}
- if( !rEvent.Source.is() )
- {
- uno::Reference < XAccessibleContext > xThis( this );
- rEvent.Source = xThis;
- }
+ uno::Reference<XAccessibleContext> xThis(this);
+ AccessibleEventObject aEvent(xThis, nEventId, rNewValue, rOldValue,
nIndexHint);
if (m_nClientId)
- comphelper::AccessibleEventNotifier::addEvent( m_nClientId, rEvent );
+ comphelper::AccessibleEventNotifier::addEvent(m_nClientId, aEvent);
}
void SwAccessibleContext::FireVisibleDataEvent()
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::VISIBLE_DATA_CHANGED, uno::Any(),
uno::Any());
}
void SwAccessibleContext::FireStateChangedEvent( sal_Int64 nState,
bool bNewState )
{
- AccessibleEventObject aEvent;
+ uno::Any aOldValue;
+ uno::Any aNewValue;
- aEvent.EventId = AccessibleEventId::STATE_CHANGED;
if( bNewState )
- aEvent.NewValue <<= nState;
+ aNewValue <<= nState;
else
- aEvent.OldValue <<= nState;
+ aOldValue <<= nState;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::STATE_CHANGED, aOldValue,
aNewValue);
}
void SwAccessibleContext::GetStates( sal_Int64& rStateSet )
@@ -1023,11 +1014,8 @@ void SwAccessibleContext::DisposeShape( const SdrObject
*pObj,
if( !xAccImpl.is() )
xAccImpl = GetMap()->GetContextImpl( pObj, this );
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.OldValue <<= uno::Reference< XAccessible >( xAccImpl );
- aEvent.IndexHint = -1;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD,
uno::Any(uno::Reference<XAccessible>(xAccImpl)),
+ uno::Any());
GetMap()->RemoveContext( pObj );
xAccImpl->dispose();
@@ -1039,12 +1027,8 @@ void SwAccessibleContext::ScrolledInShape(
::accessibility::AccessibleShape *pAc
{
return ;
}
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc( pAccImpl );
- aEvent.NewValue <<= xAcc;
- aEvent.IndexHint = -1;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD, uno::Any(), uno::Any(xAcc));
if( !pAccImpl->GetState( AccessibleStateType::FOCUSED ) )
return;
@@ -1078,11 +1062,7 @@ void SwAccessibleContext::Dispose(bool bRecursive, bool
bCanSkipInvisible)
// send child event at parent
if( xParent.is() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.OldValue <<= xThis;
- aEvent.IndexHint = -1;
- xParent->FireAccessibleEvent(aEvent);
+ xParent->FireAccessibleEvent(AccessibleEventId::CHILD,
uno::Any(xThis), uno::Any());
}
// set defunc state (it's not required to broadcast a state changed
@@ -1138,13 +1118,9 @@ void SwAccessibleContext::DisposeChild( const
SwAccessibleChild& rChildFrameOrOb
}
else if ( rChildFrameOrObj.GetWindow() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc =
rChildFrameOrObj.GetWindow()->GetAccessible();
- aEvent.OldValue <<= xAcc;
- aEvent.IndexHint = -1;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD, uno::Any(xAcc),
uno::Any());
}
}
else if( bRecursive && rChildFrameOrObj.GetSwFrame() )
@@ -1245,10 +1221,8 @@ void SwAccessibleContext::InvalidateChildPosOrSize(
}
else if ( rChildFrameOrObj.GetWindow() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<=
rChildFrameOrObj.GetWindow()->GetAccessible();
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD, uno::Any(),
+
uno::Any(rChildFrameOrObj.GetWindow()->GetAccessible()));
}
}
}
@@ -1349,28 +1323,19 @@ void SwAccessibleContext::InvalidateStates(
AccessibleStates _nStates )
void SwAccessibleContext::InvalidateRelation( sal_uInt16 nType )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = nType;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(nType, uno::Any(), uno::Any());
}
/** #i27301# - text selection has changed */
void SwAccessibleContext::InvalidateTextSelection()
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::TEXT_SELECTION_CHANGED;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::TEXT_SELECTION_CHANGED, uno::Any(),
uno::Any());
}
/** #i88069# - attributes has changed */
void SwAccessibleContext::InvalidateAttr()
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::TEXT_ATTRIBUTE_CHANGED;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::TEXT_ATTRIBUTE_CHANGED, uno::Any(),
uno::Any());
}
bool SwAccessibleContext::HasCursor()
diff --git a/sw/source/core/access/acccontext.hxx
b/sw/source/core/access/acccontext.hxx
index e798afa88f15..ef2b781e5f5e 100644
--- a/sw/source/core/access/acccontext.hxx
+++ b/sw/source/core/access/acccontext.hxx
@@ -165,7 +165,8 @@ protected:
virtual void InvalidateFocus_();
public:
- void FireAccessibleEvent( css::accessibility::AccessibleEventObject&
rEvent );
+ void FireAccessibleEvent(const sal_Int16 nEventId, const css::uno::Any&
rOldValue,
+ const css::uno::Any& rNewValue, sal_Int32
nIndexHint = -1);
protected:
// broadcast visual data event
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index ab252606c9c9..db208b5f7406 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -101,11 +101,8 @@ void SwAccessibleDocumentBase::AddChild( vcl::Window
*pWin, bool bFireEvent )
if( bFireEvent )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= mpChildWin->GetAccessible();
- aEvent.IndexHint = -1;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD, uno::Any(),
+ uno::Any(mpChildWin->GetAccessible()));
}
}
}
@@ -117,11 +114,8 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window
*pWin )
OSL_ENSURE( !mpChildWin || pWin == mpChildWin, "invalid child window to
remove" );
if( mpChildWin && pWin == mpChildWin )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.OldValue <<= mpChildWin->GetAccessible();
- aEvent.IndexHint = -1;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CHILD,
uno::Any(mpChildWin->GetAccessible()),
+ uno::Any());
mpChildWin = nullptr;
}
diff --git a/sw/source/core/access/accframebase.cxx
b/sw/source/core/access/accframebase.cxx
index f47c163bb1a6..c5517d57b606 100644
--- a/sw/source/core/access/accframebase.cxx
+++ b/sw/source/core/access/accframebase.cxx
@@ -166,11 +166,9 @@ void SwAccessibleFrameBase::InvalidateCursorPos_()
rtl::Reference<SwAccessibleContext> xParent(GetWeakParent());
if( xParent.is() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
uno::Reference< XAccessible > xChild(this);
- aEvent.NewValue <<= xChild;
- xParent->FireAccessibleEvent( aEvent );
+ xParent->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED,
uno::Any(),
+ uno::Any(xChild));
}
}
@@ -222,11 +220,8 @@ void SwAccessibleFrameBase::Notify(const SfxHint& rHint)
if( sOldName != GetName() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::NAME_CHANGED;
- aEvent.OldValue <<= sOldName;
- aEvent.NewValue <<= GetName();
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::NAME_CHANGED,
uno::Any(sOldName),
+ uno::Any(GetName()));
}
}
}
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 678e55c7f3d3..3e0eec3900ad 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -1440,20 +1440,18 @@ void SwAccessibleMap::InvalidateShapeInParaSelection()
for (SwAccessibleContext* pAccPara : vecAdd)
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
if (pAccPara)
{
- pAccPara->FireAccessibleEvent( aEvent );
+
pAccPara->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, uno::Any(),
+ uno::Any());
}
}
for (SwAccessibleContext* pAccPara : vecRemove)
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
if (pAccPara)
{
- pAccPara->FireAccessibleEvent( aEvent );
+
pAccPara->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_REMOVE,
uno::Any(),
+ uno::Any());
}
}
}
@@ -1514,10 +1512,8 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool
bInvalidateFocusMode /*=fa
{
if (rpShape.is())
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
- aEvent.NewValue <<= uno::Reference<XAccessible>(rpShape);
- xDocView->FireAccessibleEvent(aEvent);
+
xDocView->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_REMOVE,
uno::Any(),
+
uno::Any(uno::Reference<XAccessible>(rpShape)));
}
}
@@ -1549,9 +1545,8 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool
bInvalidateFocusMode /*=fa
const unsigned int SELECTION_WITH_NUM = 10;
if (vecxShapeAdd.size() > SELECTION_WITH_NUM )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- xDocView->FireAccessibleEvent(aEvent);
+
xDocView->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_WITHIN,
uno::Any(),
+ uno::Any());
}
else
{
@@ -1559,10 +1554,8 @@ void SwAccessibleMap::DoInvalidateShapeSelection(bool
bInvalidateFocusMode /*=fa
{
if (rpShape.is())
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_ADD;
- aEvent.NewValue <<= uno::Reference<XAccessible>(rpShape);
- xDocView->FireAccessibleEvent(aEvent);
+
xDocView->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_ADD,
uno::Any(),
+
uno::Any(uno::Reference<XAccessible>(rpShape)));
}
}
}
@@ -2565,11 +2558,9 @@ void SwAccessibleMap::InvalidateCursorPosition( const
SwFrame *pFrame )
::rtl::Reference< SwAccessibleContext
> xParentAccImplRoot = GetContextImpl(pParentRoot,false);
if(xParentAccImplRoot.is())
{
- AccessibleEventObject aEvent;
- aEvent.EventId =
AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAccParentTab;
- aEvent.IndexHint = -1;
-
xParentAccImplRoot->FireAccessibleEvent( aEvent );
+
xParentAccImplRoot->FireAccessibleEvent(
+ AccessibleEventId::CHILD,
uno::Any(),
+ uno::Any(xAccParentTab));
}
}
@@ -2586,11 +2577,9 @@ void SwAccessibleMap::InvalidateCursorPosition( const
SwFrame *pFrame )
::rtl::Reference< SwAccessibleContext >
xParentAccImplRoot = GetContextImpl(pParentRoot,false);
if(xParentAccImplRoot.is())
{
- AccessibleEventObject aEvent;
- aEvent.EventId =
AccessibleEventId::CHILD;
- aEvent.NewValue <<= uno::Reference<
XAccessible>(xParentAccImpl);
- aEvent.IndexHint = -1;
-
xParentAccImplRoot->FireAccessibleEvent( aEvent );
+
xParentAccImplRoot->FireAccessibleEvent(
+ AccessibleEventId::CHILD,
uno::Any(),
+
uno::Any(uno::Reference<XAccessible>(xParentAccImpl)));
}
}
}
@@ -2598,12 +2587,8 @@ void SwAccessibleMap::InvalidateCursorPosition( const
SwFrame *pFrame )
{
uno::Reference< XAccessible> xAccShape =
GetContext(pObj,xParentAccImpl.get());
-
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CHILD;
- aEvent.NewValue <<= xAccShape;
- aEvent.IndexHint = -1;
- xParentAccImpl->FireAccessibleEvent( aEvent );
+ xParentAccImpl->FireAccessibleEvent(
+ AccessibleEventId::CHILD, uno::Any(),
uno::Any(xAccShape));
}
}
}
@@ -2631,9 +2616,8 @@ void SwAccessibleMap::InvalidateCursorPosition( const
SwFrame *pFrame )
{
if(pAccPara->SetSelectedState(false))
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
- pAccPara->FireAccessibleEvent( aEvent );
+
pAccPara->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_REMOVE,
+ uno::Any(), uno::Any());
}
}
}
@@ -2641,9 +2625,8 @@ void SwAccessibleMap::InvalidateCursorPosition( const
SwFrame *pFrame )
{
if(pAccPara && pAccPara->SetSelectedState(true))
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
- pAccPara->FireAccessibleEvent( aEvent );
+
pAccPara->FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED, uno::Any(),
+ uno::Any());
}
}
}
diff --git a/sw/source/core/access/accnotextframe.cxx
b/sw/source/core/access/accnotextframe.cxx
index 6283c87080af..ded7e3e1377e 100644
--- a/sw/source/core/access/accnotextframe.cxx
+++ b/sw/source/core/access/accnotextframe.cxx
@@ -98,11 +98,8 @@ void SwAccessibleNoTextFrame::Notify(const SfxHint& rHint)
if(rTitleChanged.m_sOld == rTitleChanged.m_sNew)
break;
msTitle = rTitleChanged.m_sNew;
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::NAME_CHANGED;
- aEvent.OldValue <<= rTitleChanged.m_sOld;
- aEvent.NewValue <<= msTitle;
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::NAME_CHANGED,
uno::Any(rTitleChanged.m_sOld),
+ uno::Any(msTitle));
if(!pNd->GetDescription().isEmpty())
break;
@@ -117,11 +114,8 @@ void SwAccessibleNoTextFrame::Notify(const SfxHint& rHint)
msDesc = msTitle;
if(msDesc == sOldDesc)
return;
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::DESCRIPTION_CHANGED;
- aEvent.OldValue <<= sOldDesc;
- aEvent.NewValue <<= msDesc;
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED,
uno::Any(sOldDesc),
+ uno::Any(msDesc));
}
return;
}
diff --git a/sw/source/core/access/accpara.cxx
b/sw/source/core/access/accpara.cxx
index 87bff9aaad8b..6820bb36f689 100644
--- a/sw/source/core/access/accpara.cxx
+++ b/sw/source/core/access/accpara.cxx
@@ -258,15 +258,13 @@ void SwAccessibleParagraph::InvalidateContent_( bool
bVisibleDataFired )
if( sText != sOldText )
{
// The text is changed
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::TEXT_CHANGED;
-
// determine exact changes between sOldText and sText
+ uno::Any aOldValue;
+ uno::Any aNewValue;
(void)comphelper::OCommonAccessibleText::implInitTextChangedEvent(sOldText,
sText,
-
aEvent.OldValue,
-
aEvent.NewValue);
+
aOldValue, aNewValue);
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::TEXT_CHANGED, aOldValue,
aNewValue);
uno::Reference< XAccessible > xparent = getAccessibleParent();
uno::Reference< XAccessibleContext >
xAccContext(xparent,uno::UNO_QUERY);
if (xAccContext.is() && xAccContext->getAccessibleRole() ==
AccessibleRole::TABLE_CELL)
@@ -274,9 +272,8 @@ void SwAccessibleParagraph::InvalidateContent_( bool
bVisibleDataFired )
SwAccessibleContext* pPara = static_cast< SwAccessibleContext*
>(xparent.get());
if(pPara)
{
- AccessibleEventObject aParaEvent;
- aParaEvent.EventId = AccessibleEventId::VALUE_CHANGED;
- pPara->FireAccessibleEvent(aParaEvent);
+ pPara->FireAccessibleEvent(AccessibleEventId::VALUE_CHANGED,
uno::Any(),
+ uno::Any());
}
}
}
@@ -303,10 +300,7 @@ void SwAccessibleParagraph::InvalidateContent_( bool
bVisibleDataFired )
if (bNewIsBlockQuote != bOldIsBlockQuote || bNewIsHeading != bOldIsHeading)
{
// The role has changed
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::ROLE_CHANGED;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::ROLE_CHANGED, uno::Any(),
uno::Any());
}
if( sText == sOldText )
@@ -324,12 +318,8 @@ void SwAccessibleParagraph::InvalidateContent_( bool
bVisibleDataFired )
if( sNewDesc != sOldDesc )
{
// The text is changed
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::DESCRIPTION_CHANGED;
- aEvent.OldValue <<= sOldDesc;
- aEvent.NewValue <<= sNewDesc;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED,
uno::Any(sOldDesc),
+ uno::Any(sNewDesc));
}
}
@@ -359,12 +349,7 @@ void SwAccessibleParagraph::InvalidateCursorPos_()
if( pWin && pWin->HasFocus() && -1 == nOld )
FireStateChangedEvent( AccessibleStateType::FOCUSED, true );
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::CARET_CHANGED;
- aEvent.OldValue <<= nOld;
- aEvent.NewValue <<= nNew;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::CARET_CHANGED, uno::Any(nOld),
uno::Any(nNew));
if( pWin && pWin->HasFocus() && -1 == nNew )
FireStateChangedEvent( AccessibleStateType::FOCUSED, false );
@@ -374,10 +359,7 @@ void SwAccessibleParagraph::InvalidateCursorPos_()
bool bCurSelection = GetSelection(nStart,nEnd);
if(m_bLastHasSelection || bCurSelection )
{
- aEvent.EventId = AccessibleEventId::TEXT_SELECTION_CHANGED;
- aEvent.OldValue.clear();
- aEvent.NewValue.clear();
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::TEXT_SELECTION_CHANGED,
uno::Any(), uno::Any());
}
m_bLastHasSelection =bCurSelection;
diff --git a/sw/source/core/access/acctable.cxx
b/sw/source/core/access/acctable.cxx
index 360241005559..a7b3f217113c 100644
--- a/sw/source/core/access/acctable.cxx
+++ b/sw/source/core/access/acctable.cxx
@@ -524,11 +524,7 @@ void SwAccessibleTable::FireTableChangeEvent(
aModelChange.FirstColumn = 0;
aModelChange.LastColumn = rTableData.GetColumnCount() - 1;
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::TABLE_MODEL_CHANGED;
- aEvent.NewValue <<= aModelChange;
-
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::TABLE_MODEL_CHANGED, uno::Any(),
uno::Any(aModelChange));
}
const SwTableBox* SwAccessibleTable::GetTableBox( sal_Int64 nChildIndex ) const
@@ -645,11 +641,8 @@ void SwAccessibleTable::Notify(const SfxHint& rHint)
if( sOldName != GetName() )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::NAME_CHANGED;
- aEvent.OldValue <<= sOldName;
- aEvent.NewValue <<= GetName();
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::NAME_CHANGED,
uno::Any(sOldName),
+ uno::Any(GetName()));
}
const OUString sOldDesc( m_sDesc );
@@ -658,11 +651,8 @@ void SwAccessibleTable::Notify(const SfxHint& rHint)
m_sDesc = GetResource( STR_ACCESS_TABLE_DESC, &sNewTabName, &sArg2 );
if( m_sDesc != sOldDesc )
{
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::DESCRIPTION_CHANGED;
- aEvent.OldValue <<= sOldDesc;
- aEvent.NewValue <<= m_sDesc;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED,
uno::Any(sOldDesc),
+ uno::Any(m_sDesc));
}
}
}
@@ -1203,11 +1193,8 @@ void SwAccessibleTable::InvalidateChildPosOrSize( const
SwAccessibleChild& rChil
aModelChange.FirstColumn = 0;
aModelChange.LastColumn =
mpTableData->GetColumnCount() - 1;
- AccessibleEventObject aEvent;
- aEvent.EventId =
AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED;
- aEvent.NewValue <<= aModelChange;
-
- FireAccessibleEvent( aEvent );
+
FireAccessibleEvent(AccessibleEventId::TABLE_COLUMN_HEADER_CHANGED,
+ uno::Any(),
uno::Any(aModelChange));
}
}
else
@@ -1454,39 +1441,33 @@ sal_Int32 SAL_CALL SwAccessibleTable::getBackground()
void SwAccessibleTable::FireSelectionEvent( )
{
- AccessibleEventObject aEvent;
-
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_REMOVE;
-
for (const unotools::WeakReference<SwAccessibleContext>& rxCell :
m_vecCellRemove)
{
// fdo#57197: check if the object is still alive
rtl::Reference<SwAccessibleContext> const pAccCell(rxCell);
if (pAccCell)
{
- aEvent.NewValue <<= uno::Reference<XAccessible>(pAccCell);
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_REMOVE,
uno::Any(),
+
uno::Any(uno::Reference<XAccessible>(pAccCell)));
}
}
if (m_vecCellAdd.size() <= SELECTION_WITH_NUM)
{
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_ADD;
for (const unotools::WeakReference<SwAccessibleContext>& rxCell :
m_vecCellAdd)
{
// fdo#57197: check if the object is still alive
rtl::Reference<SwAccessibleContext> const pAccCell(rxCell);
if (pAccCell)
{
- aEvent.NewValue <<= uno::Reference<XAccessible>(pAccCell);
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_ADD,
uno::Any(),
+
uno::Any(uno::Reference<XAccessible>(pAccCell)));
}
}
}
else
{
- aEvent.EventId = AccessibleEventId::SELECTION_CHANGED_WITHIN;
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::SELECTION_CHANGED_WITHIN,
uno::Any(), uno::Any());
}
m_vecCellRemove.clear();
diff --git a/sw/source/core/access/acctextframe.cxx
b/sw/source/core/access/acctextframe.cxx
index c9eaf34dd94d..9a8ae5a336aa 100644
--- a/sw/source/core/access/acctextframe.cxx
+++ b/sw/source/core/access/acctextframe.cxx
@@ -77,11 +77,8 @@ void SwAccessibleTextFrame::Notify(const SfxHint& rHint)
{
auto rTitleChanged = static_cast<const sw::TitleChanged&>(rHint);
msTitle = rTitleChanged.m_sNew;
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::NAME_CHANGED;
- aEvent.OldValue <<= rTitleChanged.m_sOld;
- aEvent.NewValue <<= msTitle;
- FireAccessibleEvent( aEvent );
+ FireAccessibleEvent(AccessibleEventId::NAME_CHANGED,
uno::Any(rTitleChanged.m_sOld),
+ uno::Any(msTitle));
if(!pFlyFrameFormat ||
!pFlyFrameFormat->GetObjDescription().isEmpty())
break;
[[fallthrough]];
@@ -96,11 +93,8 @@ void SwAccessibleTextFrame::Notify(const SfxHint& rHint)
msDesc = msTitle;
if(msDesc == sOldDesc)
return;
- AccessibleEventObject aEvent;
- aEvent.EventId = AccessibleEventId::DESCRIPTION_CHANGED;
- aEvent.OldValue <<= sOldDesc;
- aEvent.NewValue <<= msDesc;
- FireAccessibleEvent(aEvent);
+ FireAccessibleEvent(AccessibleEventId::DESCRIPTION_CHANGED,
uno::Any(sOldDesc),
+ uno::Any(msDesc));
return;
}
}
