diff options
Diffstat (limited to 'sc/source/ui/Accessibility/AccessiblePageHeader.cxx')
| -rw-r--r-- | sc/source/ui/Accessibility/AccessiblePageHeader.cxx | 74 |
1 files changed, 35 insertions, 39 deletions
diff --git a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx index eda119923b45..956675a70fcb 100644 --- a/sc/source/ui/Accessibility/AccessiblePageHeader.cxx +++ b/sc/source/ui/Accessibility/AccessiblePageHeader.cxx @@ -35,7 +35,7 @@ #include <com/sun/star/accessibility/AccessibleEventId.hpp> #include <vcl/window.hxx> -#include <svl/smplhint.hxx> +#include <svl/hint.hxx> #include <vcl/svapp.hxx> #include <unotools/accessiblestatesethelper.hxx> #include <svl/style.hxx> @@ -122,51 +122,47 @@ void SAL_CALL ScAccessiblePageHeader::disposing() void ScAccessiblePageHeader::Notify( SfxBroadcaster& rBC, const SfxHint& rHint ) { - const SfxSimpleHint* pSimpleHint = dynamic_cast<const SfxSimpleHint*>( &rHint ); - if (pSimpleHint) + // only notify if child exist, otherwise it is not necessary + if (rHint.GetId() == SC_HINT_DATACHANGED) { - // only notify if child exist, otherwise it is not necessary - if (pSimpleHint->GetId() == SC_HINT_DATACHANGED) + ScHFAreas aOldAreas(maAreas); + std::for_each(aOldAreas.begin(), aOldAreas.end(), Acquire()); + mnChildCount = -1; + getAccessibleChildCount(); + for (sal_uInt8 i = 0; i < MAX_AREAS; ++i) { - ScHFAreas aOldAreas(maAreas); - std::for_each(aOldAreas.begin(), aOldAreas.end(), Acquire()); - mnChildCount = -1; - getAccessibleChildCount(); - for (sal_uInt8 i = 0; i < MAX_AREAS; ++i) - { - if ((aOldAreas[i] && maAreas[i] && !ScGlobal::EETextObjEqual(aOldAreas[i]->GetEditTextObject(), maAreas[i]->GetEditTextObject())) || + if ((aOldAreas[i] && maAreas[i] && !ScGlobal::EETextObjEqual(aOldAreas[i]->GetEditTextObject(), maAreas[i]->GetEditTextObject())) || (aOldAreas[i] && !maAreas[i]) || (!aOldAreas[i] && maAreas[i])) + { + if (aOldAreas[i] && aOldAreas[i]->GetEditTextObject()) { - if (aOldAreas[i] && aOldAreas[i]->GetEditTextObject()) - { - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::CHILD; - aEvent.Source = uno::Reference< XAccessibleContext >(this); - aEvent.OldValue = uno::makeAny(uno::Reference<XAccessible>(aOldAreas[i])); - - CommitChange(aEvent); // child gone - event - aOldAreas[i]->dispose(); - } - if (maAreas[i] && maAreas[i]->GetEditTextObject()) - { - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::CHILD; - aEvent.Source = uno::Reference< XAccessibleContext >(this); - aEvent.NewValue = uno::makeAny(uno::Reference<XAccessible>(maAreas[i])); - - CommitChange(aEvent); // new child - event - } + AccessibleEventObject aEvent; + aEvent.EventId = AccessibleEventId::CHILD; + aEvent.Source = uno::Reference< XAccessibleContext >(this); + aEvent.OldValue = uno::makeAny(uno::Reference<XAccessible>(aOldAreas[i])); + + CommitChange(aEvent); // child gone - event + aOldAreas[i]->dispose(); + } + if (maAreas[i] && maAreas[i]->GetEditTextObject()) + { + AccessibleEventObject aEvent; + aEvent.EventId = AccessibleEventId::CHILD; + aEvent.Source = uno::Reference< XAccessibleContext >(this); + aEvent.NewValue = uno::makeAny(uno::Reference<XAccessible>(maAreas[i])); + + CommitChange(aEvent); // new child - event } } - std::for_each(aOldAreas.begin(), aOldAreas.end(), Release()); - } - else if (pSimpleHint->GetId() == SC_HINT_ACC_VISAREACHANGED) - { - AccessibleEventObject aEvent; - aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED; - aEvent.Source = uno::Reference< XAccessibleContext >(this); - CommitChange(aEvent); } + std::for_each(aOldAreas.begin(), aOldAreas.end(), Release()); + } + else if (rHint.GetId() == SC_HINT_ACC_VISAREACHANGED) + { + AccessibleEventObject aEvent; + aEvent.EventId = AccessibleEventId::VISIBLE_DATA_CHANGED; + aEvent.Source = uno::Reference< XAccessibleContext >(this); + CommitChange(aEvent); } ScAccessibleContextBase::Notify(rBC, rHint); |