1 files changed, 8 insertions, 20 deletions
diff --git a/sw/source/core/inc/unoflatpara.hxx b/sw/source/core/inc/unoflatpara.hxx
index f35ec6ecc171..30631fabae6a 100644
--- a/sw/source/core/inc/unoflatpara.hxx
+++ b/sw/source/core/inc/unoflatpara.hxx
@@ -17,18 +17,16 @@
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
 
-#ifndef INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
-#define INCLUDED_SW_SOURCE_CORE_INC_UNOFLATPARA_HXX
+#pragma once
 
 #include <cppuhelper/implbase.hxx>
 
 #include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/text/XFlatParagraph.hpp>
 #include <com/sun/star/text/XFlatParagraphIterator.hpp>
 #include <svl/listener.hxx>
-#include <tools/solar.h>
 #include "unotextmarkup.hxx"
+#include <nodeoffset.hxx>
 
 #include <set>
 
@@ -42,14 +40,13 @@ typedef ::cppu::ImplInheritanceHelper
 <   SwXTextMarkup
 ,   css::beans::XPropertySet
 ,   css::text::XFlatParagraph
-,   css::lang::XUnoTunnel
 > SwXFlatParagraph_Base;
 
-class SwXFlatParagraph
+class SwXFlatParagraph final
     :   public SwXFlatParagraph_Base
 {
 public:
-    SwXFlatParagraph( SwTextNode& rTextNode, const OUString& aExpandText, const ModelToViewHelper& rConversionMap );
+    SwXFlatParagraph( SwTextNode& rTextNode, OUString aExpandText, const ModelToViewHelper& rConversionMap );
     virtual ~SwXFlatParagraph() override;
 
     // XPropertySet
@@ -95,19 +92,15 @@ public:
 
     using SwXTextMarkup::GetTextNode;
 
-    static const css::uno::Sequence< sal_Int8 >& getUnoTunnelId();
-
-    // XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething(const css::uno::Sequence< sal_Int8 >& rId) override;
-
 private:
     SwXFlatParagraph( const SwXFlatParagraph & ) = delete;
     SwXFlatParagraph & operator = ( const SwXFlatParagraph & ) = delete;
 
     OUString maExpandText;
+    OUString maOrigText;
 };
 
-class SwXFlatParagraphIterator:
+class SwXFlatParagraphIterator final :
     public ::cppu::WeakImplHelper
     <
         css::text::XFlatParagraphIterator
@@ -131,17 +124,12 @@ private:
     SwXFlatParagraphIterator( const SwXFlatParagraphIterator & ) = delete;
     SwXFlatParagraphIterator & operator =(const SwXFlatParagraphIterator & ) = delete;
 
-    // container to hold the 'hard' references as long as necessary and valid
-    std::set< css::uno::Reference< css::text::XFlatParagraph > >    m_aFlatParaList;
-
     SwDoc* mpDoc;
     const sal_Int32 mnType;
     const bool mbAutomatic;
 
-    sal_uLong mnCurrentNode;    // used for non-automatic mode
-    sal_uLong mnEndNode;        // used for non-automatic mode
+    SwNodeOffset mnCurrentNode;    // used for non-automatic mode
+    SwNodeOffset mnEndNode;        // used for non-automatic mode
 };
 
-#endif
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */