swunolocking1: #i105557#: unoobj.hxx: split out unotext.hxx etc.:

move SwXText from unoobj.hxx to new unotext.hxx. move SwXBodyText, SwXHeadFootText from unoobj.hxx to new unotextbodyhf.hxx. move SwXFootnote from unoobj.hxx to new unofootnote.hxx.
author: Michael Stahl <mst@openoffice.org> 2010-01-05 16:37:47 +0100
committer: Michael Stahl <mst@openoffice.org> 2010-01-05 16:37:47 +0100
commit: a6b34b60ba3e7451cfa8d5a492d53484ec131421 (patch)
tree: c673e2830400913406221220e7dda61dd19939a8 /sw
parent: e23c9ccd3e9e8d415d0bbab189e2de5ba48b42e9 (diff)
27 files changed, 914 insertions, 372 deletions
diff --git a/sw/inc/unofootnote.hxx b/sw/inc/unofootnote.hxx
new file mode 100644
index 000000000000..d1c869404d32
--- /dev/null
+++ b/sw/inc/unofootnote.hxx
@@ -0,0 +1,246 @@
+/*************************************************************************
+ *
+ * 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_UNOFOOTNOTE_HXX
+#define SW_UNOFOOTNOTE_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/container/XEnumerationAccess.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XFootnote.hpp>
+
+#include <cppuhelper/implbase5.hxx>
+
+#include <tools/string.hxx>
+
+#include <calbck.hxx>
+#include <unoevtlstnr.hxx>
+#include <unotext.hxx>
+
+
+class SwDoc;
+class SwFmtFtn;
+
+
+/*-----------------12.02.98 08:01-------------------
+
+--------------------------------------------------*/
+typedef ::cppu::WeakImplHelper5
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::container::XEnumerationAccess
+,   ::com::sun::star::text::XFootnote
+> SwXFootnote_Base;
+
+class SwXFootnote
+    : public SwXFootnote_Base
+    , public SwXText
+    , public SwClient
+{
+
+private:
+
+    friend class SwXFootnotes;
+
+    SwEventListenerContainer    aLstnrCntnr;
+    const SwFmtFtn*             pFmtFtn;
+    BOOL                        m_bIsDescriptor;
+    String                      m_sLabel;
+    BOOL                        m_bIsEndnote;
+
+protected:
+
+    virtual const SwStartNode *GetStartNode() const;
+
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >
+        createCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ~SwXFootnote();
+
+public:
+
+    SwXFootnote(BOOL bEndnote);
+    SwXFootnote(SwDoc* pDoc, const SwFmtFtn& rFmt);
+
+    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);
+
+    const SwFmtFtn* FindFmt() const { return GetDoc() ? pFmtFtn : 0; }
+    void            Invalidate();
+
+    TYPEINFO();
+
+    // SwClient
+    virtual void        Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void SAL_CALL release() throw() { OWeakObject::release(); }
+
+    // XTypeProvider
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+        SAL_CALL getTypes()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        getImplementationId()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    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);
+
+    // 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);
+
+    // 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);
+
+    // XFootnote
+    virtual ::rtl::OUString SAL_CALL getLabel()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setLabel(const ::rtl::OUString& rLabel)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XSimpleText
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursorByRange(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextPosition)
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOFOOTNOTE_HXX
+
diff --git a/sw/inc/unoframe.hxx b/sw/inc/unoframe.hxx
index 470303ab92ed..d681e520d028 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -30,26 +30,34 @@
 #ifndef _UNOFRAME_HXX
 #define _UNOFRAME_HXX
 
-#include <unoobj.hxx>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/document/XEmbeddedObjectSupplier2.hpp>
 #include <com/sun/star/text/XTextFrame.hpp>
 #include <com/sun/star/drawing/XShape.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
 #include <com/sun/star/frame/XModel.hpp>
 #include <com/sun/star/document/XEventsSupplier.hpp>
- /*
-#include <com/sun/star/container/XNameAccess.hpp>
- */
 
+#include <cppuhelper/implbase1.hxx>
 #include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase6.hxx>
 
 #include <sfx2/objsh.hxx>
 
+#include <flyenum.hxx>
+#include <frmfmt.hxx>
+#include <unoevtlstnr.hxx>
+#include <unotext.hxx>
+
 
-class SwDoc;
 class SfxItemPropertSet;
+class SdrObject;
+class SwDoc;
+class SwFmt;
+class SwFlyFrmFmt;
+
 
 /*-----------------12.02.98 11:21-------------------
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index fa6600b14107..d43a4a7105e1 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -36,28 +36,14 @@
 #include <unocrsr.hxx>
 #include <svtools/itemprop.hxx>
 #include <frmfmt.hxx>
-#include <flyenum.hxx>
 #include <fldbas.hxx>
 #include <fmtcntnt.hxx>
 #include <toxe.hxx>
-#include <com/sun/star/text/XFootnote.hpp>
 #include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XText.hpp>
 #include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/beans/XPropertySet.hpp>
-#include <com/sun/star/lang/XUnoTunnel.hpp>
-#include <com/sun/star/text/XTextRangeCompare.hpp>
-#include <com/sun/star/text/XRelativeTextContentInsert.hpp>
-#include <com/sun/star/text/XRelativeTextContentRemove.hpp>
-#include <com/sun/star/text/XTextAppendAndConvert.hpp>
 #include <cppuhelper/weak.hxx>
 #include <cppuhelper/factory.hxx>   // helper for factories
 
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase4.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
-#include <cppuhelper/implbase6.hxx> // helper for implementations
 #include <cppuhelper/implbase9.hxx>
 #include <cppuhelper/implbase10.hxx>
 #include <cppuhelper/weakref.hxx>
@@ -68,7 +54,6 @@
 #include <boost/shared_ptr.hpp>
 
 
-class SwFmtFtn;
 class GetCurTxtFmtColl;
 
 
@@ -128,124 +113,6 @@ class UnoActionRemoveContext
 
 void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
 
-/* -----------------03.12.98 12:22-------------------
- *
- * --------------------------------------------------*/
-class OTextCursorHelper;
-class SwXTextRange;
-class SwXText : public ::com::sun::star::lang::XTypeProvider,
-                public ::com::sun::star::text::XTextRangeCompare,
-                public ::com::sun::star::text::XRelativeTextContentInsert,
-                public ::com::sun::star::text::XRelativeTextContentRemove,
-                public ::com::sun::star::beans::XPropertySet,
-                public ::com::sun::star::lang::XUnoTunnel,
-                public ::com::sun::star::text::XTextAppendAndConvert
-{
-    SwDoc*                      pDoc;
-    BOOL                        bObjectValid;
-    CursorType                  eCrsrType;
-    const SfxItemPropertySet*   m_pPropSet;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL finishOrAppendParagraph(
-                bool bFinish,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & CharacterAndParagraphProperties )
-                throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    virtual void PrepareForAttach( ::com::sun::star::uno::Reference<
-                ::com::sun::star::text::XTextRange > & xRange,
-            const SwXTextRange* const pRange, const SwPaM * const pPam);
-
-public: /*not protected because C++ is retarded*/
-    virtual const SwStartNode *GetStartNode() const;
-
-public:
-                SwXText(SwDoc* pDc, CursorType eType);
-    virtual     ~SwXText();
-
-    const SwDoc*            GetDoc()const {return pDoc;}
-    SwDoc*                  GetDoc()    {return pDoc;}
-
-    // wenn ein SwXText attached wird, wird das Doc gesetzt
-    void                    SetDoc(SwDoc* pDc)
-                                {DBG_ASSERT(!pDoc || !pDc, "Doc schon gesetzt?");
-                                    pDoc = pDc;
-                                    bObjectValid = 0 != pDc;
-                                }
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XText
-    virtual void SAL_CALL insertString(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const rtl::OUString& aString, BOOL bAbsorb) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL insertControlCharacter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, sal_Int16 nControlCharacter, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL insertTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xRange, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent, BOOL bAbsorb) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeTextContent(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > & xContent) throw( ::com::sun::star::container::NoSuchElementException, ::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 );
-
-    //XTextRangeCompare
-    sal_Int16 SAL_CALL compareRegionStarts( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    sal_Int16 SAL_CALL compareRegionEnds( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xR2 ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //XRelativeTextContentInsert
-    virtual void SAL_CALL insertTextContentBefore(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xNewContent, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xSuccessor) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL insertTextContentAfter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xNewContent, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xPredecessor) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //XRelativeTextContentRemove
-    virtual void SAL_CALL removeTextContentBefore(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xSuccessor) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL removeTextContentAfter(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent>& xPredecessor) throw(::com::sun::star::lang::IllegalArgumentException, ::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);
-
-    //XUnoTunnel
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XParagraphAppend
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  SAL_CALL appendParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >  SAL_CALL finishParagraph( const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //XTextPortionAppend
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextPortion( const ::rtl::OUString& Text, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > & CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //XTextContentAppend
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > SAL_CALL appendTextContent( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >& TextContent, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& CharacterAndParagraphProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //XTextConvert
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent > SAL_CALL convertToTextFrame( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& Start, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& End, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& FrameProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextTable > SAL_CALL convertToTable( const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > > > >& TableRanges,
-       const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > > >& CellProperties,
-       const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > >& RowProperties,
-       const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& TableProperties
-       ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-
-    //
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >         createCursor()throw(::com::sun::star::uno::RuntimeException);
-    INT16   ComparePositions(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange>& xPos1, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange>& xPos2) throw (com::sun::star::lang::IllegalArgumentException, com::sun::star::uno::RuntimeException);
-    BOOL    CheckForOwnMember(const SwXTextRange* pRange1, const OTextCursorHelper* pCursor1)throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual bool CheckForOwnMemberMeta(const SwXTextRange* const pRange,
-            const SwPaM* const pPam, bool bAbsorb)
-        throw (::com::sun::star::lang::IllegalArgumentException,
-               ::com::sun::star::uno::RuntimeException);
-    //
-    void            Invalidate() {bObjectValid = sal_False;}
-    BOOL            IsValid()const {return bObjectValid;}
-
-    CursorType      GetTextType() {return eCrsrType;}
-};
 
 /*-----------------20.03.98 07:47-------------------
 
@@ -301,147 +168,6 @@ public:
 
 --------------------------------------------------*/
 
-typedef cppu::WeakAggImplHelper2
-<
-    ::com::sun::star::container::XEnumerationAccess,
-    ::com::sun::star::lang::XServiceInfo
-> SwXBodyTextBaseClass;
-class SwXBodyText : public SwXBodyTextBaseClass,
-                    public SwXText
-{
-protected:
-    virtual ~SwXBodyText();
-public:
-    SwXBodyText(SwDoc* pDoc);
-
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw(){OWeakObject::acquire();}
-    virtual void SAL_CALL release(  ) throw(){OWeakObject::release();}
-
-    //XAggregation
-    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XText
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XEnumerationAccess - frueher XParagraphEnumerationAccess
-    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);
-
-    //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 );
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  CreateTextCursor(BOOL bIgnoreTables = sal_False);
-};
-
-
-/*-----------------12.02.98 08:01-------------------
-
---------------------------------------------------*/
-typedef
-cppu::WeakImplHelper5
-<
-    ::com::sun::star::text::XFootnote,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XEnumerationAccess,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XUnoTunnel
->
-SwXFootnoteBaseClass;
-class SwXFootnote : public SwXFootnoteBaseClass,
-    public SwXText,
-    public SwClient
-{
-    friend class SwXFootnotes;
-
-    SwEventListenerContainer    aLstnrCntnr;
-    const SwFmtFtn*             pFmtFtn;
-    BOOL                        m_bIsDescriptor;
-    String                      m_sLabel;
-    BOOL                        m_bIsEndnote;
-
-protected:
-    virtual const SwStartNode *GetStartNode() const;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >         createCursor()throw(::com::sun::star::uno::RuntimeException);
-    virtual ~SwXFootnote();
-public:
-    SwXFootnote(BOOL bEndnote);
-    SwXFootnote(SwDoc* pDoc, const SwFmtFtn& rFmt);
-
-
-    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);
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw(){SwXFootnoteBaseClass::acquire();}
-    virtual void SAL_CALL release(  ) throw(){SwXFootnoteBaseClass::release();}
-
-    //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XFootnote
-    virtual rtl::OUString SAL_CALL getLabel(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setLabel(const rtl::OUString& aLabel) 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);
-
-    //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 );
-
-    //XText
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XEnumerationAccess - frueher XParagraphEnumerationAccess
-    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);
-
-    //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 );
-
-    //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);
-
-    //SwClient
-    virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-    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 );
-
-    const SwFmtFtn* FindFmt() const {return GetDoc() ? pFmtFtn : 0;}
-    void            Invalidate();
-};
-
 /* -----------------23.03.99 12:57-------------------
  *
  * --------------------------------------------------*/
@@ -521,58 +247,6 @@ public:
     void                    SetSortOptions(const SwSortOptions& rSortOpt);
 };
 */
-/* -----------------25.08.98 11:02-------------------
- *
- * --------------------------------------------------*/
-typedef
-cppu::WeakImplHelper2
-<
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XEnumerationAccess
->
-SwXHeadFootTextBaseClass;
-class SwXHeadFootText : public SwXHeadFootTextBaseClass,
-    public SwXText,
-    public SwClient
-{
-    SwFrmFmt*           GetFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
-    BOOL                bIsHeader;
-protected:
-    virtual const SwStartNode *GetStartNode() const;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >         createCursor()throw(::com::sun::star::uno::RuntimeException);
-public:
-    SwXHeadFootText(SwFrmFmt& rHeadFootFmt, BOOL bHeader);
-    ~SwXHeadFootText();
-
-    TYPEINFO();
-
-    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL acquire(  ) throw(){SwXHeadFootTextBaseClass::acquire();}
-    virtual void SAL_CALL release(  ) throw(){SwXHeadFootTextBaseClass::release();}
-
-    //XTypeProvider
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL getImplementationId(  ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XText
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >  SAL_CALL createTextCursorByRange(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & aTextPosition) 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 );
-
-    //XEnumerationAccess - frueher XParagraphEnumerationAccess
-    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);
-
-    //SwClient
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-};
 
 #endif
 
diff --git a/sw/inc/unoredline.hxx b/sw/inc/unoredline.hxx
index 5730c6e55ff0..b46189734301 100644
--- a/sw/inc/unoredline.hxx
+++ b/sw/inc/unoredline.hxx
@@ -31,9 +31,11 @@
 #define _UNOREDLINE_HXX
 
 #include <unoport.hxx>
-#include <unoobj.hxx>
+#include <unotext.hxx>
+
 
 class SwRedline;
+
 /* -----------------------------19.12.00 11:35--------------------------------
 
  ---------------------------------------------------------------------------*/
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index c14dac1bc2d0..d2e14309a5d4 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -30,8 +30,8 @@
 #ifndef _UNOTBL_HXX
 #define _UNOTBL_HXX
 
-#include <unoobj.hxx>
 #include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
 #include <com/sun/star/util/XSortable.hpp>
 #include <com/sun/star/chart/XChartData.hpp>
 #include <com/sun/star/chart/XChartDataArray.hpp>
@@ -43,22 +43,27 @@
 #include <com/sun/star/table/XAutoFormattable.hpp>
 
 #include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase4.hxx>
 #include <cppuhelper/implbase5.hxx>
 #include <cppuhelper/implbase7.hxx>
 #include <cppuhelper/implbase10.hxx>
 
 #include <comphelper/uno3.hxx>
+#include <tools/string.hxx>
 
 #include <TextCursorHelper.hxx>
+#include <unoevtlstnr.hxx>
+#include <unotext.hxx>
 
 
-class SwTableBoxFmt;
+class SwUnoCrsr;
+class SwTable;
+class SwTableBox;
 class SwTableLine;
 class SwTableCursor;
 class SwTableBoxFmt;
-class SwTableLine;
-class SwTableCursor;
 class SwChartDataProvider;
