1 files changed, 21 insertions, 29 deletions

diff --git a/sw/source/core/inc/unometa.hxx b/sw/source/core/inc/unometa.hxx
index 87c351b5dcc4..91108eb464ac 100644
--- a/sw/source/core/inc/unometa.hxx
+++ b/sw/source/core/inc/unometa.hxx
@@ -17,14 +17,12 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
+#pragma once
 
 #include <memory>
 #include <deque>
 
 #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/XChild.hpp>
 #include <com/sun/star/container/XEnumerationAccess.hpp>
@@ -37,20 +35,22 @@
 
 #include <unobaseclass.hxx>
 
-typedef std::deque<
-    css::uno::Reference< css::text::XTextRange > >
-    TextRangeList_t;
-
+class SwXTextPortion;
 class SwPaM;
 class SwTextNode;
-
+class SwXText;
 namespace sw {
     class Meta;
 }
 
+typedef std::deque<
+    rtl::Reference<SwXTextPortion> >
+    TextRangeList_t;
+
+
+
 typedef ::cppu::ImplInheritanceHelper
 <   ::sfx2::MetadatableMixin
-,   css::lang::XUnoTunnel
 ,   css::lang::XServiceInfo
 ,   css::container::XChild
 ,   css::container::XEnumerationAccess
@@ -83,25 +83,25 @@ protected:
 
     /// @param pDoc and pMeta != 0, but not & because of ImplInheritanceHelper
     SwXMeta(SwDoc *const pDoc, ::sw::Meta *const pMeta,
-        css::uno::Reference< css::text::XText> const&  xParentText,
+        css::uno::Reference<SwXText> const&  xParentText,
         std::unique_ptr<TextRangeList_t const> pPortions);
 
     SwXMeta(SwDoc *const pDoc);
 
 public:
 
-    static css::uno::Reference< css::rdf::XMetadatable >
+    static rtl::Reference<SwXMeta>
         CreateXMeta(
             ::sw::Meta & rMeta,
-            css::uno::Reference< css::text::XText> const& xParentText = nullptr,
-            std::unique_ptr<TextRangeList_t const> && pPortions = std::unique_ptr<TextRangeList_t const>());
+            css::uno::Reference<SwXText> xParentText,
+            std::unique_ptr<TextRangeList_t const> && pPortions);
 
-    static css::uno::Reference<css::rdf::XMetadatable>
+    static rtl::Reference<SwXMeta>
         CreateXMeta(SwDoc & rDoc, bool isField);
 
     /// init params with position of the attribute content (w/out CH_TXTATR)
     bool SetContentRange( SwTextNode *& rpNode, sal_Int32 & rStart, sal_Int32 & rEnd) const;
-    css::uno::Reference< css::text::XText > const & GetParentText() const;
+    css::uno::Reference< SwXText > const & GetParentText() const;
 
     /// @throws css::lang::IllegalArgumentException
     /// @throws css::uno::RuntimeException
@@ -112,12 +112,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 >& Identifier ) override;
-
     // XServiceInfo
     virtual OUString SAL_CALL getImplementationName() override;
     virtual sal_Bool SAL_CALL supportsService(
@@ -190,7 +184,7 @@ typedef ::cppu::ImplInheritanceHelper
 ,   css::text::XTextField
 > SwXMetaField_Base;
 
-class SwXMetaField
+class SwXMetaField final
     : public SwXMetaField_Base
 {
 
@@ -198,16 +192,16 @@ private:
 
     virtual ~SwXMetaField() override;
 
-    friend css::uno::Reference< css::rdf::XMetadatable >
+    friend rtl::Reference<SwXMeta>
         SwXMeta::CreateXMeta(::sw::Meta &,
-            css::uno::Reference< css::text::XText> const&,
+            css::uno::Reference<SwXText>,
             std::unique_ptr<TextRangeList_t const> && pPortions);
 
     SwXMetaField(SwDoc *const pDoc, ::sw::Meta *const pMeta,
-        css::uno::Reference< css::text::XText> const& xParentText,
+        css::uno::Reference<SwXText> const& xParentText,
         std::unique_ptr<TextRangeList_t const> pPortions);
 
-    friend css::uno::Reference<css::rdf::XMetadatable>
+    friend rtl::Reference<SwXMeta>
         SwXMeta::CreateXMeta(SwDoc &, bool);
 
     SwXMetaField(SwDoc *const pDoc);
@@ -263,8 +257,6 @@ public:
 void getPrefixAndSuffix(
         const css::uno::Reference< css::frame::XModel>& xModel,
         const css::uno::Reference< css::rdf::XMetadatable>& xMetaField,
-        OUString *const o_pPrefix, OUString *const o_pSuffix);
-
-#endif // INCLUDED_SW_SOURCE_CORE_INC_UNOMETA_HXX
+        OUString *const o_pPrefix, OUString *const o_pSuffix, OUString *const o_pShadowColor);
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */