swunolocking1: #i105557#: unoobj.hxx: split out unoparagraph.hxx:

move SwXParagraph{,Enumeration} from unoobj.hxx to new unoparagraph.hxx.
move enum CursorType to unobaseclass.hxx.

18 files changed, 484 insertions, 215 deletions

diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 17b6e6f5d080..adb7b880356a 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -43,5 +43,26 @@ cppu::WeakImplHelper2
 >
 SwSimpleEnumerationBaseClass;
 
+
+/* -----------------29.04.98 07:35-------------------
+ *
+ * --------------------------------------------------*/
+enum CursorType
+{
+    CURSOR_INVALID,
+    CURSOR_BODY,
+    CURSOR_FRAME,
+    CURSOR_TBLTEXT,
+    CURSOR_FOOTNOTE,
+    CURSOR_HEADER,
+    CURSOR_FOOTER,
+    CURSOR_REDLINE,
+    CURSOR_ALL,         // for Search&Replace
+    CURSOR_SELECTION,   // create a paragraph enumeration from
+                        // a text range or cursor
+    CURSOR_SELECTION_IN_TABLE,
+    CURSOR_META,         // meta/meta-field
+};
+
 #endif
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index 74197ec9b2ba..54e652fc6816 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -61,7 +61,6 @@
 #include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XMultiPropertySet.hpp>
-#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/beans/XMultiPropertyStates.hpp>
 #include <com/sun/star/lang/XUnoTunnel.hpp>
@@ -91,7 +90,6 @@
 #include <tools/link.hxx>
 
 #include <IMark.hxx>
-#include <sfx2/Metadatable.hxx>
 
 #include <deque>
 #include <boost/shared_ptr.hpp>
@@ -115,25 +113,6 @@ typedef ::std::deque< FrameDependSortListEntry >
 typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
     FrameDependList_t;
 
-/* -----------------29.04.98 07:35-------------------
- *
- * --------------------------------------------------*/
-enum CursorType
-{
-    CURSOR_INVALID,
-    CURSOR_BODY,
-    CURSOR_FRAME,
-    CURSOR_TBLTEXT,
-    CURSOR_FOOTNOTE,
-    CURSOR_HEADER,
-    CURSOR_FOOTER,
-    CURSOR_REDLINE,
-    CURSOR_ALL,          // fuer Search&Replace
-    CURSOR_SELECTION,    // create a paragraph enumeration from a text range or cursor
-    CURSOR_SELECTION_IN_TABLE,
-    CURSOR_META,         // meta/meta-field
-};
-
 
 /* -----------------26.06.98 16:18-------------------
  *
@@ -993,186 +972,6 @@ public:
     void            Invalidate();
 };
 
-/*-----------------07.04.98 08:10-------------------
-
---------------------------------------------------*/
-class SwXParagraphEnumeration : public SwSimpleEnumerationBaseClass,
-    public SwClient
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >           xParentText;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >    xNextPara;
-
-    const SwTable *     pOwnTable;
-    const SwStartNode * pOwnStartNode;  // start node of the cell the enumeration
-                                        // belongs to.
-                                        // Used to restrict the movement of the
-                                        // UNO cursor to the cell and its
-                                        // embedded tables.
-    sal_Int32           nFirstParaStart;
-    sal_Int32           nLastParaEnd;
-    ULONG               nEndIndex;
-    CursorType          eCursorType;
-    BOOL                bFirstParagraph;
-
-    SwUnoCrsr*          GetCrsr(){return (SwUnoCrsr*)GetRegisteredIn();}
-
-protected:
-    virtual ~SwXParagraphEnumeration();
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > SAL_CALL NextElement_Impl(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-public:
-    SwXParagraphEnumeration(SwXText* pParent, SwPosition& rPos, CursorType eType);
-    SwXParagraphEnumeration(SwXText* pParent, SwUnoCrsr* pCrsr, CursorType eType);
-
-
-
-    //XEnumeration
-    virtual BOOL SAL_CALL hasMoreElements(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL nextElement(void) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-
-    //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    //SwClient
-    virtual void            Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-    //non-Uno functions
-
-    void                SetOwnTable( const SwTable* pTable )        { pOwnTable = pTable; }
-    const SwTable*      GetOwnTable() const                         { return pOwnTable; }
-    void                SetOwnStartNode( const SwStartNode* pNode ) { pOwnStartNode = pNode; }
-    const SwStartNode*  GetOwnStartNode() const                     { return pOwnStartNode; }
-};
-/*-----------------07.04.98 08:15-------------------
-
---------------------------------------------------*/
-class SwXParagraph : public cppu::ImplInheritanceHelper10
-<
-    ::sfx2::MetadatableMixin,
-    ::com::sun::star::beans::XTolerantMultiPropertySet,
-    ::com::sun::star::beans::XMultiPropertySet,
-    ::com::sun::star::text::XTextRange,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::lang::XUnoTunnel,
-    ::com::sun::star::beans::XPropertyState,
-    ::com::sun::star::container::XEnumerationAccess,
-    ::com::sun::star::text::XTextContent,
-    ::com::sun::star::container::XContentEnumerationAccess
->,
-    public SwClient
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
-    SwEventListenerContainer    aLstnrCntnr;
-    const SfxItemPropertySet*   m_pPropSet;
-    rtl::OUString               m_sText;
-    sal_Int32                   nSelectionStartPos;
-    sal_Int32                   nSelectionEndPos;
-    BOOL                        m_bIsDescriptor;
-
-
-protected:
-    void SAL_CALL SetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL GetPropertyValues_Impl( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL GetPropertyValuesTolerant_Impl(
-        const ::com::sun::star::uno::Sequence< rtl::OUString >& rPropertyNames,
-        sal_Bool bDirectValuesOnly ) throw (::com::sun::star::uno::RuntimeException);
-
-    virtual ~SwXParagraph();
-public:
-    SwXParagraph();
-    SwXParagraph(::com::sun::star::uno::Reference< ::com::sun::star::text::XText > const & i_xParent, SwTxtNode * i_pTxtNode, sal_Int32 nSelStart = -1, sal_Int32 nSelEnd = - 1);
-
-    TYPEINFO();
-
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-
-    //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XTolerantMultiPropertySet
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL setPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL getPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL getDirectPropertyValuesTolerant( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::uno::RuntimeException);
-
-    //XMultiPropertySet
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& aValues ) throw(::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyValues( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addPropertiesChangeListener( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertiesChangeListener( const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL firePropertiesChangeEvent( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertiesChangeListener >& xListener ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XPropertySet
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Any& aValue ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::beans::PropertyVetoException, ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    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);
-    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& xListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertyChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const ::com::sun::star::uno::Reference< ::com::sun::star::beans::XVetoableChangeListener >& aListener ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    //XPropertyState
-    virtual ::com::sun::star::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > SAL_CALL getPropertyStates( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& PropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& aPropertyName ) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    //XTextContent
-    virtual void SAL_CALL attach(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL getAnchor(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XComponent
-    virtual void SAL_CALL dispose(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeEventListener(const ::com::sun::star::uno::Reference< ::com::sun::star::lang::XEventListener > & aListener) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XEnumerationAccess - war XTextPortionEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >  SAL_CALL createEnumeration(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XElementAccess
-    virtual ::com::sun::star::uno::Type SAL_CALL getElementType(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasElements(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XTextRange
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL  getStart(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL   getEnd(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual rtl::OUString SAL_CALL  getString(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL  setString(const rtl::OUString& aString) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XContentEnumerationAccess
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumeration >  SAL_CALL createContentEnumeration(const rtl::OUString& aServiceName) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void) throw( ::com::sun::star::uno::RuntimeException );
-
-    //MetadatableMixin
-    virtual ::sfx2::Metadatable* GetCoreObject();
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
-        GetModel();
-
-    //SwClient
-    virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-    BOOL            IsDescriptor() const {return m_bIsDescriptor;}
-
-    const SwTxtNode * GetTxtNode() const;
-          SwTxtNode * GetTxtNode();
-
-    static BOOL getDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
-        const rtl::OUString& rPropertyName, USHORT nWID = 0);
-    static SwXParagraph* GetImplementation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xRef );
-    //falls es mal als Service erzeugt werden kann
-    //void attachToRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange)throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
-};
 /* -----------------23.03.99 12:57-------------------
  *
  * --------------------------------------------------*/
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
new file mode 100644
index 000000000000..6ef62e00c1a9
--- /dev/null
+++ b/sw/inc/unoparagraph.hxx
@@ -0,0 +1,439 @@
+/*************************************************************************
+ *
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * Copyright 2008 by Sun Microsystems, Inc.
+ *
+ * OpenOffice.org - a multi-platform office productivity suite
+ *
+ * $RCSfile: unoobj.hxx,v $
+ *
+ * $Revision: 1.49 $
+ *
+ * This file is part of OpenOffice.org.
+ *
+ * OpenOffice.org is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3
+ * only, as published by the Free Software Foundation.
+ *
+ * OpenOffice.org is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License version 3 for more details
+ * (a copy is included in the LICENSE file that accompanied this code).
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * version 3 along with OpenOffice.org.  If not, see
+ * <http://www.openoffice.org/license.html>
+ * for a copy of the LGPLv3 License.
+ *
+ ************************************************************************/
+
+#ifndef SW_UNOPARAGRAPH_HXX
+#define SW_UNOPARAGRAPH_HXX
+
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XMultiPropertySet.hpp>
+#include <com/sun/star/beans/XTolerantMultiPropertySet.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+
+#include <cppuhelper/implbase10.hxx>
+
+#include <sfx2/Metadatable.hxx>
+
+#include <calbck.hxx>
+#include <unoevtlstnr.hxx>
+#include <unobaseclass.hxx>
+
+
+class SfxItemPropertySet;
+struct SwPosition;
+class SwUnoCrsr;
+class SwStartNode;
+class SwTxtNode;
+class SwTable;
+class SwXText;
+
+
+/*-----------------07.04.98 08:15-------------------
+
+--------------------------------------------------*/
+typedef ::cppu::ImplInheritanceHelper10
+<   ::sfx2::MetadatableMixin
+,   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::beans::XPropertyState
+,   ::com::sun::star::beans::XMultiPropertySet
+,   ::com::sun::star::beans::XTolerantMultiPropertySet
+,   ::com::sun::star::container::XEnumerationAccess
+,   ::com::sun::star::container::XContentEnumerationAccess
+,   ::com::sun::star::text::XTextContent
+,   ::com::sun::star::text::XTextRange
+> SwXParagraph_Base;
+
+class SwXParagraph
+    : public SwXParagraph_Base
+    , public SwClient
+{
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
+    SwEventListenerContainer    aLstnrCntnr;
+    const SfxItemPropertySet*   m_pPropSet;
+    ::rtl::OUString             m_sText;
+    sal_Int32                   nSelectionStartPos;
+    sal_Int32                   nSelectionEndPos;
+    BOOL                        m_bIsDescriptor;
+
+protected:
+
+    void SAL_CALL SetPropertyValues_Impl(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Any >& rValues)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::beans::PropertyVetoException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL
+        GetPropertyValues_Impl(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    ::com::sun::star::uno::Sequence<
+            ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL
+        GetPropertyValuesTolerant_Impl(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            sal_Bool bDirectValuesOnly)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ~SwXParagraph();
+
+public:
+
+    SwXParagraph();
+    SwXParagraph(::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XText > const & i_xParent,
+            SwTxtNode * i_pTxtNode,
+            sal_Int32 nSelStart = -1, sal_Int32 nSelEnd = - 1);
+
+    BOOL            IsDescriptor() const {return m_bIsDescriptor;}
+
+    const SwTxtNode * GetTxtNode() const;
+          SwTxtNode * GetTxtNode();
+
+    static BOOL getDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
+        const ::rtl::OUString& rPropertyName, USHORT nWID = 0);
+    static SwXParagraph* GetImplementation(
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::uno::XInterface> xRef);
+    void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
+
+    TYPEINFO();
+
+    // SwClient
+    virtual void    Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+    // MetadatableMixin
+    virtual ::sfx2::Metadatable* GetCoreObject();
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XModel >
+        GetModel();
+
+    static const ::com::sun::star::uno::Sequence< sal_Int8 >& getUnoTunnelId();
+
+    // XUnoTunnel
+    virtual sal_Int64 SAL_CALL getSomething(
+            const ::com::sun::star::uno::Sequence< sal_Int8 >& rIdentifier)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService(
+            const ::rtl::OUString& rServiceName)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XComponent
+    virtual void SAL_CALL dispose()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::lang::XEventListener > & xListener)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeEventListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::lang::XEventListener > & xListener)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XPropertySet
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertySetInfo > SAL_CALL
+        getPropertySetInfo()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue(
+            const ::rtl::OUString& rPropertyName,
+            const ::com::sun::star::uno::Any& rValue)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::beans::PropertyVetoException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    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);
+    virtual void SAL_CALL addPropertyChangeListener(
+            const ::rtl::OUString& rPropertyName,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertyChangeListener >& xListener)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener(
+            const ::rtl::OUString& rPropertyName,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertyChangeListener >& xListener)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener(
+            const ::rtl::OUString& rPropertyName,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XVetoableChangeListener >& xListener)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener(
+            const ::rtl::OUString& rPropertyName,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XVetoableChangeListener >& xListener)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XPropertyState
+    virtual ::com::sun::star::beans::PropertyState SAL_CALL
+        getPropertyState(const ::rtl::OUString& rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence<
+            ::com::sun::star::beans::PropertyState > SAL_CALL
+        getPropertyStates(
+            const ::com::sun::star::uno::Sequence<
+                ::rtl::OUString >& rPropertyNames)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault(
+            const ::rtl::OUString& rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getPropertyDefault(
+            const ::rtl::OUString& rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XMultiPropertySet
+    virtual void SAL_CALL setPropertyValues(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Any >& rValues)
+        throw (::com::sun::star::beans::PropertyVetoException,
+                ::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+        SAL_CALL getPropertyValues(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL addPropertiesChangeListener(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removePropertiesChangeListener(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL firePropertiesChangeEvent(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::beans::XPropertiesChangeListener >& xListener)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XTolerantMultiPropertySet
+    virtual ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::SetPropertyTolerantFailed > SAL_CALL
+        setPropertyValuesTolerant(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Any >& rValues)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::GetPropertyTolerantResult > SAL_CALL
+        getPropertyValuesTolerant(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence<
+            ::com::sun::star::beans::GetDirectPropertyTolerantResult > SAL_CALL
+        getDirectPropertyValuesTolerant(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XElementAccess
+    virtual ::com::sun::star::uno::Type SAL_CALL getElementType()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XEnumerationAccess
+    virtual ::com::sun::star::uno::Reference<
+            ::com::sun::star::container::XEnumeration >  SAL_CALL
+        createEnumeration()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XContentEnumerationAccess
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::container::XEnumeration > SAL_CALL
+        createContentEnumeration(const ::rtl::OUString& rServiceName)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getAvailableServiceNames()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XTextContent
+    virtual void SAL_CALL attach(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextRange)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL getAnchor()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XTextRange
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+        SAL_CALL getText()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL getStart()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL getEnd()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getString()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setString(const ::rtl::OUString& rString)
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+
+/*-----------------07.04.98 08:10-------------------
+
+--------------------------------------------------*/
+class SwXParagraphEnumeration
+    : public SwSimpleEnumerationBaseClass
+    , public SwClient
+{
+
+private:
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+        xParentText;
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
+        xNextPara;
+
+    const SwTable *     pOwnTable;
+    /// Start node of the cell the enumeration belongs to.
+    /// Used to restrict the movement of the UNO cursor to the cell and its
+    /// embedded tables.
+    const SwStartNode * pOwnStartNode;
+    sal_Int32           nFirstParaStart;
+    sal_Int32           nLastParaEnd;
+    ULONG               nEndIndex;
+    CursorType          eCursorType;
+    BOOL                bFirstParagraph;
+
+    SwUnoCrsr*          GetCrsr() {return (SwUnoCrsr*)GetRegisteredIn();}
+
+protected:
+
+    virtual ~SwXParagraphEnumeration();
+
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent > SAL_CALL
+        NextElement_Impl()
+        throw (::com::sun::star::container::NoSuchElementException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+public:
+
+    SwXParagraphEnumeration(
+            SwXText* pParent, SwPosition& rPos, CursorType eType);
+    SwXParagraphEnumeration(
+            SwXText* pParent, SwUnoCrsr* pCrsr, CursorType eType);
+
+    // non-Uno functions
+
+    void                SetOwnTable(const SwTable* pTable)
+        { pOwnTable = pTable; }
+    const SwTable*      GetOwnTable() const
+        { return pOwnTable; }
+    void                SetOwnStartNode(const SwStartNode* pNode)
+        { pOwnStartNode = pNode; }
+    const SwStartNode*  GetOwnStartNode() const
+        { return pOwnStartNode; }
+
+    // SwClient
+    virtual void        Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+    // XServiceInfo
+    virtual ::rtl::OUString SAL_CALL getImplementationName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL supportsService(
+            const ::rtl::OUString& rServiceName)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getSupportedServiceNames()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XEnumeration
+    virtual sal_Bool SAL_CALL hasMoreElements()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL nextElement()
+        throw (::com::sun::star::container::NoSuchElementException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOPARAGRAPH_HXX
+
diff --git a/sw/source/core/txtnode/ndtxt.cxx b/sw/source/core/txtnode/ndtxt.cxx
index eb1f5c3e94fc..46b105723a1d 100644
--- a/sw/source/core/txtnode/ndtxt.cxx
+++ b/sw/source/core/txtnode/ndtxt.cxx
@@ -4972,6 +4972,7 @@ bool SwTxtNode::IsInContent() const
     return !GetDoc()->IsInHeaderFooter( SwNodeIndex(*this) );
 }
 
+#include <unoparagraph.hxx>
 #include <unoobj.hxx>
 
 ::com::sun::star::uno::Reference< ::com::sun::star::rdf::XMetadatable >
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index da9568603b01..0ec0442457f5 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -31,10 +31,12 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+
 #include <unobookmark.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <IMark.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index cc9c3d34050a..598e95cbf385 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -75,6 +75,7 @@
 #include <slist>
 #include <iterator>
 
+#include <unoparagraph.hxx>
 #include <unobookmark.hxx>
 #include <unorefmark.hxx>
 #include <unometa.hxx>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index 5a050eb690ed..ec978f02a0ec 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -38,6 +38,7 @@
 #include <unodraw.hxx>
 #include <unocoll.hxx>
 #include <unoframe.hxx>
+#include <unoparagraph.hxx>
 #include <unoprnms.hxx>
 #include <svx/unoprnms.hxx>
 #include <swunohelper.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index 1f9d39bca94c..87bc0ff6b173 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -61,6 +61,7 @@
 #include <frmfmt.hxx>
 #include <frame.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <unoevent.hxx>
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 98ee87c2ae33..cf1b6dc516c4 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 5633ca1f0661..3e1fde6746b3 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -43,9 +43,7 @@
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #include <swtypes.hxx>
 #include <shellres.hxx>
 #include <viewsh.hxx>
@@ -58,18 +56,18 @@
 #include <pagedesc.hxx>
 #include <unomap.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <doctxm.hxx>
 #include <txttxmrk.hxx>
 #include <unocrsr.hxx>
 #include <unostyle.hxx>
 #include <ndtxt.hxx>
 #include <unoidx.hxx>
-#ifndef _DOCSH_HXX //autogen
 #include <docsh.hxx>
-#endif
 #include <chpfld.hxx>
 #include <SwStyleNameMapper.hxx>
 
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 26a237b5625a..b8435fe17166 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -78,6 +78,7 @@
 #include <txtrfmrk.hxx>
 #include <unoclbck.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unoport.hxx>
 #include <unocrsrhelper.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 4fbf9a7062d1..bb7c30667ab1 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -35,6 +35,7 @@
 #include <cmdid.h>
 #include <unomid.h>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unoport.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index b04a7fea1fae..80297bb64321 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -40,6 +40,7 @@
 #include <section.hxx>
 #include <unoprnms.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unocoll.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
@@ -50,6 +51,7 @@
 #include <com/sun/star/util/DateTime.hpp>
 #include <com/sun/star/text/XTextTable.hpp>
 
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 25f87488d4d5..45c79b5edcf5 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <unoobj.hxx>
 #include <unorefmark.hxx>
+#include <unoparagraph.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index 1308c6ad7d3e..e3c0c56908a9 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -38,24 +38,21 @@
 #include <hintids.hxx>
 #include <svtools/urihelper.hxx>
 #include <svx/brshitem.hxx>
-#ifndef _SVX_XMLCNITEM_HXX
 #include <svx/xmlcnitm.hxx>
-#endif
 #include <sfx2/linkmgr.hxx>
 #include <sfx2/lnkbase.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <fmtclds.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <unoredline.hxx>
 #include <redline.hxx>
 #include <unomap.hxx>
 #include <unocrsr.hxx>
 #include <section.hxx>
 #include <doc.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <sfx2/docfile.hxx>
 #include <docary.hxx>
 #include <swundo.hxx>
@@ -65,13 +62,12 @@
 #include <doctxm.hxx>
 #include <fmtftntx.hxx>
 #include <fmtclbl.hxx>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <svx/frmdiritem.hxx>
 /* #109700# */
 #include <svx/lrspitem.hxx>
 
+
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::uno;
@@ -80,6 +76,7 @@ using namespace ::com::sun::star::container;
 using namespace ::com::sun::star::beans;
 using ::rtl::OUString;
 
+
 TYPEINIT1(SwXTextSectionClient, SwClient);
 /*-- 20.12.2005 09:56:33---------------------------------------------------
 
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 20dde56ead7d..b0514f74d4ab 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -33,16 +33,12 @@
 #include "precompiled_sw.hxx"
 
 
-
-
 // STL includes
 #include <list>
 
 #include <float.h> // for DBL_MIN
 #include <swtypes.hxx>
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #include <unotbl.hxx>
 #include <unostyle.hxx>
 #include <section.hxx>
@@ -87,6 +83,7 @@
 #include <com/sun/star/table/CellContentType.hpp>
 #include <unotbl.hxx>
 #include <unoobj.hxx>
+#include <unoparagraph.hxx>
 #include <svtools/zforlist.hxx>     // SvNumberFormatter
 #include <svx/brkitem.hxx>
 #include <svx/shaditem.hxx>
@@ -103,9 +100,11 @@
 #include <unochart.hxx>
 #include <rtl/math.hxx>
 
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
+
 //-----------------------------------------------------------------------------
 // from unoobj.cxx
 extern void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM)    throw (lang::IllegalArgumentException);
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index bbb371d66974..fed9109b094e 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -53,6 +53,7 @@
 #include <unomap.hxx>
 #include <unoprnms.hxx>
 #include <undobj.hxx>
+#include <unoparagraph.hxx>
 #include <unocrsrhelper.hxx>
 #include <docsh.hxx>
 #include <docary.hxx>
@@ -70,9 +71,11 @@
 
 #include <iostream>
 
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 
+
 const sal_Char cInvalidObject[] = "this object is invalid";
 /******************************************************************
  * SwXText
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 6ed41d64c7a6..6239bc9503ea 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -78,6 +78,7 @@
 #include <crsskip.hxx>
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <unobookmark.hxx>
+#include <unoparagraph.hxx>
 
 #include <svx/editview.hxx>
 #include <sfx2/docfile.hxx>