[Libreoffice-commits] core.git: include/toolkit toolkit/source

[Stephan Bergmann (via logerrit)]

 include/toolkit/awt/vclxaccessiblecomponent.hxx |   10 ----------
 toolkit/source/awt/vclxaccessiblecomponent.cxx  |   14 +++-----------
 2 files changed, 3 insertions(+), 21 deletions(-)

New commits:
commit a58abb4296c50228ebd5510e50363072e9a96774
Author:     Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon Jan 9 11:43:36 2023 +0100
Commit:     Stephan Bergmann <sberg...@redhat.com>
CommitDate: Mon Jan 9 15:15:41 2023 +0000

    Clean up VCLXAccessibleComponent::getAccessibleParent
    
    ...after 21e0d8162a0e683558c4d042ce688fc9a6833809 "loplugin:unusedfields" 
had
    dropped the base class
    OAccessibleImplementationAccess::implGetForeignControlledParent
    
    Change-Id: I753aad41baaa0ac1d1f7eb0a6084993df5a58d5f
    Reviewed-on: https://gerrit.libreoffice.org/c/core/+/145197
    Tested-by: Jenkins
    Reviewed-by: Stephan Bergmann <sberg...@redhat.com>

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 );