diff options
18 files changed, 35 insertions, 91 deletions
diff --git a/include/svx/AccessibleShape.hxx b/include/svx/AccessibleShape.hxx index 8bafaec6b53f..8f961fffb111 100644 --- a/include/svx/AccessibleShape.hxx +++ b/include/svx/AccessibleShape.hxx @@ -323,8 +323,7 @@ public: throw (css::uno::RuntimeException, std::exception) override; //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; //===== lang::XEventListener ============================================ diff --git a/include/svx/ChildrenManager.hxx b/include/svx/ChildrenManager.hxx index bb1cab720a80..c85bd1b3428e 100644 --- a/include/svx/ChildrenManager.hxx +++ b/include/svx/ChildrenManager.hxx @@ -192,9 +192,7 @@ public: */ void RemoveFocus(); - void ViewForwarderChanged( - IAccessibleViewForwarderListener::ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder); + void ViewForwarderChanged(); private: rtl::Reference<ChildrenManagerImpl> mpImpl; diff --git a/include/svx/IAccessibleViewForwarderListener.hxx b/include/svx/IAccessibleViewForwarderListener.hxx index d9f27e80d415..b4195d1ed025 100644 --- a/include/svx/IAccessibleViewForwarderListener.hxx +++ b/include/svx/IAccessibleViewForwarderListener.hxx @@ -39,25 +39,11 @@ class IAccessibleViewForwarder; class IAccessibleViewForwarderListener { public: - /** Enumeration of the different change types. - */ - enum ChangeType {TRANSFORMATION, VISIBLE_AREA, STATE}; /** This method is called to indicate a change of the specified view - forwarder. - @param aChangeType - The type of the change. TRANSFORMATION indicates a change of - the coordinate transformation with a constant visible area. If - the visible area changes, just use VISIBLE_AREA. This changes - the transformation implicitly. The value STATE indicates a - change of the validity state. Check the IsValid method of the - view forwarder before doing further calls. - @param pViewForwarder - The modified view forwarder. It is specified just in case that - there is more than one view forwarder in use at the same time. + forwarder, specifically, a change in visible area. */ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) = 0; + virtual void ViewForwarderChanged() = 0; protected: ~IAccessibleViewForwarderListener() {} diff --git a/sc/source/ui/Accessibility/AccessibleDocument.cxx b/sc/source/ui/Accessibility/AccessibleDocument.cxx index 9c787591ee28..703f61db7b64 100644 --- a/sc/source/ui/Accessibility/AccessibleDocument.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocument.cxx @@ -1377,13 +1377,12 @@ namespace { struct ScVisAreaChanged { - ScAccessibleDocument* mpAccDoc; - explicit ScVisAreaChanged(ScAccessibleDocument* pAccDoc) : mpAccDoc(pAccDoc) {} + explicit ScVisAreaChanged() {} void operator() (const ScAccessibleShapeData* pAccShapeData) const { if (pAccShapeData && pAccShapeData->pAccShape.is()) { - pAccShapeData->pAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpAccDoc); + pAccShapeData->pAccShape->ViewForwarderChanged(); } } }; @@ -1391,7 +1390,7 @@ namespace void ScChildrenShapes::VisAreaChanged() const { - ScVisAreaChanged aVisAreaChanged(mpAccessibleDocument); + ScVisAreaChanged aVisAreaChanged; std::for_each(maZOrderedShapes.begin(), maZOrderedShapes.end(), aVisAreaChanged); } diff --git a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx index 604eb894476a..d3a599c305c4 100644 --- a/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx +++ b/sc/source/ui/Accessibility/AccessibleDocumentPagePreview.cxx @@ -806,7 +806,7 @@ namespace { if (rAccShapeData.mpAccShape.is()) { - rAccShapeData.mpAccShape->ViewForwarderChanged(::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, mpViewForwarder); + rAccShapeData.mpAccShape->ViewForwarderChanged(); } } }; diff --git a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx index 1f6e89dc84b1..2dbceddf663d 100644 --- a/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx +++ b/sd/source/ui/accessibility/AccessibleDocumentViewBase.cxx @@ -212,7 +212,7 @@ IMPL_LINK_TYPED(AccessibleDocumentViewBase, WindowChildEventListener, //===== IAccessibleViewForwarderListener ==================================== -void AccessibleDocumentViewBase::ViewForwarderChanged(ChangeType, const IAccessibleViewForwarder* ) +void AccessibleDocumentViewBase::ViewForwarderChanged() { // Empty } @@ -558,9 +558,7 @@ void SAL_CALL if( IsDisposed() ) return; - ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - &maViewForwarder); + ViewForwarderChanged(); } void SAL_CALL @@ -570,9 +568,7 @@ void SAL_CALL if( IsDisposed() ) return; - ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - &maViewForwarder); + ViewForwarderChanged(); } void SAL_CALL @@ -582,9 +578,7 @@ void SAL_CALL if( IsDisposed() ) return; - ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - &maViewForwarder); + ViewForwarderChanged(); } void SAL_CALL @@ -594,9 +588,7 @@ void SAL_CALL if( IsDisposed() ) return; - ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - &maViewForwarder); + ViewForwarderChanged(); } //===== XFocusListener ================================================== diff --git a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx index c5fb81b7e424..4f2dc6ec1be6 100644 --- a/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx +++ b/sd/source/ui/accessibility/AccessibleDrawDocumentView.cxx @@ -123,12 +123,11 @@ void AccessibleDrawDocumentView::Init() mpChildrenManager->UpdateSelection (); } -void AccessibleDrawDocumentView::ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) +void AccessibleDrawDocumentView::ViewForwarderChanged() { - AccessibleDocumentViewBase::ViewForwarderChanged (aChangeType, pViewForwarder); + AccessibleDocumentViewBase::ViewForwarderChanged(); if (mpChildrenManager != nullptr) - mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder); + mpChildrenManager->ViewForwarderChanged(); } /** The page shape is created on every call at the moment (provided that @@ -335,9 +334,7 @@ void SAL_CALL { OSL_TRACE (" visible area changed"); if (mpChildrenManager != nullptr) - mpChildrenManager->ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - &maViewForwarder); + mpChildrenManager->ViewForwarderChanged(); } else if (rEventObject.PropertyName == "ActiveLayer") { diff --git a/sd/source/ui/accessibility/AccessibleOutlineView.cxx b/sd/source/ui/accessibility/AccessibleOutlineView.cxx index 7fb492eecdac..ba187e8059d4 100644 --- a/sd/source/ui/accessibility/AccessibleOutlineView.cxx +++ b/sd/source/ui/accessibility/AccessibleOutlineView.cxx @@ -103,10 +103,9 @@ void AccessibleOutlineView::Init() AccessibleDocumentViewBase::Init (); } -void AccessibleOutlineView::ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) +void AccessibleOutlineView::ViewForwarderChanged() { - AccessibleDocumentViewBase::ViewForwarderChanged (aChangeType, pViewForwarder); + AccessibleDocumentViewBase::ViewForwarderChanged(); UpdateChildren(); } diff --git a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx index 9f5bf097aff3..1e3e5c03d497 100644 --- a/sd/source/ui/inc/AccessibleDocumentViewBase.hxx +++ b/sd/source/ui/inc/AccessibleDocumentViewBase.hxx @@ -134,8 +134,7 @@ public: windowResized... methods it will be sufficient in most cases just to override this method. */ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; //===== XAccessibleContext ============================================== diff --git a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx index 0da01c7b8083..a67a0927f21e 100644 --- a/sd/source/ui/inc/AccessibleDrawDocumentView.hxx +++ b/sd/source/ui/inc/AccessibleDrawDocumentView.hxx @@ -54,8 +54,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; //===== XAccessibleContext ============================================== diff --git a/sd/source/ui/inc/AccessibleOutlineView.hxx b/sd/source/ui/inc/AccessibleOutlineView.hxx index 9de60128a54d..ffcdc3b75ed7 100644 --- a/sd/source/ui/inc/AccessibleOutlineView.hxx +++ b/sd/source/ui/inc/AccessibleOutlineView.hxx @@ -52,8 +52,7 @@ public: //===== IAccessibleViewForwarderListener ================================ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; //===== XAccessibleContext ============================================== diff --git a/svx/source/accessibility/AccessibleShape.cxx b/svx/source/accessibility/AccessibleShape.cxx index 21708ad6af79..260af70fa91d 100644 --- a/svx/source/accessibility/AccessibleShape.cxx +++ b/svx/source/accessibility/AccessibleShape.cxx @@ -1087,8 +1087,7 @@ sal_Int64 SAL_CALL } // IAccessibleViewForwarderListener -void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) +void AccessibleShape::ViewForwarderChanged() { // Inform all listeners that the graphical representation (i.e. size // and/or position) of the shape has changed. @@ -1098,7 +1097,7 @@ void AccessibleShape::ViewForwarderChanged (ChangeType aChangeType, // Tell children manager of the modified view forwarder. if (mpChildrenManager != nullptr) - mpChildrenManager->ViewForwarderChanged (aChangeType, pViewForwarder); + mpChildrenManager->ViewForwarderChanged(); // update our children that our screen position might have changed if( mpText ) diff --git a/svx/source/accessibility/ChildrenManager.cxx b/svx/source/accessibility/ChildrenManager.cxx index 5634fa424a39..c7938a17242f 100644 --- a/svx/source/accessibility/ChildrenManager.cxx +++ b/svx/source/accessibility/ChildrenManager.cxx @@ -115,11 +115,9 @@ void ChildrenManager::RemoveFocus() } // IAccessibleViewForwarderListener -void ChildrenManager::ViewForwarderChanged( - IAccessibleViewForwarderListener::ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) +void ChildrenManager::ViewForwarderChanged() { - mpImpl->ViewForwarderChanged (aChangeType, pViewForwarder); + mpImpl->ViewForwarderChanged(); } } // end of namespace accessibility diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx index ff5bc2527b30..2831775fff98 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.cxx +++ b/svx/source/accessibility/ChildrenManagerImpl.cxx @@ -403,9 +403,7 @@ void ChildrenManagerImpl::SendVisibleAreaEvents ( // as a result of a change of the view forwarder). AccessibleShape* pShape = I->GetAccessibleShape (); if (pShape != nullptr) - pShape->ViewForwarderChanged ( - IAccessibleViewForwarderListener::VISIBLE_AREA, - maShapeTreeInfo.GetViewForwarder()); + pShape->ViewForwarderChanged(); } } @@ -729,22 +727,9 @@ void SAL_CALL ChildrenManagerImpl::disposing() } // IAccessibleViewForwarderListener -void ChildrenManagerImpl::ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) +void ChildrenManagerImpl::ViewForwarderChanged() { - if (aChangeType == IAccessibleViewForwarderListener::VISIBLE_AREA) - Update (false); - else - { - SolarMutexGuard g; - ChildDescriptorListType::const_iterator aEnd = maVisibleChildren.end(); - for (ChildDescriptorListType::iterator I=maVisibleChildren.begin(); I != aEnd; ++I) - { - AccessibleShape* pShape = I->GetAccessibleShape(); - if (pShape != nullptr) - pShape->ViewForwarderChanged (aChangeType, pViewForwarder); - } - } + Update(false); } // IAccessibleParent diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx index eadec9b469f1..757953f6a019 100644 --- a/svx/source/accessibility/ChildrenManagerImpl.hxx +++ b/svx/source/accessibility/ChildrenManagerImpl.hxx @@ -262,8 +262,7 @@ public: @param pViewForwarder The modified view forwarder. Use this one from now on. */ - virtual void ViewForwarderChanged (ChangeType aChangeType, - const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; // IAccessibleParent /** Replace the specified child with a replacement. @@ -393,7 +392,7 @@ private: Events are sent to all entries of this list that already contain an accessible object. */ - void SendVisibleAreaEvents (ChildDescriptorListType& raChildList); + static void SendVisibleAreaEvents (ChildDescriptorListType& raChildList); /** If children have to be created immediately and not on demand the create the missing accessible objects now. diff --git a/svx/source/table/accessiblecell.cxx b/svx/source/table/accessiblecell.cxx index 47245fa2de70..5dcb29f45a60 100644 --- a/svx/source/table/accessiblecell.cxx +++ b/svx/source/table/accessiblecell.cxx @@ -492,7 +492,7 @@ Sequence<OUString> SAL_CALL AccessibleCell::getSupportedServiceNames() throw (Ru // IAccessibleViewForwarderListener -void AccessibleCell::ViewForwarderChanged (ChangeType /*aChangeType*/, const IAccessibleViewForwarder* /*pViewForwarder*/) +void AccessibleCell::ViewForwarderChanged() { // Inform all listeners that the graphical representation (i.e. size // and/or position) of the shape has changed. diff --git a/svx/source/table/accessiblecell.hxx b/svx/source/table/accessiblecell.hxx index df9de137c21b..d001ef3130b5 100644 --- a/svx/source/table/accessiblecell.hxx +++ b/svx/source/table/accessiblecell.hxx @@ -101,7 +101,7 @@ public: virtual css::uno::Sequence< OUString> SAL_CALL getSupportedServiceNames() throw(css::uno::RuntimeException, std::exception) override; // IAccessibleViewForwarderListener - virtual void ViewForwarderChanged (ChangeType aChangeType, const IAccessibleViewForwarder* pViewForwarder) override; + virtual void ViewForwarderChanged() override; // Misc diff --git a/sw/source/core/access/acccontext.cxx b/sw/source/core/access/acccontext.cxx index 8fb2e30f7bfa..f3d3285b5490 100644 --- a/sw/source/core/access/acccontext.cxx +++ b/sw/source/core/access/acccontext.cxx @@ -227,9 +227,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame, { case Action::SCROLLED: case Action::SCROLLED_WITHIN: - xAccImpl->ViewForwarderChanged( - ::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, - GetMap() ); + xAccImpl->ViewForwarderChanged(); break; case Action::SCROLLED_IN: ScrolledInShape( rLower.GetDrawObject(), @@ -237,9 +235,7 @@ void SwAccessibleContext::ChildrenScrolled( const SwFrame *pFrame, break; case Action::SCROLLED_OUT: { - xAccImpl->ViewForwarderChanged( - ::accessibility::IAccessibleViewForwarderListener::VISIBLE_AREA, - GetMap() ); + xAccImpl->ViewForwarderChanged(); // this DisposeShape call was removed by // IAccessibility2 implementation // without giving any reason why |