summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorNoel Grandin <noel@peralex.com>2016-08-24 15:51:14 +0200
committerNoel Grandin <noel@peralex.com>2016-08-25 08:40:00 +0200
commitf360244e5ddb6b607e752a0df3c37ccefaec1d9f (patch)
tree38729115a06d88460ad0a413d1d210bae7889cbd /svx
parent3aa7db4586c53a0815b74cc514ff8a6541dc7e01 (diff)
drop enum IAccessibleViewForwarderListener::ChangeType
since only one of it's values was in use, and simplify the ViewForwarderChanged method as a consequence. Change-Id: I00544c9b0a601c01e49519be5bafe192c6f735f6
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleShape.cxx5
-rw-r--r--svx/source/accessibility/ChildrenManager.cxx6
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx21
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx5
-rw-r--r--svx/source/table/accessiblecell.cxx2
-rw-r--r--svx/source/table/accessiblecell.hxx2
6 files changed, 11 insertions, 30 deletions
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