3 files changed, 4 insertions, 5 deletions
diff --git a/configmgr/source/access.cxx b/configmgr/source/access.cxx
index 28ef91000fb1..816262d3f812 100644
--- a/configmgr/source/access.cxx
+++ b/configmgr/source/access.cxx
@@ -2162,7 +2162,7 @@ rtl::Reference< ChildAccess > Access::getFreeSetMember(
     if (tunnel.is()) {
         freeAcc.set(
             reinterpret_cast< ChildAccess * >(
-                tunnel->getSomething(ChildAccess::getTunnelId())));
+                tunnel->getSomething(ChildAccess::getUnoTunnelId())));
     }
     if (!freeAcc.is() || freeAcc->getParentAccess().is() ||
         (freeAcc->isInTransaction() &&
diff --git a/configmgr/source/childaccess.cxx b/configmgr/source/childaccess.cxx
index 221a98e24f67..87def984be17 100644
--- a/configmgr/source/childaccess.cxx
+++ b/configmgr/source/childaccess.cxx
@@ -55,7 +55,7 @@
 
 namespace configmgr {
 
-css::uno::Sequence< sal_Int8 > const & ChildAccess::getTunnelId()
+css::uno::Sequence< sal_Int8 > const & ChildAccess::getUnoTunnelId()
 {
     static const comphelper::UnoIdInit theChildAccessUnoTunnelId;
     return theChildAccessUnoTunnelId.getSeq();
@@ -164,8 +164,7 @@ sal_Int64 ChildAccess::getSomething(
     assert(thisIs(IS_ANY));
     osl::MutexGuard g(*lock_);
     checkLocalizedPropertyAccess();
-    return aIdentifier == getTunnelId()
-        ? reinterpret_cast< sal_Int64 >(this) : 0;
+    return comphelper::getSomethingImpl(aIdentifier, this);
 }
 
 void ChildAccess::bind(
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index 2c0eabfcaa4e..d063a28c9c9c 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -52,7 +52,7 @@ class ChildAccess:
     public css::lang::XUnoTunnel
 {
 public:
-    static css::uno::Sequence< sal_Int8 > const & getTunnelId();
+    static css::uno::Sequence< sal_Int8 > const & getUnoTunnelId();
 
     ChildAccess(
         Components & components, rtl::Reference< RootAccess > const & root,