Kaydet (Commit) dc3ef6db authored tarafından Caolán McNamara's avatar Caolán McNamara

restore GetChild, etc. we will need them again

Change-Id: Ic6da34e58975d85c84ded96fa90873558589f54a
üst 06b3ccf8
......@@ -70,6 +70,12 @@ public:
void SetDocumentWindow (const ::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleComponent>& rxViewWindow);
/** Deprecated. Don't use this method.
*/
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessibleComponent>
GetDocumentWindow (void) const;
/** Deprecated. Use the correctly named SetModelBroadcaster method
instead.
*/
......
......@@ -198,6 +198,7 @@ public:
Color GetPixelColor() const { return aPixelColor; }
Color GetBackgroundColor() const { return aBackgroundColor; }
sal_uInt16 GetBitmapPixel( const sal_uInt16 nPixelNumber );
sal_uInt16* GetBitmapPixelPtr() { return pPixel; }
void SetPaintable( sal_Bool bTmp ) { bPaintable = bTmp; }
......
......@@ -86,6 +86,15 @@ void AccessibleShapeTreeInfo::SetDocumentWindow (
uno::Reference<XAccessibleComponent>
AccessibleShapeTreeInfo::GetDocumentWindow (void) const
{
return mxDocumentWindow;
}
void AccessibleShapeTreeInfo::SetControllerBroadcaster (
const uno::Reference<document::XEventBroadcaster>& rxControllerBroadcaster)
{
......
......@@ -175,6 +175,22 @@ uno::Reference<XAccessible>
uno::Reference<XAccessible>
ChildrenManagerImpl::GetChild (const uno::Reference<drawing::XShape>& xShape)
throw (uno::RuntimeException)
{
ChildDescriptorListType::iterator I, aEnd = maVisibleChildren.end();
for (I = maVisibleChildren.begin(); I != aEnd; ++I)
{
if ( I->mxShape.get() == xShape.get() )
return I->mxAccessibleShape;
}
return uno::Reference<XAccessible> ();
}
/** Find all shapes among the specified shapes that lie fully or partially
inside the visible area. Put those shapes into the cleared cache. The
corresponding accessible objects will be created on demand.
......
......@@ -155,6 +155,24 @@ public:
GetChild (ChildDescriptor& aChildDescriptor,sal_Int32 _nIndex)
throw (::com::sun::star::uno::RuntimeException);
/** Return the requested accessible child given a shape. This method
searches the list of descriptors for the one that holds the
association of the given shape to the requested accessible object
and returns that. If no such descriptor is found that is
interpreted so that the specified shape is not visible at the moment.
@param xShape
The shape for which to return the associated accessible object.
@return
Returns a reference to the requested accessible child. The
reference is empty if there is no shape descriptor that
associates the shape with an accessible object.
*/
::com::sun::star::uno::Reference<
::com::sun::star::accessibility::XAccessible>
GetChild (const ::com::sun::star::uno::Reference<
::com::sun::star::drawing::XShape>& xShape)
throw (::com::sun::star::uno::RuntimeException);
/** Update the child manager. Take care of a modified set of children
and modified visible area. This method can optimize the update
process with respect separate updates of a modified children list
......
......@@ -644,6 +644,12 @@ void SvxRectCtlAccessibleContext::selectChild( RECT_POINT eButton )
selectChild( PointToIndex( eButton, mbAngleMode ) );
}
void SvxRectCtlAccessibleContext::CommitChange( const AccessibleEventObject& rEvent )
{
if (mnClientId)
comphelper::AccessibleEventNotifier::addEvent( mnClientId, rEvent );
}
void SAL_CALL SvxRectCtlAccessibleContext::disposing()
{
if( !rBHelper.bDisposed )
......
......@@ -923,6 +923,13 @@ void SvxPixelCtl::SetXBitmap( const BitmapEx& rBitmapEx )
}
}
// Returns a specific pixel
sal_uInt16 SvxPixelCtl::GetBitmapPixel( const sal_uInt16 nPixel )
{
return( *( pPixel + nPixel ) );
}
// Resets to the original state of the control
void SvxPixelCtl::Reset()
......
......@@ -261,6 +261,9 @@ protected:
/// @Return the object's current bounding box relative to the parent object.
virtual Rectangle GetBoundingBox( void ) throw( ::com::sun::star::uno::RuntimeException );
/// Calls all Listener to tell they the change.
void CommitChange( const com::sun::star::accessibility::AccessibleEventObject& rEvent );
virtual void SAL_CALL disposing();
/// @returns true if it's disposed or in disposing
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment