strepsirrhini/office-gobmx
9
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

INTEGRATION: CWS dr51 (1.68.86); FILE MERGED

Browse source 
2006/10/30 10:05:42 dr 1.68.86.1: #i68213# set correct event source
This commit is contained in:
Ivo Hinkelmann 2006-12-19 12:25:48 +00:00
parent ec6adfb344
commit 5829b559bc
1 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
sc/source/ui/Accessibility/AccessibleDocument.cxx
View file

@ -4,9 +4,9 @@
* *
* $RCSfile: AccessibleDocument.cxx,v $ * $RCSfile: AccessibleDocument.cxx,v $
* *
* $Revision: 1.68 $ * $Revision: 1.69 $
* *
* last change: $Author: kz $ $Date: 2006-07-21 13:05:34 $ * last change: $Author: ihi $ $Date: 2006-12-19 13:25:48 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -519,7 +519,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr
DBG_ASSERT((*aItr)->pAccShape == pCurrentChild, "wrong child found"); DBG_ASSERT((*aItr)->pAccShape == pCurrentChild, "wrong child found");
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessible >(mpAccessibleDocument); aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.OldValue <<= uno::makeAny(uno::Reference<XAccessible>(pCurrentChild)); aEvent.OldValue <<= uno::makeAny(uno::Reference<XAccessible>(pCurrentChild));
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
@ -529,7 +529,7 @@ sal_Bool ScChildrenShapes::ReplaceChild (::accessibility::AccessibleShape* pCurr
(*aItr)->pAccShape = pReplacement; (*aItr)->pAccShape = pReplacement;
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessible >(mpAccessibleDocument); aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.NewValue <<= uno::makeAny(uno::Reference<XAccessible>(pReplacement)); aEvent.NewValue <<= uno::makeAny(uno::Reference<XAccessible>(pReplacement));
mpAccessibleDocument->CommitChange(aEvent); // child is new - event mpAccessibleDocument->CommitChange(aEvent); // child is new - event
@ -1217,7 +1217,7 @@ void ScChildrenShapes::AddShape(const uno::Reference<drawing::XShape>& xShape, s
{ {
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessible >(mpAccessibleDocument); aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.NewValue <<= Get(aNewItr - maZOrderedShapes.begin()); aEvent.NewValue <<= Get(aNewItr - maZOrderedShapes.begin());
mpAccessibleDocument->CommitChange(aEvent); // new child - event mpAccessibleDocument->CommitChange(aEvent); // new child - event
@ -1241,7 +1241,7 @@ void ScChildrenShapes::RemoveShape(const uno::Reference<drawing::XShape>& xShape
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.Source = uno::Reference< XAccessible >(mpAccessibleDocument); aEvent.Source = uno::Reference< XAccessibleContext >(mpAccessibleDocument);
aEvent.OldValue <<= uno::makeAny(xOldAccessible); aEvent.OldValue <<= uno::makeAny(xOldAccessible);
mpAccessibleDocument->CommitChange(aEvent); // child is gone - event mpAccessibleDocument->CommitChange(aEvent); // child is gone - event
@ -1476,7 +1476,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN; aEvent.EventId = AccessibleEventId::INVALIDATE_ALL_CHILDREN;
aEvent.Source = uno::Reference< XAccessible >(this); aEvent.Source = uno::Reference< XAccessibleContext >(this);
CommitChange(aEvent); // all childs changed CommitChange(aEvent); // all childs changed
} }
else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER) else if (rRef.GetId() == SC_HINT_ACC_MAKEDRAWLAYER)
@ -1530,7 +1530,7 @@ void ScAccessibleDocument::Notify( SfxBroadcaster& rBC, const SfxHint& rHint )
{ {
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::BOUNDRECT_CHANGED; aEvent.EventId = AccessibleEventId::BOUNDRECT_CHANGED;
aEvent.Source = uno::Reference< XAccessible >(this); aEvent.Source = uno::Reference< XAccessibleContext >(this);
CommitChange(aEvent); CommitChange(aEvent);
@ -1572,7 +1572,7 @@ void SAL_CALL ScAccessibleDocument::selectionChanged( const lang::EventObject& a
{ {
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.EventId = AccessibleEventId::SELECTION_CHANGED; aEvent.EventId = AccessibleEventId::SELECTION_CHANGED;
aEvent.Source = uno::Reference< XAccessible >(this); aEvent.Source = uno::Reference< XAccessibleContext >(this);
CommitChange(aEvent); CommitChange(aEvent);
} }
@ -2163,6 +2163,7 @@ void ScAccessibleDocument::AddChild(const uno::Reference<XAccessible>& xAcc, sal
if( bFireEvent ) if( bFireEvent )
{ {
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.Source = uno::Reference<XAccessibleContext>(this);
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.NewValue <<= mxTempAcc; aEvent.NewValue <<= mxTempAcc;
CommitChange( aEvent ); CommitChange( aEvent );
@ -2179,6 +2180,7 @@ void ScAccessibleDocument::RemoveChild(const uno::Reference<XAccessible>& xAcc,
if( bFireEvent ) if( bFireEvent )
{ {
AccessibleEventObject aEvent; AccessibleEventObject aEvent;
aEvent.Source = uno::Reference<XAccessibleContext>(this);
aEvent.EventId = AccessibleEventId::CHILD; aEvent.EventId = AccessibleEventId::CHILD;
aEvent.OldValue <<= mxTempAcc; aEvent.OldValue <<= mxTempAcc;
CommitChange( aEvent ); CommitChange( aEvent );