1 files changed, 8 insertions, 25 deletions
diff --git a/sw/source/core/inc/unoidx.hxx b/sw/source/core/inc/unoidx.hxx
index c87460a3dd69..89bdfc390bfe 100644
--- a/sw/source/core/inc/unoidx.hxx
+++ b/sw/source/core/inc/unoidx.hxx
@@ -16,11 +16,10 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOIDX_HXX
+
+#pragma once
 
 #include <com/sun/star/lang/XServiceInfo.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
@@ -41,7 +40,6 @@ class SwTOXType;
 
 typedef ::cppu::ImplInheritanceHelper
 <   ::sfx2::MetadatableMixin
-,   css::lang::XUnoTunnel
 ,   css::lang::XServiceInfo
 ,   css::beans::XPropertySet
 ,   css::container::XNamed
@@ -49,7 +47,7 @@ typedef ::cppu::ImplInheritanceHelper
 ,   css::text::XDocumentIndex
 > SwXDocumentIndex_Base;
 
-class SwXDocumentIndex
+class SwXDocumentIndex final
     : public SwXDocumentIndex_Base
 {
 
@@ -70,7 +68,7 @@ private:
 
 public:
 
-    static css::uno::Reference< css::text::XDocumentIndex>
+    static rtl::Reference<SwXDocumentIndex>
         CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection * pSection,
                 TOXTypes eTypes = TOX_INDEX);
 
@@ -79,12 +77,6 @@ public:
     virtual css::uno::Reference< css::frame::XModel >
         GetModel() override;
 
-    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-
-    // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(
@@ -143,13 +135,12 @@ public:
 };
 
 typedef ::cppu::WeakImplHelper
-<   css::lang::XUnoTunnel
-,   css::lang::XServiceInfo
+<   css::lang::XServiceInfo
 ,   css::beans::XPropertySet
 ,   css::text::XDocumentIndexMark
 > SwXDocumentIndexMark_Base;
 
-class SwXDocumentIndexMark
+class SwXDocumentIndexMark final
     : public SwXDocumentIndexMark_Base
 {
 
@@ -161,23 +152,17 @@ private:
     virtual ~SwXDocumentIndexMark() override;
 
     SwXDocumentIndexMark(SwDoc & rDoc,
-                SwTOXType & rType, SwTOXMark & rMark);
+                const SwTOXType & rType, const SwTOXMark & rMark);
 
     /// descriptor
     SwXDocumentIndexMark(const TOXTypes eToxType);
 
 public:
 
-    static css::uno::Reference< css::text::XDocumentIndexMark>
+    static rtl::Reference<SwXDocumentIndexMark>
         CreateXDocumentIndexMark(SwDoc & rDoc,
             SwTOXMark * pMark, TOXTypes eType = TOX_INDEX);
 
-    static const css::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-
-    // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething(
-            const css::uno::Sequence< sal_Int8 >& rIdentifier) override;
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(
@@ -224,6 +209,4 @@ public:
 
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */