summaryrefslogtreecommitdiff
path: root/svx
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2013-11-27 13:07:25 +0000
committerCaolán McNamara <caolanm@redhat.com>2013-11-27 15:38:58 +0000
commitdc3ef6db8865919c8c76599cc2abf0c1ecbacf24 (patch)
tree2ad2a69f34af94221f6108e9e444787654c451b0 /svx
parent06b3ccf8069c6478634dc218eaad3f02ecbfbc85 (diff)
restore GetChild, etc. we will need them again
Change-Id: Ic6da34e58975d85c84ded96fa90873558589f54a
Diffstat (limited to 'svx')
-rw-r--r--svx/source/accessibility/AccessibleShapeTreeInfo.cxx9
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.cxx16
-rw-r--r--svx/source/accessibility/ChildrenManagerImpl.hxx18
-rw-r--r--svx/source/accessibility/svxrectctaccessiblecontext.cxx6
-rw-r--r--svx/source/dialog/dlgctrl.cxx7
-rw-r--r--svx/source/inc/svxrectctaccessiblecontext.hxx3
6 files changed, 59 insertions, 0 deletions
diff --git a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
index 4526f48e0bb6..1e98cd553b76 100644
--- a/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
+++ b/svx/source/accessibility/AccessibleShapeTreeInfo.cxx
@@ -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)
{
diff --git a/svx/source/accessibility/ChildrenManagerImpl.cxx b/svx/source/accessibility/ChildrenManagerImpl.cxx
index ed9dc7cc8fb7..0cb097b56f7f 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.cxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.cxx
@@ -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.
diff --git a/svx/source/accessibility/ChildrenManagerImpl.hxx b/svx/source/accessibility/ChildrenManagerImpl.hxx
index c5d3c0739194..9e9929dce7ab 100644
--- a/svx/source/accessibility/ChildrenManagerImpl.hxx
+++ b/svx/source/accessibility/ChildrenManagerImpl.hxx
@@ -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
diff --git a/svx/source/accessibility/svxrectctaccessiblecontext.cxx b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
index 66812ff0ac68..55792db527b7 100644
--- a/svx/source/accessibility/svxrectctaccessiblecontext.cxx
+++ b/svx/source/accessibility/svxrectctaccessiblecontext.cxx
@@ -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 )
diff --git a/svx/source/dialog/dlgctrl.cxx b/svx/source/dialog/dlgctrl.cxx
index 330a9c93d05f..8ed8014cdfc2 100644
--- a/svx/source/dialog/dlgctrl.cxx
+++ b/svx/source/dialog/dlgctrl.cxx
@@ -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()
diff --git a/svx/source/inc/svxrectctaccessiblecontext.hxx b/svx/source/inc/svxrectctaccessiblecontext.hxx
index 5adcbf9e6400..f0e328a04d7f 100644
--- a/svx/source/inc/svxrectctaccessiblecontext.hxx
+++ b/svx/source/inc/svxrectctaccessiblecontext.hxx
@@ -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