summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNoel Grandin <noel.grandin@collabora.co.uk>2023-05-17 11:28:48 +0200
committerNoel Grandin <noel.grandin@collabora.co.uk>2023-05-17 15:56:37 +0200
commit2e71891760093151bf094573dbf4ad1afe636262 (patch)
tree1cb56dc0650fc5aa06f57b4afef52f360e961de6
parentfcb348da642f7e5c41fe495cf6289f9992bfa1b9 (diff)
fire less "index hint out of range, ignoring" warnings
after commit 3b7db802731826b6cc3b55100470b0c61c1f2dfa Author: Noel Grandin <noel.grandin@collabora.co.uk> Date: Thu May 4 10:06:14 2023 +0200 tdf#105404 [API CHANGE] add index to accessiblity change event Change-Id: I52d6b7b7368b780c1c9fdf60628311cb02429eff Reviewed-on: https://gerrit.libreoffice.org/c/core/+/151872 Tested-by: Jenkins Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocument.cxx4
-rw-r--r--sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx8
-rw-r--r--sc/source/ui/Accessibility/AccessiblePageHeader.cxx2
-rw-r--r--sw/source/core/access/acccontext.cxx5
-rw-r--r--sw/source/core/access/accdoc.cxx2
-rw-r--r--sw/source/core/access/accmap.cxx3
6 files changed, 24 insertions, 0 deletions
diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx
index 870851691a43..6311947f144e 100644
--- a/sc/source/ui/Accessibility/AccessibleDocument.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx
@@ -432,6 +432,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.OldValue <<= uno::Reference<XAccessible>(pCurrentChild);
+ aEvent.IndexHint = -1;
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
@@ -449,6 +450,7 @@ bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurrentC
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.NewValue <<= uno::Reference<XAccessible>(pReplacement);
+ aEvent.IndexHint = -1;
mpAccessibleDocument->CommitChange(aEvent); // child is new - event
bResult = true;
@@ -1223,6 +1225,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, b
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.NewValue <<= Get(pShape);
+ aEvent.IndexHint = -1;
mpAccessibleDocument->CommitChange(aEvent); // new child - event
}
@@ -1250,6 +1253,7 @@ void ScChildrenShapes::RemoveShape(const uno::Reference<drawing::XShape>& xShape
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.OldValue <<= xOldAccessible;
+ aEvent.IndexHint = -1;
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
}
diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
index 8d968dfa3f07..077bdaead1db 100644
--- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
+++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx
@@ -440,6 +440,7 @@ struct ScChildGone
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccDoc);
aEvent.OldValue <<= xAccessible;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent); // gone child - event
}
@@ -458,6 +459,7 @@ struct ScChildNew
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(mpAccDoc);
aEvent.NewValue <<= xAccessible;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent); // new child - event
}
@@ -718,6 +720,7 @@ void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew)
aEvent.Source = uno::Reference<XAccessibleContext> (mpAccDoc);
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xAcc;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent);
++aNewItr;
}
@@ -728,6 +731,7 @@ void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew)
aEvent.Source = uno::Reference<XAccessibleContext> (mpAccDoc);
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.OldValue <<= xAcc;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent);
++aOldItr;
}
@@ -739,6 +743,7 @@ void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew)
aEvent.Source = uno::Reference<XAccessibleContext> (mpAccDoc);
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.OldValue <<= xAcc;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent);
++aOldItr;
}
@@ -749,6 +754,7 @@ void ScShapeChildren::FindChanged(ScShapeChildVec& rOld, ScShapeChildVec& rNew)
aEvent.Source = uno::Reference<XAccessibleContext> (mpAccDoc);
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xAcc;
+ aEvent.IndexHint = -1;
mpAccDoc->CommitChange(aEvent);
++aNewItr;
}
@@ -1205,6 +1211,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
aEvent.OldValue <<= xAcc;
+ aEvent.IndexHint = -1;
CommitChange(aEvent);
}
@@ -1238,6 +1245,7 @@ void ScAccessibleDocumentPagePreview::Notify( SfxBroadcaster& rBC, const SfxHint
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
aEvent.NewValue <<= xAcc;
+ aEvent.IndexHint = -1;
CommitChange(aEvent);
}
}
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
index 7e7b1b5f50b5..075f72b0c349 100644
--- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
+++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx
@@ -111,6 +111,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
aEvent.OldValue <<= uno::Reference<XAccessible>(aOldAreas[i]);
+ aEvent.IndexHint = -1;
CommitChange(aEvent); // child gone - event
aOldAreas[i]->dispose();
@@ -121,6 +122,7 @@ void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessibleContext >(this);
aEvent.NewValue <<= uno::Reference<XAccessible>(maAreas[i]);
+ aEvent.IndexHint = -1;
CommitChange(aEvent); // new child - event
}
diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx
index 3445114b2d78..46d1d12f35f1 100644
--- a/sw/source/core/access/acccontext.cxx
+++ b/sw/source/core/access/acccontext.cxx
@@ -307,6 +307,7 @@ void SwAccessibleContext::ScrolledIn()
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xThis;
+ aEvent.IndexHint = -1;
xParentImpl->FireAccessibleEvent( aEvent );
@@ -1028,6 +1029,7 @@ void SwAccessibleContext::DisposeShape( const SdrObject *pObj,
aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc( xAccImpl );
aEvent.OldValue <<= xAcc;
+ aEvent.IndexHint = -1;
FireAccessibleEvent( aEvent );
GetMap()->RemoveContext( pObj );
@@ -1044,6 +1046,7 @@ void SwAccessibleContext::ScrolledInShape( ::accessibility::AccessibleShape *pAc
aEvent.EventId = AccessibleEventId::CHILD;
uno::Reference< XAccessible > xAcc( pAccImpl );
aEvent.NewValue <<= xAcc;
+ aEvent.IndexHint = -1;
FireAccessibleEvent( aEvent );
if( !pAccImpl->GetState( AccessibleStateType::FOCUSED ) )
@@ -1087,6 +1090,7 @@ void SwAccessibleContext::Dispose(bool bRecursive, bool bCanSkipInvisible)
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.OldValue <<= xThis;
+ aEvent.IndexHint = -1;
pAcc->FireAccessibleEvent( aEvent );
}
@@ -1148,6 +1152,7 @@ void SwAccessibleContext::DisposeChild( const SwAccessibleChild& rChildFrameOrOb
uno::Reference< XAccessible > xAcc =
rChildFrameOrObj.GetWindow()->GetAccessible();
aEvent.OldValue <<= xAcc;
+ aEvent.IndexHint = -1;
FireAccessibleEvent( aEvent );
}
}
diff --git a/sw/source/core/access/accdoc.cxx b/sw/source/core/access/accdoc.cxx
index 298b4270e5d8..5785b50261f4 100644
--- a/sw/source/core/access/accdoc.cxx
+++ b/sw/source/core/access/accdoc.cxx
@@ -105,6 +105,7 @@ void SwAccessibleDocumentBase::AddChild( vcl::Window *pWin, bool bFireEvent )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= mpChildWin->GetAccessible();
+ aEvent.IndexHint = -1;
FireAccessibleEvent( aEvent );
}
}
@@ -120,6 +121,7 @@ void SwAccessibleDocumentBase::RemoveChild( vcl::Window *pWin )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.OldValue <<= mpChildWin->GetAccessible();
+ aEvent.IndexHint = -1;
FireAccessibleEvent( aEvent );
mpChildWin = nullptr;
diff --git a/sw/source/core/access/accmap.cxx b/sw/source/core/access/accmap.cxx
index 5cc2fd73801b..0650b3d29a93 100644
--- a/sw/source/core/access/accmap.cxx
+++ b/sw/source/core/access/accmap.cxx
@@ -2619,6 +2619,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xAccParentTab;
+ aEvent.IndexHint = -1;
xParentAccImplRoot->FireAccessibleEvent( aEvent );
}
}
@@ -2639,6 +2640,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= uno::Reference< XAccessible>(xParentAccImpl);
+ aEvent.IndexHint = -1;
xParentAccImplRoot->FireAccessibleEvent( aEvent );
}
}
@@ -2651,6 +2653,7 @@ void SwAccessibleMap::InvalidateCursorPosition( const SwFrame *pFrame )
AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= xAccShape;
+ aEvent.IndexHint = -1;
xParentAccImpl->FireAccessibleEvent( aEvent );
}
}