1 files changed, 11 insertions, 19 deletions
diff --git a/configmgr/source/childaccess.hxx b/configmgr/source/childaccess.hxx
index bbf4e25e7755..f3948a08ab50 100644
--- a/configmgr/source/childaccess.hxx
+++ b/configmgr/source/childaccess.hxx
@@ -17,16 +17,15 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_CONFIGMGR_SOURCE_CHILDACCESS_HXX
-#define INCLUDED_CONFIGMGR_SOURCE_CHILDACCESS_HXX
+#pragma once
 
 #include <sal/config.h>
 
 #include <memory>
+#include <optional>
 #include <vector>
 
 #include <com/sun/star/container/XChild.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/uno/Reference.hxx>
 #include <com/sun/star/uno/Sequence.hxx>
 #include <rtl/ref.hxx>
@@ -48,15 +47,13 @@ class Node;
 class RootAccess;
 
 class ChildAccess:
-    public Access, public css::container::XChild,
-    public css::lang::XUnoTunnel
+    public Access, public css::container::XChild
 {
 public:
-    static css::uno::Sequence< sal_Int8 > const & getTunnelId();
 
     ChildAccess(
         Components & components, rtl::Reference< RootAccess > const & root,
-        rtl::Reference< Access > const & parent, OUString const & name,
+        rtl::Reference< Access > const & parent, OUString name,
         rtl::Reference< Node > const & node);
 
     ChildAccess(
@@ -67,17 +64,17 @@ public:
     virtual std::vector<OUString> getRelativePath() override;
 
     virtual OUString getRelativePathRepresentation() override;
-    virtual rtl::Reference< Node > getNode() override;
+    virtual const rtl::Reference< Node > & getNode() override;
 
     virtual bool isFinalized() override;
 
-    virtual OUString getNameInternal() override;
+    virtual const OUString & getNameInternal() override;
 
     virtual rtl::Reference< RootAccess > getRootAccess() override;
     virtual rtl::Reference< Access > getParentAccess() override;
 
-    virtual void SAL_CALL acquire() throw () override;
-    virtual void SAL_CALL release() throw () override;
+    virtual void SAL_CALL acquire() noexcept override;
+    virtual void SAL_CALL release() noexcept override;
 
     virtual css::uno::Reference< css::uno::XInterface >
     SAL_CALL getParent() override;
@@ -85,15 +82,12 @@ public:
     virtual void SAL_CALL setParent(
         css::uno::Reference< css::uno::XInterface > const &) override;
 
-    virtual sal_Int64 SAL_CALL getSomething(
-        css::uno::Sequence< sal_Int8 > const & aIdentifier) override;
-
     void bind(
         rtl::Reference< RootAccess > const & root,
         rtl::Reference< Access > const & parent, OUString const & name)
-        throw ();
+        noexcept;
 
-    void unbind() throw ();
+    void unbind() noexcept;
 
     bool isInTransaction() const { return inTransaction_; }
     void committed();
@@ -126,7 +120,7 @@ private:
     rtl::Reference< Access > parent_; // null if free node
     OUString name_;
     rtl::Reference< Node > node_;
-    std::unique_ptr< css::uno::Any > changedValue_;
+    std::optional< css::uno::Any > changedValue_;
     bool inTransaction_;
         // to determine if a free node can be inserted underneath some root
     std::shared_ptr<osl::Mutex> lock_;
@@ -134,6 +128,4 @@ private:
 
 }
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */