sw: move SwXRedlinePortion to unoport.hxx

Change-Id: I52eedcc1bc96e6d56e721a8ffdb5b7bf9e80b00e

sw/inc/unoport.hxx

@@ -16,8 +16,8 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOPORT_HXX
-#define _UNOPORT_HXX
+#ifndef SW_UNOPORT_HXX
+#define SW_UNOPORT_HXX
 
 #include <unocrsr.hxx>
 #include <unoevtlstnr.hxx>
@@ -45,6 +45,7 @@
 
 class SwFmtFld;
 class SwFrmFmt;
+class SwRedline;
 class SwTxtRuby;
 
 
@@ -304,6 +305,42 @@ protected:
     virtual void Modify( const SfxPoolItem* pOld, const SfxPoolItem *pNew);
 };
 
+class SwXRedlinePortion : public SwXTextPortion
+{
+private:
+    SwRedline const* pRedline;
+
+    void Validate() throw (::com::sun::star::uno::RuntimeException);
+
+    using SwXTextPortion::GetPropertyValue;
+
+public:
+    SwXRedlinePortion(
+        SwRedline const* pRedline,
+        SwUnoCrsr const* pPortionCrsr,
+        ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+            xParent,
+        sal_Bool const bIsStart);
+
+    virtual ~SwXRedlinePortion();
+
+    static ::com::sun::star::uno::Any  GetPropertyValue(
+            OUString const& PropertyName, SwRedline const& rRedline) throw();
+    static ::com::sun::star::uno::Sequence<
+        ::com::sun::star::beans::PropertyValue > CreateRedlineProperties(
+                SwRedline const& rRedline, sal_Bool const bIsStart) throw();
+
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        getImplementationId() throw (::com::sun::star::uno::RuntimeException);
+
+    // XPropertySet
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue(
+            const ::rtl::OUString& rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+};
+
 #endif
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */

sw/inc/unoredline.hxx

@@ -16,10 +16,9 @@
  *   except in compliance with the License. You may obtain a copy of
  *   the License at http://www.apache.org/licenses/LICENSE-2.0 .
  */
-#ifndef _UNOREDLINE_HXX
-#define _UNOREDLINE_HXX
+#ifndef SW_UNOREDLINE_HXX
+#define SW_UNOREDLINE_HXX
 
-#include <unoport.hxx>
 #include <unotext.hxx>
 
 
@@ -60,32 +59,6 @@ public:
     virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
 };
 
-class SwXRedlinePortion : public SwXTextPortion
-{
-    const SwRedline*    pRedline;
-
-    void Validate() throw( ::com::sun::star::uno::RuntimeException );
-
-    using SwXTextPortion::GetPropertyValue;
-
-public:
-    SwXRedlinePortion(  const SwRedline* pRed,
-                        const SwUnoCrsr* pPortionCrsr,
-                        ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  xParent,
-                        sal_Bool bIsStart);
-
-    ~SwXRedlinePortion();
-
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XPropertySet
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    static ::com::sun::star::uno::Any  GetPropertyValue( const ::rtl::OUString& PropertyName, const SwRedline& rRedline ) throw();
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > CreateRedlineProperties( const SwRedline& rRedline, sal_Bool bIsStart ) throw();
-
-};
-
 typedef
 cppu::WeakImplHelper1
 <

sw/source/core/unocore/unoredline.cxx

@@ -38,6 +38,7 @@
 #include <unocoll.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
+#include <unoport.hxx>
 #include <unoredline.hxx>
 #include <doc.hxx>
 #include <docary.hxx>

sw/source/core/unocore/unosect.cxx

@@ -34,7 +34,8 @@
 #include <unotextrange.hxx>
 #include <unosection.hxx>
 #include <TextCursorHelper.hxx>
-#include <unoredline.hxx>
+#include <unoevtlstnr.hxx>
+#include <unoport.hxx>
 #include <redline.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>

sw/source/core/unocore/unotbl.cxx

@@ -51,7 +51,7 @@
 #include <viewsh.hxx>
 #include <tabfrm.hxx>
 #include <redline.hxx>
-#include <unoredline.hxx>
+#include <unoport.hxx>
 #include <unoprnms.hxx>
 #include <unocrsrhelper.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>