diff options
| -rw-r--r-- | include/toolkit/awt/vclxaccessiblecomponent.hxx | 10 | ||||
| -rw-r--r-- | toolkit/source/awt/vclxaccessiblecomponent.cxx | 14 |
2 files changed, 3 insertions, 21 deletions
diff --git a/include/toolkit/awt/vclxaccessiblecomponent.hxx b/include/toolkit/awt/vclxaccessiblecomponent.hxx index 7c299edf6d65..b69f62b6871f 100644 --- a/include/toolkit/awt/vclxaccessiblecomponent.hxx +++ b/include/toolkit/awt/vclxaccessiblecomponent.hxx @@ -117,16 +117,6 @@ public: protected: // base class overridables css::awt::Rectangle implGetBounds( ) override; - -private: - /** we may be reparented (if external components use OAccessibleImplementationAccess base class), - so this method here returns the parent in the VCL world, in opposite to the parent - an external component gave us - @precond - the caller must ensure thread safety, i.e. our mutex must be locked - */ - css::uno::Reference< css::accessibility::XAccessible > - getVclParent() const; }; /* ---------------------------------------------------------- diff --git a/toolkit/source/awt/vclxaccessiblecomponent.cxx b/toolkit/source/awt/vclxaccessiblecomponent.cxx index aef0eb1c3852..666ba75bde6a 100644 --- a/toolkit/source/awt/vclxaccessiblecomponent.cxx +++ b/toolkit/source/awt/vclxaccessiblecomponent.cxx @@ -553,8 +553,10 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessi return xAcc; } -uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclParent() const +uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent( ) { + OExternalLockGuard aGuard( this ); + uno::Reference< accessibility::XAccessible > xAcc; if ( GetWindow() ) { @@ -565,16 +567,6 @@ uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getVclPare return xAcc; } -uno::Reference< accessibility::XAccessible > VCLXAccessibleComponent::getAccessibleParent( ) -{ - OExternalLockGuard aGuard( this ); - - // we do _not_ have a foreign-controlled parent -> default to our VCL parent - uno::Reference< accessibility::XAccessible > xAcc = getVclParent(); - - return xAcc; -} - sal_Int64 VCLXAccessibleComponent::getAccessibleIndexInParent( ) { OExternalLockGuard aGuard( this ); |