+class SwFrmFmt;
 
 
 /* -----------------------------22.09.00 11:10--------------------------------
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
new file mode 100644
index 000000000000..499e0620dae4
--- /dev/null
+++ b/sw/inc/unotext.hxx
@@ -0,0 +1,375 @@
+/*************************************************************************
+ *
+ * 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_UNOTEXT_HXX
+#define SW_UNOTEXT_HXX
+
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/text/XText.hpp>
+#include <com/sun/star/text/XTextRangeCompare.hpp>
+#include <com/sun/star/text/XRelativeTextContentInsert.hpp>
+#include <com/sun/star/text/XRelativeTextContentRemove.hpp>
+#include <com/sun/star/text/XTextAppendAndConvert.hpp>
+
+#include <tools/debug.hxx>
+
+#include <unobaseclass.hxx>
+
+
+namespace com { namespace sun { namespace star {
+    namespace text {
+        class XTextContent;
+    }
+} } }
+
+class SfxItemPropertySet;
+class SwDoc;
+class SwStartNode;
+class SwPaM;
+class OTextCursorHelper;
+class SwXTextRange;
+
+
+/* -----------------03.12.98 12:22-------------------
+ *
+ * --------------------------------------------------*/
+
+class SwXText
+    : public ::com::sun::star::lang::XTypeProvider
+    , public ::com::sun::star::lang::XUnoTunnel
+    , public ::com::sun::star::beans::XPropertySet
+    , public ::com::sun::star::text::XTextAppendAndConvert
+    , public ::com::sun::star::text::XTextRangeCompare
+    , public ::com::sun::star::text::XRelativeTextContentInsert
+    , public ::com::sun::star::text::XRelativeTextContentRemove
+{
+
+private:
+
+    SwDoc*                      pDoc;
+    BOOL                        bObjectValid;
+    CursorType                  eCrsrType;
+    const SfxItemPropertySet*   m_pPropSet;
+
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL
+        finishOrAppendParagraph(
+            bool bFinish,
+            const ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue >&
+                rCharacterAndParagraphProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    virtual void PrepareForAttach(
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xRange,
+            SwXTextRange const * const pRange, SwPaM const * const pPam);
+
+protected:
+
+    virtual ~SwXText();
+
+public: /*not protected because C++ is retarded*/
+    virtual const SwStartNode *GetStartNode() const;
+
+public:
+
+    SwXText(SwDoc* pDc, CursorType eType);
+
+    const SwDoc*    GetDoc() const  { return pDoc; }
+    SwDoc*          GetDoc()        { return pDoc; }
+
+    // SwDoc is set when SwXText is attached
+    void            SetDoc(SwDoc* pDc) {
+        DBG_ASSERT(!pDoc || !pDc, "Doc schon gesetzt?");
+        pDoc = pDc;
+        bObjectValid = 0 != pDc;
+    }
+
+    void            Invalidate() { bObjectValid = sal_False; }
+    BOOL            IsValid() const { return bObjectValid; }
+
+    CursorType      GetTextType() { return eCrsrType; }
+
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor > createCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+    INT16   ComparePositions(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange>& xPos1,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange>& xPos2)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    BOOL    CheckForOwnMember(const SwXTextRange* pRange1,
+                const OTextCursorHelper* pCursor1)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual bool CheckForOwnMemberMeta(
+            const SwXTextRange* const pRange,
+            const SwPaM* const pPam, bool bAbsorb)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+               ::com::sun::star::uno::RuntimeException);
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XTypeProvider
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+        SAL_CALL getTypes()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    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);
+
+    // 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);
+
+    // 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);
+
+    // XSimpleText
+    virtual void SAL_CALL insertString(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xRange,
+            const ::rtl::OUString& aString, sal_Bool bAbsorb)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertControlCharacter(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xRange,
+            sal_Int16 nControlCharacter, sal_Bool bAbsorb)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XText
+    virtual void SAL_CALL insertTextContent(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xRange,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent > & xContent,
+            sal_Bool bAbsorb)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+            ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTextContent(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent > & xContent)
+        throw (::com::sun::star::container::NoSuchElementException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XParagraphAppend
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL
+        appendParagraph(
+            const ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue >&
+                rCharacterAndParagraphProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL
+        finishParagraph(
+            const ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue >&
+                rCharacterAndParagraphProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XTextPortionAppend
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL
+        appendTextPortion(
+            const ::rtl::OUString& rText,
+            const ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue >&
+                rCharacterAndParagraphProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XTextContentAppend
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > SAL_CALL
+        appendTextContent(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent >& xTextContent,
+            const ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue >&
+                rCharacterAndParagraphProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XTextConvert
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent > SAL_CALL
+        convertToTextFrame(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xStart,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xEnd,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& xFrameProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextTable > SAL_CALL
+        convertToTable(
+            ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::uno::Sequence<
+                        ::com::sun::star::uno::Reference<
+                            ::com::sun::star::text::XTextRange > > > > const&
+                rTableRanges,
+           ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::uno::Sequence<
+                        ::com::sun::star::beans::PropertyValue > > > const&
+                rCellProperties,
+           ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Sequence<
+                    ::com::sun::star::beans::PropertyValue > > const&
+                rRowProperties,
+           ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue > const&
+                rTableProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XTextRangeCompare
+    sal_Int16 SAL_CALL compareRegionStarts(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xR1,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xR2)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    sal_Int16 SAL_CALL compareRegionEnds(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xR1,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xR2)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XRelativeTextContentInsert
+    virtual void SAL_CALL insertTextContentBefore(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xNewContent,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xSuccessor)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL insertTextContentAfter(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xNewContent,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xPredecessor)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XRelativeTextContentRemove
+    virtual void SAL_CALL removeTextContentBefore(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xSuccessor)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL removeTextContentAfter(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextContent>& xPredecessor)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOTEXT_HXX
+
diff --git a/sw/inc/unotextbodyhf.hxx b/sw/inc/unotextbodyhf.hxx
new file mode 100644
index 000000000000..8e7a64c18669
--- /dev/null
+++ b/sw/inc/unotextbodyhf.hxx
@@ -0,0 +1,218 @@
+/*************************************************************************
+ *
+ * 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_UNOTEXTBODYHF_HXX
+#define SW_UNOTEXTBODYHF_HXX
+
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+#include <calbck.hxx>
+#include <unoevtlstnr.hxx>
+#include <unotext.hxx>
+
+
+class SwDoc;
+class SwFrmFmt;
+
+
+typedef ::cppu::WeakAggImplHelper2
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumerationAccess
+> SwXBodyText_Base;
+
+class SwXBodyText
+    : public SwXBodyText_Base
+    , public SwXText
+{
+
+protected:
+
+    virtual ~SwXBodyText();
+
+public:
+
+    SwXBodyText(SwDoc* pDoc);
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >
+        CreateTextCursor(sal_Bool bIgnoreTables = sal_False);
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void SAL_CALL release() throw() { OWeakObject::release(); }
+
+    // XAggregation
+    virtual ::com::sun::star::uno::Any SAL_CALL queryAggregation(
+            const ::com::sun::star::uno::Type& rType)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XTypeProvider
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+        SAL_CALL getTypes()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        getImplementationId()
+        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);
+
+    // 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);
+
+    // XSimpleText
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursorByRange(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextPosition)
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+
+/* -----------------25.08.98 11:02-------------------
+ *
+ * --------------------------------------------------*/
+typedef ::cppu::WeakImplHelper2
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumerationAccess
+> SwXHeadFootText_Base;
+
+class SwXHeadFootText
+    : public SwXHeadFootText_Base
+    , public SwXText
+    , public SwClient
+{
+
+private:
+
+    SwFrmFmt*           GetFmt() const { return (SwFrmFmt*)GetRegisteredIn(); }
+    BOOL                bIsHeader;
+
+protected:
+
+    virtual const SwStartNode *GetStartNode() const;
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >
+        createCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual ~SwXHeadFootText();
+
+public:
+
+    SwXHeadFootText(SwFrmFmt& rHeadFootFmt, BOOL bHeader);
+
+    TYPEINFO();
+
+    // SwClient
+    virtual void        Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+    // XInterface
+    virtual ::com::sun::star::uno::Any SAL_CALL queryInterface(
+            const ::com::sun::star::uno::Type& rType)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL acquire() throw() { OWeakObject::acquire(); }
+    virtual void SAL_CALL release() throw() { OWeakObject::release(); }
+
+    // XTypeProvider
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type >
+        SAL_CALL getTypes()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< sal_Int8 > SAL_CALL
+        getImplementationId()
+        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);
+
+    // 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);
+
+    // XSimpleText
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >  SAL_CALL
+        createTextCursorByRange(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextPosition)
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOTEXTBODYHF_HXX
+
diff --git a/sw/source/core/doc/doclay.cxx b/sw/source/core/doc/doclay.cxx
index e58059d95ac9..a366f7f898b7 100644
--- a/sw/source/core/doc/doclay.cxx
+++ b/sw/source/core/doc/doclay.cxx
@@ -1880,7 +1880,8 @@ IMPL_LINK( SwDoc, DoIdleJobs, Timer *, pTimer )
             BOOL bIsOnlineSpell = pSh->GetViewOptions()->IsOnlineSpell();
 
             sal_Bool bIsAutoGrammar = sal_False;
-            SvtLinguConfig().GetProperty( C2U( UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar;
+            SvtLinguConfig().GetProperty( ::rtl::OUString::createFromAscii(
+                        UPN_IS_GRAMMAR_AUTO ) ) >>= bIsAutoGrammar;
 
             if (bIsOnlineSpell && bIsAutoGrammar)
                 StartGrammarChecking( *this );
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index bdef8a74bcf7..f5963931f545 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -99,6 +99,7 @@
 #include <fmtclbl.hxx>
 #include <swunohelper.hxx>
 #include <unoframe.hxx>
+#include <unotextbodyhf.hxx>
 #include <SwStyleNameMapper.hxx>
 /// OD 22.08.2002 #99657#
 ///     include definition of class SvxBrushItem and GraphicObject
diff --git a/sw/source/core/unocore/unoclbck.cxx b/sw/source/core/unocore/unoclbck.cxx
index 01890a1f40a4..9807a8f5b3fb 100644
--- a/sw/source/core/unocore/unoclbck.cxx
+++ b/sw/source/core/unocore/unoclbck.cxx
@@ -35,7 +35,7 @@
 #include <hintids.hxx>
 #include <tools/debug.hxx>
 #include <swtypes.hxx>
-#include <unoobj.hxx>
+#include <unofootnote.hxx>
 #include <unorefmark.hxx>
 #include <unoidx.hxx>
 #include <tox.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index 9cec70fa8a2f..437fec101e53 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -66,7 +66,9 @@
 #include <unofield.hxx>
 #include <unoidx.hxx>
 #include <unoframe.hxx>
+#include <unofootnote.hxx>
 #include <vcl/svapp.hxx>
+#include <fmtcntnt.hxx>
 #include <authfld.hxx>
 #include <SwXTextDefaults.hxx>
 #include <unochart.hxx>
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index 5b83f3007904..e152ff2b9d23 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -37,6 +37,7 @@
 #include <cmdid.h>
 #include <unocrsrhelper.hxx>
 #include <unoobj.hxx>
+#include <unofootnote.hxx>
 #include <unotextcursor.hxx>
 #include <unorefmark.hxx>
 #include <unostyle.hxx>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index b3c5eebc11a8..2bfaadaa4f1e 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -37,6 +37,7 @@
 #include <unomid.h>
 #include <unodraw.hxx>
 #include <unocoll.hxx>
+#include <unoobj.hxx>
 #include <unoframe.hxx>
 #include <unoparagraph.hxx>
 #include <unotextrange.hxx>
@@ -44,6 +45,7 @@
 #include <svx/unoprnms.hxx>
 #include <swunohelper.hxx>
 #include <doc.hxx>
+#include <fmtcntnt.hxx>
 #include <fmtflcnt.hxx>
 #include <txtatr.hxx>
 #include <docsh.hxx>
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index 23ec936a4244..a4d83d8f51d5 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -35,6 +35,7 @@
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
 #include <unoobj.hxx>
+#include <unofootnote.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
@@ -147,7 +148,7 @@ SwXFootnote::~SwXFootnote()
  ---------------------------------------------------------------------------*/
 uno::Sequence< uno::Type > SAL_CALL SwXFootnote::getTypes(  ) throw(uno::RuntimeException)
 {
-    uno::Sequence< uno::Type > aFtnTypes = SwXFootnoteBaseClass::getTypes();
+    uno::Sequence< uno::Type > aFtnTypes = SwXFootnote_Base::getTypes();
     uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
 
     long nIndex = aFtnTypes.getLength();
@@ -179,12 +180,13 @@ uno::Sequence< sal_Int8 > SAL_CALL SwXFootnote::getImplementationId(  ) throw(un
 /* -----------------------------21.03.00 15:46--------------------------------
 
  ---------------------------------------------------------------------------*/
-uno::Any SAL_CALL SwXFootnote::queryInterface( const uno::Type& aType ) throw(uno::RuntimeException)
+uno::Any SAL_CALL SwXFootnote::queryInterface(const uno::Type& rType)
+throw (uno::RuntimeException)
 {
-    uno::Any aRet = SwXFootnoteBaseClass::queryInterface(aType);
-    if(aRet.getValueType() == ::getCppuVoidType() )
-        aRet = SwXText::queryInterface(aType);
-    return aRet;
+    const uno::Any ret = SwXFootnote_Base::queryInterface(rType);
+    return (ret.getValueType() == ::getCppuVoidType())
+        ?   SwXText::queryInterface(rType)
+        :   ret;
 }
 
 /*-- 10.12.98 15:31:47---------------------------------------------------
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 299d9904d4f4..aa6a35526866 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -78,6 +78,8 @@
 #include <txtrfmrk.hxx>
 #include <unoclbck.hxx>
 #include <unoobj.hxx>
+#include <unofootnote.hxx>
+#include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 99e67d06a00a..8a47c71ebd75 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 <unotext.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index efaaa32c9e3d..a88b3ff4672c 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -36,6 +36,7 @@
 #include <vcl/svapp.hxx>
 #include <unoredlines.hxx>
 #include <unoredline.hxx>
+#include <unoobj.hxx>
 #include <tools/debug.hxx>
 #include <pagedesc.hxx>
 #include "poolfmt.hxx"
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index ce501056affc..61c3056a7bef 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -440,6 +440,7 @@ void SwXReferenceMark::removeVetoableChangeListener(
 
 #include <com/sun/star/lang/DisposedException.hpp>
 #include <unometa.hxx>
+#include <unotext.hxx>
 #include <unoport.hxx>
 #include <txtatr.hxx>
 #include <fmtmeta.hxx>
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 722235e3c391..cbf75f593146 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <hintids.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
@@ -62,6 +61,7 @@
 #include <shellio.hxx>
 #include <docstyle.hxx>
 #include <unoobj.hxx>
+#include <unotextbodyhf.hxx>
 #include <fmthdft.hxx>
 #include <fmtpdsc.hxx>
 #include <tools/urlobj.hxx>
@@ -74,16 +74,9 @@
 #include <SwStyleNameMapper.hxx>
 #include <sfx2/printer.hxx>
 #include <com/sun/star/style/ParagraphStyleCategory.hpp>
-/*
-#include <com/sun/star/frame/XModel.hpp>
-*/
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_NAMEDVALUE_HPPP_
 #include <com/sun/star/beans/NamedValue.hpp>
-#endif
 #include <istyleaccess.hxx>
 #include <GetMetricVal.hxx>
 #include <fmtfsize.hxx>
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index be23a873ad28..63e27c7abc8d 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -40,6 +40,8 @@
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
 #include <unoobj.hxx>
+#include <unotextbodyhf.hxx>
+#include <unotext.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unosection.hxx>
@@ -2272,7 +2274,7 @@ uno::Any SwXBodyText::queryAggregation(
   -----------------------------------------------------------------------*/
 uno::Sequence< uno::Type > SwXBodyText::getTypes(  ) throw(uno::RuntimeException)
 {
-    uno::Sequence< uno::Type > aTypes = SwXBodyTextBaseClass::getTypes();
+    uno::Sequence< uno::Type > aTypes = SwXBodyText_Base::getTypes();
     uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
     long nIndex = aTypes.getLength();
     aTypes.realloc(aTypes.getLength() + aTextTypes.getLength());
@@ -2301,13 +2303,13 @@ uno::Sequence< sal_Int8 > SwXBodyText::getImplementationId(  ) throw(uno::Runtim
 
   -----------------------------------------------------------------------*/
 uno::Any SAL_CALL
-    SwXBodyText::queryInterface( const uno::Type& rType )
-        throw(uno::RuntimeException)
+SwXBodyText::queryInterface(const uno::Type& rType)
+throw (uno::RuntimeException)
 {
-      uno::Any aRet = SwXText::queryInterface( rType );
-    if(aRet.getValueType() == ::getCppuVoidType())
-        aRet = SwXBodyTextBaseClass::queryInterface( rType );
-    return aRet;
+    const uno::Any ret = SwXText::queryInterface(rType);
+    return (ret.getValueType() == ::getCppuVoidType())
+        ?   SwXBodyText_Base::queryInterface(rType)
+        :   ret;
 }
 /* -----------------------------05.01.00 11:07--------------------------------
 
@@ -2504,7 +2506,7 @@ uno::Reference< text::XTextCursor >   SwXHeadFootText::createCursor() throw(uno:
  ---------------------------------------------------------------------------*/
 uno::Sequence< uno::Type > SwXHeadFootText::getTypes(  ) throw(uno::RuntimeException)
 {
-    uno::Sequence< uno::Type > aHFTypes = SwXHeadFootTextBaseClass::getTypes();
+    uno::Sequence< uno::Type > aHFTypes = SwXHeadFootText_Base::getTypes();
     uno::Sequence< uno::Type > aTextTypes = SwXText::getTypes();
 
     long nIndex = aHFTypes.getLength();
@@ -2538,12 +2540,13 @@ uno::Sequence< sal_Int8 > SwXHeadFootText::getImplementationId(  ) throw(uno::Ru
 /* -----------------------------21.03.00 15:46--------------------------------
 
  ---------------------------------------------------------------------------*/
-uno::Any SwXHeadFootText::queryInterface( const uno::Type& aType ) throw(uno::RuntimeException)
+uno::Any SwXHeadFootText::queryInterface(const uno::Type& rType)
+throw (uno::RuntimeException)
 {
-    uno::Any aRet = SwXHeadFootTextBaseClass::queryInterface(aType);
-    if(aRet.getValueType() == ::getCppuVoidType() )
-        aRet = SwXText::queryInterface(aType);
-    return aRet;
+    const uno::Any ret = SwXHeadFootText_Base::queryInterface(rType);
+    return (ret.getValueType() == ::getCppuVoidType())
+        ?   SwXText::queryInterface(rType)
+        :   ret;
 }
 
 /*-- 11.12.98 10:14:50---------------------------------------------------
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index cd3c5d1734d4..74196dfbd9ce 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
@@ -41,7 +40,6 @@
 #include <com/sun/star/xforms/XFormsSupplier.hpp>
 #include <svx/svdmodel.hxx>
 #include <svx/svdpage.hxx>
-#include <svx/xmlgrhlp.hxx>
 #include <svx/xmleohlp.hxx>
 #include <svx/xmlgrhlp.hxx>
 #include <svx/eeitem.hxx>
@@ -59,6 +57,7 @@
 #include <docstat.hxx>
 #include <swerror.h>
 #include <unoobj.hxx>
+#include <unotext.hxx>
 #include <xmltexte.hxx>
 #include <xmlexp.hxx>
 #include <sfx2/viewsh.hxx>
@@ -76,6 +75,7 @@
 #include <pausethreadstarting.hxx>
 // <--
 
+
 using ::rtl::OUString;
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::frame;
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index 1edeb1fc846a..d3d8772e43da 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -31,15 +31,16 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include "hintids.hxx"
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <svx/fontitem.hxx>
-#include <unoobj.hxx>
+//#include <unoobj.hxx>
+#include <unotext.hxx>
 #include <doc.hxx>
 #include <xmlexp.hxx>
 
+
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::lang;
 using namespace ::com::sun::star::text;
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 476f8871e7a5..cf96a699dd7f 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -48,6 +48,7 @@
 #include <doc.hxx>
 #include <TextCursorHelper.hxx>
 #include <unoobj.hxx>
+#include <unotext.hxx>
 #include <unotextrange.hxx>
 #include "unocrsr.hxx"
 #include <poolfmt.hxx>
diff --git a/sw/source/filter/xml/xmltexte.cxx b/sw/source/filter/xml/xmltexte.cxx
index 018ca0c0b5bb..6ef61df5a0bc 100644
--- a/sw/source/filter/xml/xmltexte.cxx
+++ b/sw/source/filter/xml/xmltexte.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <sot/clsids.hxx>
 #include <com/sun/star/embed/XEmbedObjectCreator.hpp>
 #include <com/sun/star/embed/XEmbeddedObject.hpp>
@@ -44,13 +43,12 @@
 #include <xmloff/families.hxx>
 #include <xmloff/xmlnmspe.hxx>
 #include <xmloff/xmltoken.hxx>
-#ifndef _XMLOFF_TXTPRMAP_HXX
 #include <xmloff/txtprmap.hxx>
-#endif
 
 #include <svx/svdobj.hxx>
 #include <doc.hxx>
 #include <ndole.hxx>
+#include <fmtcntnt.hxx>
 #include <unostyle.hxx>
 #include <unoframe.hxx>
 #include <ndgrf.hxx>
@@ -65,6 +63,7 @@
 #include <sfx2/frmdescr.hxx>
 #include <SwStyleNameMapper.hxx>
 
+
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
 using namespace ::com::sun::star;
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 5543277cc585..7ed98a979a6a 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -50,6 +50,7 @@
 #include <unoatxt.hxx>
 #include <unomap.hxx>
 #include <unoobj.hxx>
+#include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <TextCursorHelper.hxx>
 #include <swevent.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index 8d29db3dd30d..3afeb1ee0c39 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -50,6 +50,7 @@
 #include <unotxdoc.hxx>
 #include <svtools/numuno.hxx>
 #include <unoobj.hxx>
+#include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unosett.hxx>
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index 9da88953d481..9de9e882b869 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -47,6 +47,7 @@
 #include <view.hxx>
 #include <viewopt.hxx>
 #include <unomod.hxx>
+#include <unoobj.hxx>
 #include <unoframe.hxx>
 #include <unocrsr.hxx>
 #include <wrtsh.hxx>
author	Michael Stahl <mst@openoffice.org>	2010-01-05 16:37:47 +0100
committer	Michael Stahl <mst@openoffice.org>	2010-01-05 16:37:47 +0100
commit	a6b34b60ba3e7451cfa8d5a492d53484ec131421 (patch)
tree	c673e2830400913406221220e7dda61dd19939a8 /sw
parent	e23c9ccd3e9e8d415d0bbab189e2de5ba48b42e9 (diff)