cws tl74: merge

48 files changed, 3964 insertions, 2158 deletions

diff --git a/sw/inc/IDocumentDeviceAccess.hxx b/sw/inc/IDocumentDeviceAccess.hxx
index 30e698e74d70..fbfdd82d001b 100755
--- a/sw/inc/IDocumentDeviceAccess.hxx
+++ b/sw/inc/IDocumentDeviceAccess.hxx
@@ -33,7 +33,7 @@
 
  class SfxPrinter;
  class JobSetup;
- struct SwPrintData;
+ class SwPrintData;
  class VirtualDevice;
  class OutputDevice;
 
diff --git a/sw/inc/calbck.hxx b/sw/inc/calbck.hxx
index 7a8ff7f8f471..cde55aec812e 100644
--- a/sw/inc/calbck.hxx
+++ b/sw/inc/calbck.hxx
@@ -202,7 +202,7 @@ class SwClientIter
     friend SwClient* SwModify::_Remove(SwClient *); // fuer Ptr-Korrektur
     friend void SwModify::Add(SwClient *);          // nur fuer ASSERT !
 
-    SwModify& rRoot;
+    SwModify const& rRoot;
     SwClient *pAkt, *pDelNext;
     // fuers Updaten der aller Iteratoren beim Einfuegen/Loeschen von
     // Clients, wenn der Iterator gerade draufsteht.
@@ -213,11 +213,10 @@ class SwClientIter
     TypeId aSrchId;             // fuer First/Next - suche diesen Type
 
 public:
-    SW_DLLPUBLIC SwClientIter( SwModify& );
+    SW_DLLPUBLIC SwClientIter( SwModify const& );
     SW_DLLPUBLIC ~SwClientIter();
 
     const SwModify& GetModify() const       { return rRoot; }
-          SwModify& GetModify()             { return rRoot; }
 
 #ifndef CFRONT
     SwClient* operator++(int);  // zum Naechsten
diff --git a/sw/inc/chpfld.hxx b/sw/inc/chpfld.hxx
index 08ebcf93bd5c..0edd6681da58 100644
--- a/sw/inc/chpfld.hxx
+++ b/sw/inc/chpfld.hxx
@@ -32,9 +32,11 @@
 
 #include "fldbas.hxx"
 
+
 class SwFrm;
+class SwCntntNode;
 class SwTxtNode;
-#include <unoobj.hxx>
+
 
 enum SwChapterFormat
 {
diff --git a/sw/inc/cmdid.h b/sw/inc/cmdid.h
index d30ce294f85f..7e20f32b7457 100644
--- a/sw/inc/cmdid.h
+++ b/sw/inc/cmdid.h
@@ -323,7 +323,6 @@ Achtung: Ab sofort sind in diesem File keine C++-Kommentare (//) mehr
 #define FN_GLOBAL_OPEN          (FN_VIEW + 47)  /* oeffnen */
 #define FN_GLOBAL_SAVE_CONTENT  (FN_VIEW + 48)  /* Inhalt der Verknuepfung mitspeichern */
 #define FN_CREATE_NAVIGATION    (FN_VIEW + 49)  /* Navigations-Controller erzeugen */
-#define FN_PREVIEW_PRINT_OPTIONS (FN_VIEW + 50)  /* Optionsdialog Preview drucken */
 #define FN_PREVIEW_ZOOM          (FN_VIEW + 51)  /* der Tabellencontroller fuer den Zoom */
 
 #define FN_SET_MODOPT_TBLNUMFMT  (FN_VIEW + 52) /* Zahlenerkennung in Tabellen */
diff --git a/sw/inc/dbfld.hxx b/sw/inc/dbfld.hxx
index 9b61f001ed12..9adb2eb688a5 100644
--- a/sw/inc/dbfld.hxx
+++ b/sw/inc/dbfld.hxx
@@ -52,6 +52,7 @@ class SW_DLLPUBLIC SwDBFieldType : public SwValueFieldType
 public:
 
     SwDBFieldType(SwDoc* pDocPtr, const String& rColumnName, const SwDBData& rDBData);
+    ~SwDBFieldType();
 
     virtual const String& GetName() const;
     virtual SwFieldType*  Copy() const;
diff --git a/sw/inc/dbmgr.hxx b/sw/inc/dbmgr.hxx
index dfb67a7025f9..cf49361ee8a4 100644
--- a/sw/inc/dbmgr.hxx
+++ b/sw/inc/dbmgr.hxx
@@ -184,7 +184,7 @@ struct SwMergeDescriptor
         rDescriptor(rDesc),
         bSendAsHTML( sal_True ),
         bSendAsAttachment( sal_False ),
-        bPrintAsync( sal_True ),
+        bPrintAsync( sal_False ),
         bCreateSingleFile( sal_False ),
         pMailMergeConfigItem(0)
         {}
@@ -252,12 +252,6 @@ public:
     // Mischen von Datensaetzen in Felder
     BOOL            MergeNew( const SwMergeDescriptor& rMergeDesc );
     BOOL            Merge(SwWrtShell* pSh);
-    // Mischen von Datensaetzen in Felder, dann drucken
-    BOOL            MergePrint( SwView& rView,
-                                SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI );
-    // printing parts of a merge result document
-    BOOL            MergePrintDocuments( SwView& rView,
-                                SwPrtOptions& rOpt, SfxProgress& rProgress, BOOL bIsAPI );
 
     // Datenbankfelder mit fehlendem Datenbankname initialisieren
     inline BOOL     IsInitDBFields() const  { return bInitDBFields; }
diff --git a/sw/inc/dcontact.hxx b/sw/inc/dcontact.hxx
index e1f20183deca..dc767403d1d5 100644
--- a/sw/inc/dcontact.hxx
+++ b/sw/inc/dcontact.hxx
@@ -191,11 +191,11 @@ public:
     }
 
     RndStdIds GetAnchorId() const { return GetAnchorFmt().GetAnchorId(); }
-    bool      ObjAnchoredAtPage() const { return GetAnchorId() == FLY_PAGE; }
-    bool      ObjAnchoredAtFly() const { return GetAnchorId() == FLY_AT_FLY; }
-    bool      ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_CNTNT; }
-    bool      ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AUTO_CNTNT; }
-    bool      ObjAnchoredAsChar() const { return GetAnchorId() == FLY_IN_CNTNT; }
+    bool      ObjAnchoredAtPage() const { return GetAnchorId() == FLY_AT_PAGE; }
+    bool      ObjAnchoredAtFly()  const { return GetAnchorId() == FLY_AT_FLY; }
+    bool      ObjAnchoredAtPara() const { return GetAnchorId() == FLY_AT_PARA; }
+    bool      ObjAnchoredAtChar() const { return GetAnchorId() == FLY_AT_CHAR; }
+    bool      ObjAnchoredAsChar() const { return GetAnchorId() == FLY_AS_CHAR; }
 
     const SwPosition&  GetCntntAnchor() const
     {
diff --git a/sw/inc/doc.hxx b/sw/inc/doc.hxx
index df81a13dab12..0078d65ddcc4 100644
--- a/sw/inc/doc.hxx
+++ b/sw/inc/doc.hxx
@@ -88,6 +88,8 @@ class SwList;
 
 #include <svtools/embedhlp.hxx>
 #include <vector>
+#include <set>
+#include <map>
 #include <memory>
 
 #include <boost/scoped_ptr.hpp>
@@ -199,7 +201,6 @@ class SwLayouter;
 class SdrView;
 class SdrMarkList;
 class SwAuthEntry;
-class SwUnoCallBack;
 class SwLayoutCache;
 class IStyleAccess;
 struct SwCallMouseEvent;
@@ -207,7 +208,8 @@ struct SwDocStat;
 struct SwHash;
 struct SwSortOptions;
 struct SwDefTOXBase_Impl;
-struct SwPrintData;
+class SwPrintData;
+class SwPrintUIOptions;
 class SdrPageView;
 struct SwConversionArgs;
 class SwRewriter;
@@ -215,6 +217,10 @@ class SwMsgPoolItem;
 class SwChartDataProvider;
 class SwChartLockController_Helper;
 class IGrammarContact;
+class SwPrintData;
+class SwRenderData;
+class SwPageFrm;
+class SwViewOption;
 
 namespace sw { namespace mark {
     class MarkManager;
@@ -391,7 +397,7 @@ class SW_DLLPUBLIC SwDoc :
     SwLayoutCache   *pLayoutCache;  // Layout cache to read and save with the
                                     // document for a faster formatting
 
-    SwUnoCallBack   *pUnoCallBack;
+    SwModify *pUnoCallBack;
     IGrammarContact *mpGrammarContact;   // for grammar checking in paragraphs during editing
 
     mutable  comphelper::ImplementationReference< SwChartDataProvider
@@ -1361,6 +1367,15 @@ public:
     sal_Bool InsertGlossary( SwTextBlocks& rBlock, const String& rEntry,
                         SwPaM& rPaM, SwCrsrShell* pShell = 0);
 
+    // get the set of printable pages for the XRenderable API by
+    // evaluating the respective settings (see implementation)
+    void CalculatePagesForPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+            sal_Int32 nDocPageCount );
+    void UpdatePagesForPrintingWithPostItData( SwRenderData &rData, const SwPrintUIOptions &rOptions, bool bIsPDFExport,
+            sal_Int32 nDocPageCount );
+    void CalculatePagePairsForProspectPrinting( SwRenderData &rData, const SwPrintUIOptions &rOptions,
+            sal_Int32 nDocPageCount );
+
     sal_uInt16 GetPageCount() const;
     const Size GetPageSize( sal_uInt16 nPageNum, bool bSkipEmptyPages ) const;
 
diff --git a/sw/inc/docsh.hxx b/sw/inc/docsh.hxx
index a0c7635029f0..8f63fe816102 100644..100755
--- a/sw/inc/docsh.hxx
+++ b/sw/inc/docsh.hxx
@@ -183,6 +183,7 @@ public:
 
     // Doc rausreichen aber VORSICHT
     inline SwDoc*                   GetDoc() { return pDoc; }
+    inline const SwDoc*             GetDoc() const { return pDoc; }
     IDocumentDeviceAccess*          getIDocumentDeviceAccess();
     const IDocumentSettingAccess*   getIDocumentSettingAccess() const;
     IDocumentChartDataProviderAccess*       getIDocumentChartDataProviderAccess();
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index d74ed247e0cc..23f8777107ef 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -55,7 +55,7 @@ class SW_DLLPUBLIC SwFmtAnchor: public SfxPoolItem
     static sal_uInt32 mnOrderCounter;
 
 public:
-    SwFmtAnchor( RndStdIds eRnd = FLY_PAGE, USHORT nPageNum = 0 );
+    SwFmtAnchor( RndStdIds eRnd = FLY_AT_PAGE, USHORT nPageNum = 0 );
     SwFmtAnchor( const SwFmtAnchor &rCpy );
     ~SwFmtAnchor();
 
@@ -86,7 +86,7 @@ public:
 };
 
 inline const SwFmtAnchor &SwAttrSet::GetAnchor(BOOL bInP) const
-     { return (const SwFmtAnchor&)Get( RES_ANCHOR,bInP); }
+    { return static_cast<const SwFmtAnchor&>(Get(RES_ANCHOR, bInP)); }
 
  inline const SwFmtAnchor &SwFmt::GetAnchor(BOOL bInP) const
      { return aSet.GetAnchor(bInP); }
diff --git a/sw/inc/fmtmeta.hxx b/sw/inc/fmtmeta.hxx
index f676469b908f..616c4cddc1b9 100644..100755
--- a/sw/inc/fmtmeta.hxx
+++ b/sw/inc/fmtmeta.hxx
@@ -31,6 +31,8 @@
 #ifndef SW_FMTMETA_HXX
 #define SW_FMTMETA_HXX
 
+#include <cppuhelper/weakref.hxx>
+
 #include <svl/poolitem.hxx>
 #include <sfx2/Metadatable.hxx>
 
@@ -122,8 +124,8 @@ public:
     virtual SfxPoolItem *    Clone( SfxItemPool *pPool = 0 ) const;
 //    TYPEINFO();
 
-    // notify clients registered at m_pMeta that this meta is being removed
-    void NotifyRemoval();
+    /// notify clients registered at m_pMeta that this meta is being (re-)moved
+    void NotifyChangeTxtNode(SwTxtNode *const pTxtNode);
     static SwFmtMeta * CreatePoolDefault( const USHORT i_nWhich );
     ::sw::Meta * GetMeta() { return m_pMeta.get(); }
     /// this method <em>must</em> be called when the hint is actually copied
@@ -140,8 +142,11 @@ class Meta
     , public SwModify
 {
 protected:
-    friend class ::SwFmtMeta; // SetFmtMeta
-    friend class ::SwXMeta; // GetTxtNode, GetTxtAttr
+    friend class ::SwFmtMeta; // SetFmtMeta, NotifyChangeTxtNode
+    friend class ::SwXMeta; // GetTxtNode, GetTxtAttr, Get/SetXMeta
+
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::rdf::XMetadatable> m_wXMeta;
 
     SwFmtMeta * m_pFmt;
 
@@ -151,6 +156,15 @@ protected:
     SwFmtMeta * GetFmtMeta() const { return m_pFmt; }
     void SetFmtMeta( SwFmtMeta * const i_pFmt ) { m_pFmt = i_pFmt; };
 
+    void NotifyChangeTxtNode();
+
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::rdf::XMetadatable> const& GetXMeta() const
+            { return m_wXMeta; }
+    void SetXMeta(::com::sun::star::uno::Reference<
+                    ::com::sun::star::rdf::XMetadatable> const& xMeta)
+            { m_wXMeta = xMeta; }
+
 public:
     explicit Meta(SwFmtMeta * const i_pFmt = 0);
     virtual ~Meta();
diff --git a/sw/inc/frmfmt.hxx b/sw/inc/frmfmt.hxx
index a86b1c6689a0..61663d131aad 100644
--- a/sw/inc/frmfmt.hxx
+++ b/sw/inc/frmfmt.hxx
@@ -30,11 +30,14 @@
 #ifndef _FRMFMT_HXX
 #define _FRMFMT_HXX
 
-#include <format.hxx>
-
 // --> OD 2004-08-06 #i28749#
 #include <com/sun/star/text/PositionLayoutDir.hpp>
 // <--
+
+#include <cppuhelper/weakref.hxx>
+
+#include <format.hxx>
+
 #include "swdllapi.h"
 
 class SwFlyFrm;
@@ -51,8 +54,9 @@ class SW_DLLPUBLIC SwFrmFmt: public SwFmt
 {
     friend class SwDoc;
     friend class SwPageDesc;    //darf den protected CTor rufen.
-//  friend class SwSwgReader;   // der SW2-Reader auch!
-//  friend class Sw3IoImp;      // der SW3-Reader auch!
+
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::uno::XInterface> m_wXObject;
 
 protected:
     SwFrmFmt( SwAttrPool& rPool, const sal_Char* pFmtNm,
@@ -136,6 +140,13 @@ public:
 
     virtual String GetDescription() const;
 
+    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::uno::XInterface> const& GetXObject() const
+            { return m_wXObject; }
+    SW_DLLPRIVATE void SetXObject(::com::sun::star::uno::Reference<
+                    ::com::sun::star::uno::XInterface> const& xObject)
+            { m_wXObject = xObject; }
+
     DECL_FIXEDMEMPOOL_NEWDEL_DLL(SwFrmFmt)
 };
 
diff --git a/sw/inc/globals.hrc b/sw/inc/globals.hrc
index 0dc7f4e06be0..390b243cde03 100644
--- a/sw/inc/globals.hrc
+++ b/sw/inc/globals.hrc
@@ -54,6 +54,7 @@
 #define STR_DOC_STAT                (RC_GLOBALS_BEGIN + 10)
 
 #define STR_PAGE                    (RC_GLOBALS_BEGIN + 14)
+#define STR_PRINTOPTUI              (RC_GLOBALS_BEGIN + 15)
 
 //EventStrings
 
diff --git a/sw/inc/ndtxt.hxx b/sw/inc/ndtxt.hxx
index d4d59afa3d9c..04f1fad3e660 100644
--- a/sw/inc/ndtxt.hxx
+++ b/sw/inc/ndtxt.hxx
@@ -30,6 +30,8 @@
 #ifndef _NDTXT_HXX
 #define _NDTXT_HXX
 
+#include <cppuhelper/weakref.hxx>
+
 #include "swdllapi.h"
 #include <error.h>
 #include <node.hxx>
@@ -76,9 +78,12 @@ class SwScriptInfo;
 struct SwDocStat;
 struct SwParaIdleData_Impl;
 
-namespace com { namespace sun { namespace star { namespace uno {
-    template < class > class Sequence;
-}}}}
+namespace com { namespace sun { namespace star {
+    namespace uno {
+        template < class > class Sequence;
+    }
+    namespace text { class XTextContent; }
+} } }
 
 typedef std::set< xub_StrLen > SwSoftPageBreakList;
 
@@ -132,6 +137,8 @@ class SW_DLLPUBLIC SwTxtNode: public SwCntntNode, public ::sfx2::Metadatable
     SwList* mpList;
     // <--
 
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XTextContent> m_wXParagraph;
 
     SW_DLLPRIVATE SwTxtNode( const SwNodeIndex &rWhere, SwTxtFmtColl *pTxtColl,
                              const SfxItemSet* pAutoAttr = 0 );
@@ -813,6 +820,13 @@ public:
 
     USHORT GetScalingOfSelectedText( xub_StrLen nStt, xub_StrLen nEnd ) const;
 
+    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XTextContent> const& GetXParagraph() const
+            { return m_wXParagraph; }
+    SW_DLLPRIVATE void SetXParagraph(::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XTextContent> const& xParagraph)
+            { m_wXParagraph = xParagraph; }
+
     // sfx2::Metadatable
     virtual ::sfx2::IXmlIdRegistry& GetRegistry();
     virtual bool IsInClipboard() const;
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 40d8874f912d..8815945c8bc4 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -344,4 +344,7 @@ public:
     operator SwPageDesc() const; // #i7983#
 };
 
+
+SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName);
+
 #endif  //_PAGEDESC_HXX
diff --git a/sw/inc/printdata.hxx b/sw/inc/printdata.hxx
index 03a79281932c..3368418354cf 100644..100755
--- a/sw/inc/printdata.hxx
+++ b/sw/inc/printdata.hxx
@@ -33,15 +33,45 @@
 
 #include <sal/types.h>
 #include <rtl/ustring.hxx>
+#include <vcl/print.hxx>
 
-struct SwPrintData
+#include <set>
+#include <map>
+#include <vector>
+#include <utility>
+
+class SwPageFrm;
+class SwDoc;
+class SwDocShell;
+class ViewShell;
+class _SetGetExpFlds;
+class SwViewOption;
+class OutputDevice;
+class SwViewOptionAdjust_Impl;
+class SwPrtOptions;
+class SwWrtShell;
+class SfxViewShell;
+
+// forward declarations
+class SwPrintUIOptions;
+class SwRenderData;
+
+////////////////////////////////////////////////////////////
+
+
+class SwPrintData
 {
+    const SwPrintUIOptions *    m_pPrintUIOptions;  // not owner
+    const SwRenderData *        m_pRenderData;      // not owner
+
+public:
+
     sal_Bool bPrintGraphic, bPrintTable, bPrintDraw, bPrintControl, bPrintPageBackground,
              bPrintBlackFont,
              //#i81434# - printing of hidden text
              bPrintHiddenText, bPrintTextPlaceholder,
-             bPrintLeftPage, bPrintRightPage, bPrintReverse, bPrintProspect,
-             bPrintProspect_RTL,
+             bPrintLeftPages, bPrintRightPages, bPrintReverse, bPrintProspect,
+             bPrintProspectRTL,
              bPrintSingleJobs, bPaperFromSetup,
              // --> FME 2005-12-13 #b6354161# Print empty pages
              bPrintEmptyPages,
@@ -55,12 +85,15 @@ struct SwPrintData
 
     SwPrintData()
     {
+        m_pPrintUIOptions       = NULL;
+        m_pRenderData        = NULL;
+
         bPrintGraphic           =
         bPrintTable             =
         bPrintDraw              =
         bPrintControl           =
-        bPrintLeftPage          =
-        bPrintRightPage         =
+        bPrintLeftPages         =
+        bPrintRightPages        =
         bPrintPageBackground    =
         bPrintEmptyPages        =
         bUpdateFieldsInPrinting = sal_True;
@@ -68,11 +101,11 @@ struct SwPrintData
         bPaperFromSetup         =
         bPrintReverse           =
         bPrintProspect          =
-        bPrintProspect_RTL      =
+        bPrintProspectRTL       =
         bPrintSingleJobs        =
         bModified               =
         bPrintBlackFont         =
-        bPrintHiddenText       =
+        bPrintHiddenText        =
         bPrintTextPlaceholder   = sal_False;
 
         nPrintPostIts           = 0;
@@ -83,64 +116,202 @@ struct SwPrintData
     sal_Bool operator==(const SwPrintData& rData)const
     {
         return
-        bPrintGraphic       ==   rData.bPrintGraphic       &&
-        bPrintTable         ==   rData.bPrintTable         &&
-        bPrintDraw          ==   rData.bPrintDraw          &&
-        bPrintControl       ==   rData.bPrintControl       &&
-        bPrintPageBackground==   rData.bPrintPageBackground&&
-        bPrintBlackFont     ==   rData.bPrintBlackFont     &&
-        bPrintLeftPage      ==   rData.bPrintLeftPage      &&
-        bPrintRightPage     ==   rData.bPrintRightPage     &&
-        bPrintReverse       ==   rData.bPrintReverse       &&
-        bPrintProspect      ==   rData.bPrintProspect      &&
-        bPrintProspect_RTL  ==   rData.bPrintProspect_RTL  &&
-        bPrintSingleJobs    ==   rData.bPrintSingleJobs    &&
-        bPaperFromSetup     ==   rData.bPaperFromSetup     &&
-        bPrintEmptyPages    ==   rData.bPrintEmptyPages   &&
+        bPrintGraphic       ==   rData.bPrintGraphic        &&
+        bPrintTable         ==   rData.bPrintTable          &&
+        bPrintDraw          ==   rData.bPrintDraw           &&
+        bPrintControl       ==   rData.bPrintControl        &&
+        bPrintPageBackground==   rData.bPrintPageBackground &&
+        bPrintBlackFont     ==   rData.bPrintBlackFont      &&
+        bPrintLeftPages     ==   rData.bPrintLeftPages      &&
+        bPrintRightPages    ==   rData.bPrintRightPages     &&
+        bPrintReverse       ==   rData.bPrintReverse        &&
+        bPrintProspect      ==   rData.bPrintProspect       &&
+        bPrintProspectRTL   ==   rData.bPrintProspectRTL    &&
+        bPrintSingleJobs    ==   rData.bPrintSingleJobs     &&
+        bPaperFromSetup     ==   rData.bPaperFromSetup      &&
+        bPrintEmptyPages    ==   rData.bPrintEmptyPages     &&
         bUpdateFieldsInPrinting == rData.bUpdateFieldsInPrinting &&
-        nPrintPostIts       ==   rData.nPrintPostIts       &&
-        sFaxName            ==   rData.sFaxName         &&
-        bPrintHiddenText       ==   rData.bPrintHiddenText &&
+        nPrintPostIts       ==   rData.nPrintPostIts        &&
+        sFaxName            ==   rData.sFaxName             &&
+        bPrintHiddenText    ==   rData.bPrintHiddenText     &&
         bPrintTextPlaceholder   ==   rData.bPrintTextPlaceholder;
     }
-    sal_Bool IsPrintGraphic()   const { return bPrintGraphic; }
-    sal_Bool IsPrintTable()     const { return bPrintTable; }
-    sal_Bool IsPrintDraw()      const { return bPrintDraw; }
-    sal_Bool IsPrintControl()   const { return bPrintControl; }
-    sal_Bool IsPrintLeftPage()  const { return bPrintLeftPage; }
-    sal_Bool IsPrintRightPage() const { return bPrintRightPage; }
-    sal_Bool IsPrintReverse()   const { return bPrintReverse; }
-    sal_Bool IsPaperFromSetup() const { return bPaperFromSetup; }
-    sal_Bool IsPrintEmptyPages() const{ return bPrintEmptyPages; }
-    sal_Bool IsPrintProspect()  const { return bPrintProspect; }
-    sal_Bool IsPrintProspect_RTL()  const { return bPrintProspect_RTL; }
-    sal_Bool IsPrintPageBackground() const { return bPrintPageBackground; }
-    sal_Bool IsPrintBlackFont() const { return bPrintBlackFont;}
-    sal_Bool IsPrintSingleJobs() const { return bPrintSingleJobs;}
-    sal_Int16 GetPrintPostIts() const { return nPrintPostIts; }
-    const rtl::OUString     GetFaxName() const{return sFaxName;}
-    sal_Bool IsPrintHiddenText() const {return bPrintHiddenText;}
-    sal_Bool IsPrintTextPlaceholder() const {return bPrintTextPlaceholder;}
-
-    void SetPrintGraphic  ( sal_Bool b ) { doSetModified(); bPrintGraphic = b;}
-    void SetPrintTable    ( sal_Bool b ) { doSetModified(); bPrintTable = b;}
-    void SetPrintDraw     ( sal_Bool b ) { doSetModified(); bPrintDraw = b;}
-    void SetPrintControl  ( sal_Bool b ) { doSetModified(); bPrintControl = b; }
-    void SetPrintLeftPage ( sal_Bool b ) { doSetModified(); bPrintLeftPage = b;}
-    void SetPrintRightPage( sal_Bool b ) { doSetModified(); bPrintRightPage = b;}
-    void SetPrintReverse  ( sal_Bool b ) { doSetModified(); bPrintReverse = b;}
-    void SetPaperFromSetup( sal_Bool b ) { doSetModified(); bPaperFromSetup = b;}
-    void SetPrintEmptyPages(sal_Bool b ) { doSetModified(); bPrintEmptyPages = b;}
-    void SetPrintPostIts    ( sal_Int16 n){ doSetModified(); nPrintPostIts = n; }
-    void SetPrintProspect   ( sal_Bool b ) { doSetModified(); bPrintProspect = b; }
-    void SetPrintProspect_RTL   ( sal_Bool b ) { doSetModified(); bPrintProspect_RTL = b; }
-    void SetPrintPageBackground(sal_Bool b){ doSetModified(); bPrintPageBackground = b;}
-    void SetPrintBlackFont(sal_Bool b){ doSetModified(); bPrintBlackFont = b;}
-    void SetPrintSingleJobs(sal_Bool b){ doSetModified(); bPrintSingleJobs = b;}
-    void SetFaxName(const rtl::OUString& rSet){sFaxName = rSet;}
-    void SetPrintHiddenText(sal_Bool b){ doSetModified(); bPrintHiddenText = b;}
-    void SetPrintTextPlaceholder(sal_Bool b){ doSetModified(); bPrintTextPlaceholder = b;}
+
+    // Note: in the context where this class ist used the pointers should always be valid
+    // during the lifetime of this object
+    const SwPrintUIOptions &    GetPrintUIOptions() const       { return *m_pPrintUIOptions; }
+    const SwRenderData &        GetRenderData() const           { return *m_pRenderData; }
+    void  SetPrintUIOptions( const SwPrintUIOptions *pOpt )     { m_pPrintUIOptions = pOpt; }
+    void  SetRenderData( const SwRenderData *pData )            { m_pRenderData = pData; }
+
+    sal_Bool IsPrintGraphic() const             { return bPrintGraphic; }
+    sal_Bool IsPrintTable() const               { return bPrintTable; }
+    sal_Bool IsPrintDraw() const                { return bPrintDraw; }
+    sal_Bool IsPrintControl() const             { return bPrintControl; }
+    sal_Bool IsPrintLeftPage() const            { return bPrintLeftPages; }
+    sal_Bool IsPrintRightPage() const           { return bPrintRightPages; }
+    sal_Bool IsPrintReverse() const             { return bPrintReverse; }
+    sal_Bool IsPaperFromSetup() const           { return bPaperFromSetup; }
+    sal_Bool IsPrintEmptyPages() const          { return bPrintEmptyPages; }
+    sal_Bool IsPrintProspect() const            { return bPrintProspect; }
+    sal_Bool IsPrintProspectRTL() const         { return bPrintProspectRTL; }
+    sal_Bool IsPrintPageBackground() const      { return bPrintPageBackground; }
+    sal_Bool IsPrintBlackFont() const           { return bPrintBlackFont; }
+    sal_Bool IsPrintSingleJobs() const          { return bPrintSingleJobs; }
+    sal_Int16 GetPrintPostIts() const           { return nPrintPostIts; }
+    const rtl::OUString GetFaxName() const      { return sFaxName; }
+    sal_Bool IsPrintHiddenText() const          { return bPrintHiddenText; }
+    sal_Bool IsPrintTextPlaceholder() const     { return bPrintTextPlaceholder; }
+
+    void SetPrintGraphic( sal_Bool b )              { doSetModified(); bPrintGraphic = b; }
+    void SetPrintTable( sal_Bool b )                { doSetModified(); bPrintTable = b; }
+    void SetPrintDraw( sal_Bool b )                 { doSetModified(); bPrintDraw = b; }
+    void SetPrintControl( sal_Bool b )              { doSetModified(); bPrintControl = b; }
+    void SetPrintLeftPage( sal_Bool b )             { doSetModified(); bPrintLeftPages = b; }
+    void SetPrintRightPage( sal_Bool b )            { doSetModified(); bPrintRightPages = b; }
+    void SetPrintReverse( sal_Bool b )              { doSetModified(); bPrintReverse = b; }
+    void SetPaperFromSetup( sal_Bool b )            { doSetModified(); bPaperFromSetup = b; }
+    void SetPrintEmptyPages( sal_Bool b )           { doSetModified(); bPrintEmptyPages = b; }
+    void SetPrintPostIts( sal_Int16 n )             { doSetModified(); nPrintPostIts = n; }
+    void SetPrintProspect( sal_Bool b )             { doSetModified(); bPrintProspect = b; }
+    void SetPrintProspect_RTL( sal_Bool b )         { doSetModified(); bPrintProspectRTL = b; }
+    void SetPrintPageBackground( sal_Bool b )       { doSetModified(); bPrintPageBackground = b; }
+    void SetPrintBlackFont( sal_Bool b )            { doSetModified(); bPrintBlackFont = b; }
+    void SetPrintSingleJobs( sal_Bool b )           { doSetModified(); bPrintSingleJobs = b; }
+    void SetFaxName( const rtl::OUString& rSet )    { sFaxName = rSet; }
+    void SetPrintHiddenText( sal_Bool b )           { doSetModified(); bPrintHiddenText = b; }
+    void SetPrintTextPlaceholder( sal_Bool b )      { doSetModified(); bPrintTextPlaceholder = b; }
+
     virtual void doSetModified () { bModified = sal_True;}
 };
 
+
+////////////////////////////////////////////////////////////
+
+
+class SwPrintUIOptions : public vcl::PrinterOptionsHelper
+{
+    OutputDevice* m_pLast;
+    const SwPrintData & m_rDefaultPrintData;
+
+public:
+    SwPrintUIOptions( bool bWeb, bool bSwSrcView, bool bHasSelection, bool bHasPostIts, const SwPrintData &rDefaultPrintData );
+    virtual ~SwPrintUIOptions();
+
+    bool processPropertiesAndCheckFormat( const com::sun::star::uno::Sequence< com::sun::star::beans::PropertyValue >& i_rNewProp );
+
+    bool IsPrintFormControls() const            { return getBoolValue( "PrintControls",        m_rDefaultPrintData.bPrintControl ); }
+    bool IsPrintPageBackground() const          { return getBoolValue( "PrintPageBackground",  m_rDefaultPrintData.bPrintPageBackground ); }
+    bool IsPrintProspect() const                { return getBoolValue( "PrintProspect",        m_rDefaultPrintData.bPrintProspect ); }
+    bool IsPrintProspectRTL() const             { return getIntValue( "PrintProspectRTL",      m_rDefaultPrintData.bPrintProspectRTL ) ? true : false; }
+    bool IsPrintTextPlaceholders() const        { return getBoolValue( "PrintTextPlaceholder", m_rDefaultPrintData.bPrintTextPlaceholder ); }
+    bool IsPrintHiddenText() const              { return getBoolValue( "PrintHiddenText",      m_rDefaultPrintData.bPrintHiddenText ); }
+    bool IsPrintWithBlackTextColor() const      { return getBoolValue( "PrintBlackFonts",      m_rDefaultPrintData.bPrintBlackFont ); }
+    sal_Int16 GetPrintPostItsType() const       { return static_cast< sal_Int16 >(getIntValue( "PrintAnnotationMode", m_rDefaultPrintData.nPrintPostIts )); }
+    bool IsPaperFromSetup() const               { return getBoolValue( "PrintPaperFromSetup",  m_rDefaultPrintData.bPaperFromSetup ); }
+    bool IsPrintReverse() const                 { return false; /*handled by print dialog now*/ /*getBoolValue( "PrintReversed",        m_rDefaultPrintData.bPrintReverse );*/ }
+
+    bool IsPrintLeftPages() const;
+    bool IsPrintRightPages() const;
+    bool IsPrintEmptyPages( bool bIsPDFExport ) const;
+    bool IsPrintTables() const;
+    bool IsPrintGraphics() const;
+    bool IsPrintDrawings() const;
+};
+
+
+////////////////////////////////////////////////////////////
+
+// A class that stores temporary data that is needed for rendering the document.
+// Usually this data is created when 'getRendererCount' is called and
+// and it is used in the 'render' function of that same interface
+class SwRenderData
+{
+    // pages valid for printing (according to the current settings)
+    // and their respective start frames (see getRendererCount in unotxdoc.cxx)
+    // This set of pages does NOT depend on the 'PageRange' that is used as a printing option!
+    std::set< sal_Int32 >                       m_aValidPages;          // the set of possible pages (see StringRangeEnumerator::getRangesFromString )
+    std::map< sal_Int32, const SwPageFrm * >    m_aValidStartFrames;    // the map of start frames for those pages
+
+    // vector of pages and their order to be printed (duplicates and any order allowed!)
+    // (see 'render' in unotxdoc.cxx)
+    std::vector< sal_Int32 >                    m_aPagesToPrint;
+
+    std::vector< const SwPageFrm * >            m_aPostItStartFrames;
+
+    // for prospect printing: the pairs of pages to be printed together on a single prospect page.
+    // -1 indicates a half page to be left empty.
+    std::vector< std::pair< sal_Int32, sal_Int32 > >    m_aPagePairs;
+
+    rtl::OUString               m_aPageRange;
+
+    // the view options to be applied for printing
+    SwViewOptionAdjust_Impl *   m_pViewOptionAdjust;
+
+    SwPrtOptions *              m_pPrtOptions;
+
+public:
+
+    // PostIt relevant data
+    _SetGetExpFlds *    m_pPostItFields;    // an array of "_SetGetExpFld *" sorted by page and line numbers
+    SwDoc *             m_pPostItDoc;
+    ViewShell *         m_pPostItShell;
+
+public:
+    SwRenderData();
+    ~SwRenderData();
+
+
+    bool HasPostItData() const  { return m_pPostItShell != 0 && m_pPostItDoc != 0 && m_pPostItShell != 0; }
+    void CreatePostItData( SwDoc *pDoc, const SwViewOption *pViewOpt, OutputDevice *pOutDev );
+    void DeletePostItData();
+
+    bool IsViewOptionAdjust() const  { return m_pViewOptionAdjust != 0; }
+    void ViewOptionAdjustStart( SwWrtShell &rSh, const SwViewOption &rViewOptions );
+    void ViewOptionAdjust( const SwPrtOptions *pPrtOptions );
+    void ViewOptionAdjustStop();
+
+    bool HasSwPrtOptions() const    { return m_pPrtOptions != 0; }
+    void SetSwPrtOptions( SwPrtOptions * pOpt )     { m_pPrtOptions = pOpt; }
+    const SwPrtOptions *    GetSwPrtOptions() const { return m_pPrtOptions; }
+    SwPrtOptions &          GetSwPrtOptionsRef()    { return *m_pPrtOptions; }
+    void MakeSwPrtOptions( SwPrtOptions &rOptions, const SwDocShell *pDocShell,
+            const SwPrintUIOptions *pOpt, const SwRenderData *pData, bool bIsPDFExport );
+
+
+    typedef std::map< sal_Int32, const SwPageFrm * >            ValidStartFramesMap_t;
+    typedef std::vector< std::pair< sal_Int32, sal_Int32 > >    PagePairsVec_t;
+
+    std::set< sal_Int32 > &             GetValidPagesSet()          { return m_aValidPages; }
+    const std::set< sal_Int32 > &       GetValidPagesSet() const    { return m_aValidPages; }
+    ValidStartFramesMap_t &             GetValidStartFrames()       { return m_aValidStartFrames; }
+    const ValidStartFramesMap_t &       GetValidStartFrames() const { return m_aValidStartFrames; }
+
+    // used for 'normal' printing
+    // A page value of 0 as entry indicates that this page is not from the document but
+    // from the post-it document. (See also GetPostItStartFrame below)
+    std::vector< sal_Int32 > &          GetPagesToPrint()           { return m_aPagesToPrint; }
+    const std::vector< sal_Int32 > &    GetPagesToPrint() const     { return m_aPagesToPrint; }
+
+    // used for 'normal' printing with post-its
+    // - if the map entry will be NULL then the respective page to be printed is from
+    // the document. In that case use the value from GetPagesToPrint at the same index to
+    // get the phys. page number to be printed, and then retrieve the start frame to use
+    // from GetValidStartFrms.
+    // - If the entry is not NULL it is the start frame of the page from the post-it document
+    // that is to be printed
+    std::vector< const SwPageFrm * > &          GetPostItStartFrames()          { return m_aPostItStartFrames; }
+    const std::vector< const SwPageFrm * > &    GetPostItStartFrames() const    { return m_aPostItStartFrames; }
+
+    // used for prospect printing only
+    PagePairsVec_t &                    GetPagePairsForProspectPrinting()           { return m_aPagePairs; }
+    const PagePairsVec_t &              GetPagePairsForProspectPrinting() const     { return m_aPagePairs; }
+
+    rtl::OUString   GetPageRange() const                            { return m_aPageRange; }
+    void            SetPageRange( const rtl::OUString &rRange )     { m_aPageRange = rRange; }
+};
+
+
+////////////////////////////////////////////////////////////
+
 #endif  //_SW_PRINTDATA_HXX
diff --git a/sw/inc/rolbck.hxx b/sw/inc/rolbck.hxx
index 1f225aeeb8b0..c8f8561138b8 100644
--- a/sw/inc/rolbck.hxx
+++ b/sw/inc/rolbck.hxx
@@ -163,8 +163,11 @@ public:
 
 class SwHistorySetTxtFld : public SwHistoryHint
 {
+    //!! beware of the order for the declation of thje auto_ptrs.
+    //!! If they get destroyed in the wrong order sw may crash (namely mail-merge as well)
     ::std::auto_ptr<SwFieldType> m_pFldType;
     const ::std::auto_ptr<SwFmtFld> m_pFld;
+
     ULONG m_nNodeIndex;
     xub_StrLen m_nPos;
     USHORT m_nFldWhich;
diff --git a/sw/inc/section.hxx b/sw/inc/section.hxx
index 1310325575cd..9d6de0d4df61 100644
--- a/sw/inc/section.hxx
+++ b/sw/inc/section.hxx
@@ -41,6 +41,11 @@
 #include <svl/svarray.hxx>
 #include <frmfmt.hxx>
 
+
+namespace com { namespace sun { namespace star {
+    namespace text { class XTextSection; }
+} } }
+
 // Forward Deklaration
 class SwSectionFmt;
 class SwDoc;
@@ -230,6 +235,13 @@ class SW_DLLPUBLIC SwSectionFmt : public SwFrmFmt
 {
     friend class SwDoc;
 
+    /** why does this exist in addition to the m_wXObject in SwFrmFmt?
+        in case of an index, both a SwXDocumentIndex and a SwXTextSection
+        register at this SwSectionFmt, so we need to have two refs.
+     */
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XTextSection> m_wXTextSection;
+
     /* SW_DLLPUBLIC */ SwSection* _GetSection() const;
     SW_DLLPRIVATE void UpdateParent();      // Parent wurde veraendert
 
@@ -271,6 +283,14 @@ public:
 
     // ist die Section eine gueltige fuers GlobalDocument?
     const SwSection* GetGlobalDocSection() const;
+
+    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XTextSection> const& GetXTextSection() const
+            { return m_wXTextSection; }
+    SW_DLLPRIVATE void SetXTextSection(::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XTextSection> const& xTextSection)
+            { m_wXTextSection = xTextSection; }
+
 };
 
 // -------------- inlines ---------------------------------
diff --git a/sw/inc/swprtopt.hxx b/sw/inc/swprtopt.hxx
index 38250fe7f28d..dbf2898c481e 100644
--- a/sw/inc/swprtopt.hxx
+++ b/sw/inc/swprtopt.hxx
@@ -34,11 +34,24 @@
 #include <tools/multisel.hxx>
 #include <printdata.hxx>
 
+#include <set>
+#include <map>
+#include <vector>
+#include <utility>
+
 #define POSTITS_NONE    0
 #define POSTITS_ONLY    1
 #define POSTITS_ENDDOC  2
 #define POSTITS_ENDPAGE 3
 
+
+class PrintDialog;
+class SfxPrinter;
+
+
+////////////////////////////////////////////////////////////
+
+
 class SwPrtOptions : public SwPrintData
 {
     USHORT nJobNo;
@@ -75,27 +88,18 @@ public:
 #endif
 
 
-        SwPrtOptions& operator=(const SwPrintData& rData)
-            {
-                SwPrintData::operator=(rData);
-                return *this;
-            }
-};
-
-
-#endif //_SWPRTOPT_HXX
-
-
-
-
-
-
-
-
-
-
+    SwPrtOptions& operator=(const SwPrintData& rData)
+        {
+            SwPrintData::operator=(rData);
+            return *this;
+        }
 
+    // get print options
+    void MakeOptions( BOOL bWeb );
+};
 
 
+////////////////////////////////////////////////////////////
 
+#endif //_SWPRTOPT_HXX
 
diff --git a/sw/inc/swtable.hxx b/sw/inc/swtable.hxx
index 1699cf439030..cddb53d59bb7 100644
--- a/sw/inc/swtable.hxx
+++ b/sw/inc/swtable.hxx
@@ -299,7 +299,7 @@ public:
     virtual BOOL GetInfo( SfxPoolItem& ) const;
 
         // suche im Format nach der angemeldeten Tabelle
-    static SwTable* FindTable( SwFrmFmt* pFmt );
+    static SwTable * FindTable( SwFrmFmt const*const pFmt );
 
         // Struktur ein wenig aufraeumen
     void GCLines();
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index 64cd8231f0ef..fbb90658098d 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -166,11 +166,11 @@ const short lOutlineMinTextDistance = 216; // 0.15 inch = 0.38 cm
 //Schnittstellen Bedeutung haben (SwDoc).
 enum RndStdIds
 {
-    FLY_AT_CNTNT,       //Absatzgebundener Rahmen
-    FLY_IN_CNTNT,       //Zeichengebundener Rahmen
-    FLY_PAGE,           //Seitengebundener Rahmen
-    FLY_AT_FLY,         //Rahmengebundener Rahmen ( LAYER_IMPL )
-    FLY_AUTO_CNTNT,     //Automatisch positionierter, absatzgebundener Rahmen
+    FLY_AT_PARA,        // anchored at paragraph
+    FLY_AS_CHAR,        // anchored as character
+    FLY_AT_PAGE,        // anchored at page
+    FLY_AT_FLY,         // anchored at frame
+    FLY_AT_CHAR,        // anchored at character
                         //Der Rest wird nur fuer SS benutzt.
     RND_STD_HEADER,
     RND_STD_FOOTER,
diff --git a/sw/inc/tox.hxx b/sw/inc/tox.hxx
index 65a4879485b7..821eb7df6ef1 100644
--- a/sw/inc/tox.hxx
+++ b/sw/inc/tox.hxx
@@ -27,8 +27,10 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _TOX_HXX
-#define _TOX_HXX
+#ifndef SW_TOX_HXX
+#define SW_TOX_HXX
+
+#include <cppuhelper/weakref.hxx>
 
 #include <i18npool/lang.h>
 #include <tools/string.hxx>
@@ -47,6 +49,11 @@
 #define INCLUDED_VECTOR
 #endif
 
+
+namespace com { namespace sun { namespace star {
+    namespace text { class XDocumentIndexMark; }
+} } }
+
 class SwTOXType;
 class SwTOXMark;
 class SwTxtTOXMark;
@@ -61,7 +68,9 @@ SV_DECL_PTRARR(SwTOXMarks, SwTOXMark*, 0, 10)
 #define IVER_TOXMARK_STRPOOL ((USHORT)1)
 #define IVER_TOXMARK_NEWTOX ((USHORT)2)
 
-class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem, public SwClient
+class SW_DLLPUBLIC SwTOXMark
+    : public SfxPoolItem
+    , public SwModify
 {
     friend void _InitCore();
     friend class SwTxtTOXMark;
@@ -80,6 +89,8 @@ class SW_DLLPUBLIC SwTOXMark : public SfxPoolItem, public SwClient
     BOOL    bAutoGenerated : 1;     // generated using a concordance file
     BOOL    bMainEntry : 1;         // main entry emphasized by character style
 
+    ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XDocumentIndexMark> m_wXDocumentIndexMark;
 
     SwTOXMark();                    // to create the dflt. atr. in _InitCore
 
@@ -97,6 +108,11 @@ public:
     virtual int             operator==( const SfxPoolItem& ) const;
     virtual SfxPoolItem*    Clone( SfxItemPool* pPool = 0 ) const;
 
+    // SwClient
+    virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
+
+    void InvalidateTOXMark();
+
     String                  GetText() const;
 
     inline BOOL             IsAlternativeText() const;
@@ -131,6 +147,14 @@ public:
 
     const SwTxtTOXMark* GetTxtTOXMark() const   { return pTxtAttr; }
           SwTxtTOXMark* GetTxtTOXMark()         { return pTxtAttr; }
+
+    SW_DLLPRIVATE ::com::sun::star::uno::WeakReference<
+        ::com::sun::star::text::XDocumentIndexMark> const& GetXTOXMark() const
+            { return m_wXDocumentIndexMark; }
+    SW_DLLPRIVATE void SetXTOXMark(::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XDocumentIndexMark> const& xMark)
+            { m_wXDocumentIndexMark = xMark; }
+
 };
 
 /*--------------------------------------------------------------------
@@ -769,4 +793,4 @@ inline void SwTOXBase::SetOptions(USHORT nOpt)
 }
 
 
-#endif  // _TOX_HXX
+#endif  // SW_TOX_HXX
diff --git a/sw/inc/txtatr.hxx b/sw/inc/txtatr.hxx
index d9e9463a30a7..8c0ad5854665 100644
--- a/sw/inc/txtatr.hxx
+++ b/sw/inc/txtatr.hxx
@@ -80,7 +80,7 @@ public:
         const xub_StrLen i_nStart, const xub_StrLen i_nEnd );
     virtual ~SwTxtMeta();
 
-    void ChgTxtNode( SwTxtNode * const pNode ) { m_pTxtNode = pNode; }
+    void ChgTxtNode(SwTxtNode * const pNode);
     SwTxtNode * GetTxtNode() const { return m_pTxtNode; }
 
 };
diff --git a/sw/inc/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 17b6e6f5d080..91ef17d4e9d4 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -27,21 +27,151 @@
  * for a copy of the LGPLv3 License.
  *
  ************************************************************************/
-#ifndef _UNOBASECLASS_HXX
-#define _UNOBASECLASS_HXX
+#ifndef SW_UNOBASECLASS_HXX
+#define SW_UNOBASECLASS_HXX
 
-#include <calbck.hxx>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
 #include <com/sun/star/container/XEnumeration.hpp>
+
 #include <cppuhelper/implbase2.hxx>
 
-typedef
-cppu::WeakImplHelper2
-<
-    ::com::sun::star::container::XEnumeration,
-    ::com::sun::star::lang::XServiceInfo
+
+class SfxPoolItem;
+class SwClient;
+class SwDoc;
+
+
+typedef ::cppu::WeakImplHelper2
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumeration
 >
-SwSimpleEnumerationBaseClass;
+SwSimpleEnumeration_Base;
+
+
+/* -----------------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
+};
+
+/*-----------------04.03.98 11:54-------------------
+    Start/EndAction or Start/EndAllAction
+  -------------------------------------------------- */
+class UnoActionContext
+{
+    private:
+        SwDoc * m_pDoc;
+
+    public:
+        UnoActionContext(SwDoc *const pDoc);
+        ~UnoActionContext();
+
+        void InvalidateDocument() { m_pDoc = 0; }
+};
+
+/* -----------------07.07.98 12:03-------------------
+    interrupt Actions for a little while
+   -------------------------------------------------- */
+class UnoActionRemoveContext
+{
+    private:
+        SwDoc *const m_pDoc;
+
+    public:
+        UnoActionRemoveContext(SwDoc *const pDoc);
+        ~UnoActionRemoveContext();
+};
+
+
+::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
+
+/// helper function for implementing SwClient::Modify
+void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
+
+
+#include <boost/utility.hpp>
+#include <osl/diagnose.h>
+#include <vos/mutex.hxx>
+#include <vcl/svapp.hxx>
+
+namespace sw {
+
+    template<typename T> class UnoImplPtr
+        : private ::boost::noncopyable
+    {
+        private:
+            T * m_p;
+
+        public:
+            UnoImplPtr(T *const i_p)
+                : m_p(i_p)
+            {
+                OSL_ENSURE(i_p, "UnoImplPtr: null");
+            }
+
+            ~UnoImplPtr()
+            {
+                ::vos::OGuard g(Application::GetSolarMutex());
+                delete m_p; // #i105557#: call dtor with locked solar mutex
+                m_p = 0;
+            }
+
+            T & operator * () const { return *m_p; }
+
+            T * operator ->() const { return  m_p; }
+
+            T * get        () const { return  m_p; }
+    };
+
+    template< class C > C *
+    UnoTunnelGetImplementation(
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::lang::XUnoTunnel > const & xUnoTunnel)
+    {
+        if (!xUnoTunnel.is()) { return 0; }
+        C *const pC( reinterpret_cast< C* >(
+                        ::sal::static_int_cast< sal_IntPtr >(
+                            xUnoTunnel->getSomething(C::getUnoTunnelId()))));
+        return pC;
+    }
+
+    template< class C > sal_Int64
+    UnoTunnelImpl(const ::com::sun::star::uno::Sequence< sal_Int8 > & rId,
+                  C *const pThis)
+    {
+        if ((rId.getLength() == 16) &&
+            (0 == rtl_compareMemory(C::getUnoTunnelId().getConstArray(),
+                                    rId.getConstArray(), 16)))
+        {
+            return ::sal::static_int_cast< sal_Int64 >(
+                    reinterpret_cast< sal_IntPtr >(pThis) );
+        }
+        return 0;
+    }
+
+    ::com::sun::star::uno::Sequence< ::rtl::OUString >
+    GetSupportedServiceNamesImpl(
+            size_t const nServices, char const*const pServices[]);
+    sal_Bool SupportsServiceImpl(
+            size_t const nServices, char const*const pServices[],
+            ::rtl::OUString const & rServiceName);
+
+} // namespace sw
 
-#endif
+#endif // SW_UNOBASECLASS_HXX
 
diff --git a/sw/inc/unobookmark.hxx b/sw/inc/unobookmark.hxx
new file mode 100644
index 000000000000..46d0054551b7
--- /dev/null
+++ b/sw/inc/unobookmark.hxx
@@ -0,0 +1,244 @@
+/*************************************************************************
+ *
+ * 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_UNOBOOKMARK_HXX
+#define SW_UNOBOOKMARK_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/XNamed.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XFormField.hpp>
+
+#include <cppuhelper/implbase5.hxx>
+
+#include <sfx2/Metadatable.hxx>
+
+#include <unobaseclass.hxx>
+#include <IDocumentMarkAccess.hxx>
+
+
+class SwDoc;
+
+
+typedef ::cppu::ImplInheritanceHelper5
+<   ::sfx2::MetadatableMixin
+,   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::container::XNamed
+,   ::com::sun::star::text::XTextContent
+> SwXBookmark_Base;
+
+class SwXBookmark
+    : public SwXBookmark_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+protected:
+
+    void attachToRangeEx(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextRange,
+            IDocumentMarkAccess::MarkType eType)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException );
+    virtual 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 ::sw::mark::IMark* GetBookmark() const;
+
+    virtual ~SwXBookmark();
+
+    /// @param pDoc and pMark != 0, but not & because of ImplInheritanceHelper
+    SwXBookmark(::sw::mark::IMark *const pMark, SwDoc *const pDoc);
+
+public:
+
+    /// descriptor
+    SwXBookmark();
+
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XTextContent>
+        CreateXBookmark(SwDoc & rDoc, ::sw::mark::IMark & rBookmark);
+
+    /// @return IMark for this, but only if it lives in pDoc
+    static ::sw::mark::IMark const* GetBookmarkInDoc(SwDoc const*const pDoc,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::lang::XUnoTunnel> & xUT);
+
+    // 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);
+
+    // XNamed
+    virtual ::rtl::OUString SAL_CALL getName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+        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);
+
+};
+
+typedef cppu::ImplInheritanceHelper1< SwXBookmark,
+    ::com::sun::star::text::XFormField > SwXFieldmark_Base;
+
+class SwXFieldmark
+    : public SwXFieldmark_Base
+{
+
+private:
+
+    bool isReplacementObject;
+
+public:
+
+    SwXFieldmark(bool isReplacementObject,
+            ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0);
+
+    virtual 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);
+
+    virtual ::rtl::OUString SAL_CALL getDescription()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getType()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::sal_Int16 SAL_CALL getRes()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    virtual void SAL_CALL setDescription(const ::rtl::OUString& rDescription)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setType(::sal_Int16 fieldType)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setRes(::sal_Int16 res)
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOBOOKMARK_HXX
+
diff --git a/sw/inc/unochart.hxx b/sw/inc/unochart.hxx
index 955030cbada8..bc29daa21a4d 100644
--- a/sw/inc/unochart.hxx
+++ b/sw/inc/unochart.hxx
@@ -32,6 +32,8 @@
 
 #include <map>
 #include <set>
+
+#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/chart2/data/XDataProvider.hpp>
 #include <com/sun/star/chart2/data/XDataSource.hpp>
 #include <com/sun/star/chart2/data/XDataSequence.hpp>
@@ -48,8 +50,8 @@
 #include <com/sun/star/util/XModifiable.hpp>
 #include <com/sun/star/util/XModifyBroadcaster.hpp>
 #include <com/sun/star/util/XModifyListener.hpp>
-
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
+
 #include <cppuhelper/interfacecontainer.h>  //OMultiTypeInterfaceContainerHelper
 #include <cppuhelper/implbase2.hxx> // helper for implementations
 #include <cppuhelper/implbase4.hxx> // helper for implementations
@@ -57,17 +59,21 @@
 #include <cppuhelper/implbase10.hxx> // helper for implementations
 #include <cppuhelper/weakref.hxx>
 
+#include <tools/string.hxx>
+#include <tools/link.hxx>
+#include <vcl/timer.hxx>
 
 #include <calbck.hxx>
-#include <unoobj.hxx>
 
 
+class SfxItemPropertySet;
 class SwDoc;
 class SwTable;
 class SwTableBox;
 class SwUnoCrsr;
 struct SwRangeDescriptor;
 class SwSelBoxes;
+class SwFrmFmt;
 
 //////////////////////////////////////////////////////////////////////
 
diff --git a/sw/inc/unocoll.hxx b/sw/inc/unocoll.hxx
index b630668f8965..f4d54a55adca 100644
--- a/sw/inc/unocoll.hxx
+++ b/sw/inc/unocoll.hxx
@@ -481,7 +481,6 @@ class SwXBookmarks : public SwCollectionBaseClass,
         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 );
 
-        static SwXBookmark* GetObject( ::sw::mark::IMark& rBkm, SwDoc* pDoc);
 };
 
 class SwXNumberingRulesCollection : public cppu::WeakImplHelper1
diff --git a/sw/inc/unocrsrhelper.hxx b/sw/inc/unocrsrhelper.hxx
index 613a5e51eb89..b7e92df88b30 100644
--- a/sw/inc/unocrsrhelper.hxx
+++ b/sw/inc/unocrsrhelper.hxx
@@ -30,12 +30,25 @@
 #ifndef _UNOCRSRHELPER_HXX
 #define _UNOCRSRHELPER_HXX
 
-#include <com/sun/star/beans/XPropertyState.hpp>
-#include <unocrsr.hxx>
 #include <map>
 
+#include <com/sun/star/beans/XPropertyState.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+
+#include <swtypes.hxx>
+#include <pam.hxx>
+
+
+class String;
+class SfxItemSet;
+class SfxItemPropertySet;
 struct SfxItemPropertySimpleEntry;
+class SwTxtNode;
 class SwPaM;
+class SwCursor;
+class SwUnoCrsr;
+class SwFmtColl;
+struct SwSortOptions;
 class SwDoc;
 
 namespace com{ namespace sun{ namespace star{
@@ -47,6 +60,17 @@ namespace com{ namespace sun{ namespace star{
     }
 }}}
 
+/* -----------------03.12.98 12:16-------------------
+ *
+ * --------------------------------------------------*/
+enum SwGetPropertyStatesCaller
+{
+    SW_PROPERTY_STATE_CALLER_DEFAULT,
+    SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION,
+    SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY,
+    SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION_TOLERANT
+};
+
 /* -----------------------------14.12.00 15:06--------------------------------
 
  ---------------------------------------------------------------------------*/
@@ -62,6 +86,7 @@ namespace SwUnoCursorHelper
             void    SetValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any& rAny );
             bool    FillValue( USHORT nWhichId, USHORT nMemberId, const com::sun::star::uno::Any*& pAny );
     };
+
     sal_Bool                    getCrsrPropertyValue(const SfxItemPropertySimpleEntry& rEntry
                                         , SwPaM& rPam
                                         , com::sun::star::uno::Any *pAny
@@ -102,6 +127,88 @@ namespace SwUnoCursorHelper
             const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties )
                 throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
+
+    /// @param bTableMode: attributes should be applied to a table selection
+    void SetCrsrAttr(SwPaM & rPam, const SfxItemSet & rSet,
+                     const SetAttrMode nAttrMode,
+                     const bool bTableMode = false);
+    void GetCrsrAttr(SwPaM & rPam, SfxItemSet & rSet,
+                     const bool bOnlyTxtAttr = false,
+                     const bool bGetFromChrFmt = true);
+    void GetTextFromPam(SwPaM & rPam, ::rtl::OUString & rBuffer);
+    SwFmtColl * GetCurTxtFmtColl(SwPaM & rPam, const bool bConditional);
+
+    void SelectPam(SwPaM & rPam, const bool bExpand);
+    void SetString(SwCursor & rCursor, const ::rtl::OUString & rString);
+
+    ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
+           CreateSortDescriptor(const bool bFromTable);
+    sal_Bool ConvertSortProperties(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& rDescriptor,
+            SwSortOptions & rSortOpt);
+
+    /// @param bTableMode: attributes should be applied to a table selection
+    void SetPropertyValue(
+            SwPaM& rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::rtl::OUString & rPropertyName,
+            const ::com::sun::star::uno::Any & rValue,
+            const SetAttrMode nAttrMode = nsSetAttrMode::SETATTR_DEFAULT,
+            const bool bTableMode = false)
+        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::Any  GetPropertyValue(
+            SwPaM& rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::rtl::OUString & rPropertyName)
+        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::PropertyState > GetPropertyStates(
+            SwPaM & rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames,
+            const SwGetPropertyStatesCaller eCaller =
+                SW_PROPERTY_STATE_CALLER_DEFAULT)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::beans::PropertyState GetPropertyState(
+            SwPaM & rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::rtl::OUString & rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    void SetPropertyToDefault(
+            SwPaM & rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::rtl::OUString & rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    ::com::sun::star::uno::Any  GetPropertyDefault(
+            SwPaM & rPaM,
+            const SfxItemPropertySet & rPropSet,
+            const ::rtl::OUString & rPropertyName)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    bool SetPageDesc(
+            const ::com::sun::star::uno::Any& rValue,
+            SwDoc & rDoc, SfxItemSet & rSet);
+    void SetTxtFmtColl(const ::com::sun::star::uno::Any & rAny, SwPaM & rPaM)
+        throw (::com::sun::star::lang::IllegalArgumentException);
+    bool SetCursorPropertyValue(
+            SfxItemPropertySimpleEntry const& rEntry,
+            ::com::sun::star::uno::Any const& rValue,
+            SwPaM & rPam, SfxItemSet & rItemSet)
+        throw (::com::sun::star::lang::IllegalArgumentException);
+
 } // namespace SwUnoCursorHelper
 
 #endif
diff --git a/sw/inc/unofield.hxx b/sw/inc/unofield.hxx
index bef657b5b797..092a4bdc56a1 100644
--- a/sw/inc/unofield.hxx
+++ b/sw/inc/unofield.hxx
@@ -30,14 +30,18 @@
 #ifndef _UNOFIELD_HXX
 #define _UNOFIELD_HXX
 
-#include <com/sun/star/text/XDependentTextField.hpp>
+#include <com/sun/star/lang/XUnoTunnel.hpp>
 #include <com/sun/star/util/XRefreshable.hpp>
 #include <com/sun/star/util/XUpdatable.hpp>
+#include <com/sun/star/text/XDependentTextField.hpp>
+
+#include <cppuhelper/implbase5.hxx>
+
 #include <calbck.hxx>
-#include <unoobj.hxx>
 #include <unocoll.hxx>
 #include <RefreshListenerContainer.hxx>
 
+
 class SwFieldType;
 class SwDoc;
 class SwFmtFld;
diff --git a/sw/inc/unofootnote.hxx b/sw/inc/unofootnote.hxx
new file mode 100644
index 000000000000..8d9a65d963ae
--- /dev/null
+++ b/sw/inc/unofootnote.hxx
@@ -0,0 +1,233 @@
+/*************************************************************************
+ *
+ * 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 <unotext.hxx>
+
+
+class SwDoc;
+class SwModify;
+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
+{
+
+private:
+
+    friend class SwXFootnotes;
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+
+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();
+
+    SwXFootnote(SwDoc & rDoc, const SwFmtFtn & rFmt);
+
+public:
+
+    SwXFootnote(const bool bEndnote);
+
+    static SwXFootnote *
+        CreateXFootnote(SwDoc & rDoc, SwFmtFtn const& rFootnoteFmt);
+    /// may return 0
+    static SwXFootnote *
+        GetXFootnote(SwModify const& rUnoCB, SwFmtFtn const& rFootnoteFmt);
+
+    // 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 a02999c8ca3d..0aaaebbe7338 100644
--- a/sw/inc/unoframe.hxx
+++ b/sw/inc/unoframe.hxx
@@ -30,20 +30,35 @@
 #ifndef _UNOFRAME_HXX
 #define _UNOFRAME_HXX
 
-#include <unoobj.hxx>
-#include <sfx2/objsh.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>
- */
 
-class SwDoc;
+#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 SfxItemPropertSet;
+class SdrObject;
+class SwDoc;
+class SwFmt;
+class SwFlyFrmFmt;
+
+
 /*-----------------12.02.98 11:21-------------------
 
 --------------------------------------------------*/
@@ -171,12 +186,18 @@ class SwXTextFrame : public SwXTextFrameBaseClass,
 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 ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >
+        CreateCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+
     virtual ~SwXTextFrame();
 public:
     SwXTextFrame(SwDoc *pDoc);
     SwXTextFrame(SwFrmFmt& rFmt);
 
+    // FIXME: EVIL HACK:  make available for SwXFrame::attachToRange
+    void SetDoc(SwDoc *const pDoc) { SwXText::SetDoc(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();
diff --git a/sw/inc/unoidx.hxx b/sw/inc/unoidx.hxx
index 5ea20f65c89d..664b0c46a78b 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -30,313 +30,341 @@
 #ifndef _UNOIDX_HXX
 #define _UNOIDX_HXX
 
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/container/XNamed.hpp>
 #include <com/sun/star/text/XDocumentIndexMark.hpp>
 #include <com/sun/star/text/XDocumentIndex.hpp>
-#include <com/sun/star/container/XIndexReplace.hpp>
-#include <unoobj.hxx>
+
+#include <cppuhelper/implbase4.hxx>
+#include <cppuhelper/implbase5.hxx>
+
 #include <unocoll.hxx>
 #include <toxe.hxx>
+
+
 class SwTOXBaseSection;
 class SwTOXMark;
 class SwTOXType;
+
 /* -----------------07.12.98 10:08-------------------
  *
  * --------------------------------------------------*/
-class SwDocIdxProperties_Impl;
-class SwXIndexStyleAccess_Impl;
-class SwXIndexTokenAccess_Impl;
-
-class SwXDocumentIndex : public cppu::WeakImplHelper5
-<
-    ::com::sun::star::text::XDocumentIndex,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::container::XNamed,
-    ::com::sun::star::lang::XUnoTunnel
->,
-    public SwClient
-{
-    friend class SwXIndexStyleAccess_Impl;
-    friend class SwXIndexTokenAccess_Impl;
 
-    SwEventListenerContainer    aLstnrCntnr;
-    const SfxItemPropertySet*   m_pPropSet;
-    SwDoc*                      m_pDoc;
-    const SwTOXBaseSection*     pBase;
-    TOXTypes                    eTOXType;
+typedef ::cppu::WeakImplHelper5
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::container::XNamed
+,   ::com::sun::star::text::XDocumentIndex
+> SwXDocumentIndex_Base;
 
-    //Descriptor-Interface
-    sal_Bool                    bIsDescriptor;
-    SwDocIdxProperties_Impl*    pProps;
-
-    SwXIndexStyleAccess_Impl*   pStyleAccess;
-    SwXIndexTokenAccess_Impl*   pTokenAccess;
+class SwXDocumentIndex
+    : public SwXDocumentIndex_Base
+{
 
-    SwSectionFmt*   GetFmt()const {return (SwSectionFmt*)GetRegisteredIn();}
+private:
 
-    sal_Bool                            IsDescriptor() const {return bIsDescriptor;}
-    const SwDocIdxProperties_Impl*  GetProperties_Impl() const { return pProps;}
-    SwDocIdxProperties_Impl*        GetProperties_Impl() { return pProps;}
-    TOXTypes                        GetTOXType() const {return eTOXType;}
+    class StyleAccess_Impl;
+    class TokenAccess_Impl;
 
-    SwXIndexStyleAccess_Impl*   GetStyleAccess() const {return pStyleAccess;}
-    void                        SetStyleAccess(SwXIndexStyleAccess_Impl* pSet)
-                                        {pStyleAccess = pSet;}
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
 
-    SwXIndexTokenAccess_Impl*   GetTokenAccess() const {return pTokenAccess;}
-    void                        SetTokenAccess(SwXIndexTokenAccess_Impl* pSet)
-                                        {pTokenAccess = pSet;}
-protected:
     virtual ~SwXDocumentIndex();
-public:
-    SwXDocumentIndex(const SwTOXBaseSection* = 0, SwDoc* = 0);
-    //Descriptor-Ctor
-    SwXDocumentIndex(TOXTypes eToxType, SwDoc& rDoc);
-
-
-    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);
-
-    //XDocumentIndex
-    virtual ::rtl::OUString SAL_CALL getServiceName(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL update(  ) 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);
+    SwXDocumentIndex(SwTOXBaseSection const&, SwDoc &);
 
-    //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(void) throw( ::com::sun::star::uno::RuntimeException );
+public:
 
-    //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 );
+    /// descriptor
+    SwXDocumentIndex(const TOXTypes eToxType, SwDoc& rDoc);
 
-    //XNamed
-    virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setName(const rtl::OUString& Name_) throw( ::com::sun::star::uno::RuntimeException );
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XDocumentIndex>
+        CreateXDocumentIndex(SwDoc & rDoc, SwTOXBaseSection const& rSection);
 
-    //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 );
+    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
-    //SwClient
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+    // 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);
+
+    // XNamed
+    virtual ::rtl::OUString SAL_CALL getName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+        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);
+
+
+    // XDocumentIndex
+    virtual ::rtl::OUString SAL_CALL getServiceName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL update()
+        throw (::com::sun::star::uno::RuntimeException);
 
-    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 );
 };
+
 /* -----------------07.12.98 10:08-------------------
  *
  * --------------------------------------------------*/
-class SwXDocumentIndexMark : public cppu::WeakImplHelper4
-<
-    ::com::sun::star::text::XDocumentIndexMark,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XUnoTunnel
->,
-        public SwClient
+typedef ::cppu::WeakImplHelper4
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::text::XDocumentIndexMark
+> SwXDocumentIndexMark_Base;
+
+class SwXDocumentIndexMark
+    : public SwXDocumentIndexMark_Base
 {
-    SwEventListenerContainer    aLstnrCntnr;
-    SwDepend                    aTypeDepend;
-    SwDoc*                      m_pDoc;
-    const SwTOXMark*            m_pTOXMark;
-    const SfxItemPropertySet*   m_pPropSet;
-
-    sal_Bool                    bIsDescriptor;
-    sal_Bool                    bMainEntry;
-    TOXTypes                    eType;
-    sal_uInt16                      nLevel;
-    String                      sAltText;
-    String                      sPrimaryKey;
-    String                      sSecondaryKey;
-    String                      sTextReading;
-    String                      sPrimaryKeyReading;
-    String                      sSecondaryKeyReading;
-    String                      sUserIndexName;
-
-    void                InitMap(TOXTypes eToxType);
-protected:
-    virtual ~SwXDocumentIndexMark();
-public:
-    SwXDocumentIndexMark(TOXTypes eToxType);
-    SwXDocumentIndexMark(const SwTOXType* pType,
-                        const SwTOXMark* pMark,
-                        SwDoc* pDc);
-
-
-    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);
+private:
 
-    virtual rtl::OUString SAL_CALL getMarkEntry(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setMarkEntry(const rtl::OUString& aIndexEntry) throw( ::com::sun::star::uno::RuntimeException );
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
 
-    //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(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual ~SwXDocumentIndexMark();
 
-    //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 );
+    SwXDocumentIndexMark(SwDoc & rDoc,
+                SwTOXType & rType, SwTOXMark & rMark);
 
-    //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);
+public:
 
-    //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 );
+    /// descriptor
+    SwXDocumentIndexMark(const TOXTypes eToxType);
 
-    //SwClient
-    virtual void Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XDocumentIndexMark>
+        CreateXDocumentIndexMark(SwDoc & rDoc,
+                SwTOXType & rType, SwTOXMark & rMark);
 
-    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 );
+    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
 
-    SwTOXType*          GetTOXType() const {return (SwTOXType*)aTypeDepend.GetRegisteredIn();}
-    const SwTOXMark*    GetTOXMark() const {return m_pTOXMark;}
+    // 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);
+
+    // 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);
+
+    // XDocumentIndexMark
+    virtual rtl::OUString SAL_CALL getMarkEntry()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setMarkEntry(const rtl::OUString& rIndexEntry)
+        throw (::com::sun::star::uno::RuntimeException);
 
-    static SwXDocumentIndexMark*    GetObject(SwTOXType* pType, const SwTOXMark* pMark,
-                                                SwDoc* pDoc);
-    void                Invalidate();
 };
+
 /* -----------------05.05.99 12:27-------------------
  *
  * --------------------------------------------------*/
-
-class SwXDocumentIndexes : public SwCollectionBaseClass,
-    public SwUnoCollection
+class SwXDocumentIndexes
+    : public SwCollectionBaseClass
+    , public SwUnoCollection
 {
-protected:
-    virtual ~SwXDocumentIndexes();
-public:
-    SwXDocumentIndexes(SwDoc* pDoc);
-
-
-//  SMART_UNO_DECLARATION( SwXDocumentIndexes, UsrObject );
-
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::reflection::XIdlClass >  >     getIdlClasses(void)
-
-//                                          throw( ::com::sun::star::uno::RuntimeException );
-// automatisch auskommentiert - [getIdlClass or queryInterface] - Bitte XTypeProvider benutzen!
-//  virtual sal_Bool            queryInterface( ::com::sun::star::uno::Uik aUik, ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  & rOut );
-
-
-    //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name) throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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);
-
-    //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 );
-
-    static SwXDocumentIndex* GetObject(const SwTOXBaseSection* pTOX);
-};
-/* -----------------13.09.99 16:39-------------------
-
- --------------------------------------------------*/
-class SwXIndexStyleAccess_Impl : public cppu::WeakImplHelper2
-<
-    ::com::sun::star::container::XIndexReplace,
-    ::com::sun::star::lang::XServiceInfo
->
-{
-    SwXDocumentIndex&   rParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndex >  xParent;
-protected:
-    virtual ~SwXIndexStyleAccess_Impl();
-public:
-    SwXIndexStyleAccess_Impl(SwXDocumentIndex& rParentIdx);
 
+private:
 
-    //XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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);
-
-    //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 );
-
-};
-
-/* -----------------13.09.99 16:39-------------------
+    virtual ~SwXDocumentIndexes();
 
- --------------------------------------------------*/
-class SwXIndexTokenAccess_Impl : public cppu::WeakImplHelper2
-<
-    ::com::sun::star::container::XIndexReplace,
-    ::com::sun::star::lang::XServiceInfo
->
-{
-    SwXDocumentIndex&   rParent;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XDocumentIndex >  xParent;
-    sal_Int32               nCount;
-protected:
-    virtual ~SwXIndexTokenAccess_Impl();
 public:
-    SwXIndexTokenAccess_Impl(SwXDocumentIndex& rParentIdx);
-
-
-
-    //XIndexReplace
-    virtual void SAL_CALL replaceByIndex( sal_Int32 Index, const ::com::sun::star::uno::Any& Element ) throw(::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::lang::IndexOutOfBoundsException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
 
-    //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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);
-
-    //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 );
+    SwXDocumentIndexes(SwDoc *const pDoc);
+
+    // 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);
+
+    // XIndexAccess
+    virtual sal_Int32 SAL_CALL getCount()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+    // XNameAccess
+    virtual ::com::sun::star::uno::Any SAL_CALL getByName(
+            const ::rtl::OUString& rName)
+        throw (::com::sun::star::container::NoSuchElementException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::rtl::OUString > SAL_CALL
+        getElementNames() throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasByName(const ::rtl::OUString& rName)
+        throw (::com::sun::star::uno::RuntimeException);
 
 };
 
 #endif
 
-
diff --git a/sw/inc/unomod.hxx b/sw/inc/unomod.hxx
index dcb2f9cfcbda..0f46a92f323e 100644
--- a/sw/inc/unomod.hxx
+++ b/sw/inc/unomod.hxx
@@ -45,7 +45,7 @@
 
 class SwView;
 class SwViewOption;
-struct SwPrintData;
+class SwPrintData;
 class SwDoc;
 
 /******************************************************************************
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
deleted file mode 100644
index 0447c39920df..000000000000
--- a/sw/inc/unoobj.hxx
+++ /dev/null
@@ -1,1493 +0,0 @@
-/*************************************************************************
- *
- * 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 _UNOOBJ_HXX
-#define _UNOOBJ_HXX
-
-#include <unoevtlstnr.hxx>
-#include <unobaseclass.hxx>
-#include <unocrsr.hxx>
-#include <svl/itemprop.hxx>
-#include <svl/svarray.hxx>
-#include <frmfmt.hxx>
-#include <flyenum.hxx>
-#include <fldbas.hxx>
-#include <fmtcntnt.hxx>
-#include <pam.hxx>
-#include <toxe.hxx>
-#include <sortopt.hxx>
-#include <com/sun/star/document/XDocumentInsertable.hpp>
-#include <com/sun/star/text/XTextCursor.hpp>
-#include <com/sun/star/text/XWordCursor.hpp>
-#include <com/sun/star/text/XParagraphCursor.hpp>
-#include <com/sun/star/text/XSentenceCursor.hpp>
-#include <com/sun/star/text/XFootnote.hpp>
-#include <com/sun/star/text/XTextSection.hpp>
-#include <com/sun/star/text/XTextField.hpp>
-#include <com/sun/star/text/XTextRange.hpp>
-#include <com/sun/star/text/XText.hpp>
-#include <com/sun/star/text/XTextContent.hpp>
-#include <com/sun/star/util/XSortable.hpp>
-#include <com/sun/star/container/XEnumerationAccess.hpp>
-#include <com/sun/star/container/XContentEnumerationAccess.hpp>
-#include <com/sun/star/container/XIndexAccess.hpp>
-#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>
-#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 <com/sun/star/text/XRedline.hpp>
-#include <cppuhelper/weak.hxx>
-#include <cppuhelper/factory.hxx>   // helper for factories
-
-#include <cppuhelper/implbase1.hxx> // helper for implementations
-#include <cppuhelper/implbase3.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/implbase7.hxx> // helper for implementations
-#include <cppuhelper/implbase8.hxx>
-#include <cppuhelper/implbase9.hxx>
-#include <cppuhelper/implbase10.hxx>
-#include <cppuhelper/implbase12.hxx>    // helper for implementations
-#include "TextCursorHelper.hxx"
-#include <comphelper/uno3.hxx>
-#include <cppuhelper/weakref.hxx>
-#include <com/sun/star/text/XFormField.hpp>
-
-#include <unomid.h>
-#include <tools/link.hxx>
-
-#include <IDocumentMarkAccess.hxx>
-#include <sfx2/Metadatable.hxx>
-
-#include <deque>
-#include <boost/shared_ptr.hpp>
-
-
-class SwFmtFtn;
-class SwFmtRefMark;
-class GetCurTxtFmtColl;
-
-
-struct FrameDependSortListEntry {
-    xub_StrLen nIndex;
-    sal_uInt32 nOrder;
-    ::boost::shared_ptr<SwDepend> pFrameDepend;
-    FrameDependSortListEntry (xub_StrLen const i_nIndex,
-                sal_uInt32 const i_nOrder, SwDepend * const i_pDepend)
-        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameDepend(i_pDepend) { }
-};
-typedef ::std::deque< FrameDependSortListEntry >
-    FrameDependSortList_t;
-
-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-------------------
- *
- * --------------------------------------------------*/
-
-SwPageDesc* GetPageDescByName_Impl(SwDoc& rDoc, const String& rName);
-::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
-
-// OD 2004-05-07 #i28701# - adjust 4th parameter
-void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
-                         FrameDependSortList_t & rFrames,
-                         const bool _bAtCharAnchoredObjs );
-
-/* -----------------29.04.98 07:35-------------------
- *
- * --------------------------------------------------*/
-class SwUnoInternalPaM : public SwPaM
-{
-    SwUnoInternalPaM( const SwUnoInternalPaM& );
-public:
-    SwUnoInternalPaM(SwDoc& rDoc);
-    ~SwUnoInternalPaM();
-
-    SwUnoInternalPaM&   operator=(const SwPaM& rPaM);
-};
-
-/*-----------------04.03.98 11:54-------------------
-    Start/EndAction oder Start/EndAllAction
---------------------------------------------------*/
-class UnoActionContext
-{
-        SwDoc*      pDoc;
-    public:
-        UnoActionContext(SwDoc* pDoc);
-        ~UnoActionContext();
-
-        void InvalidateDocument() {pDoc = 0;}
-};
-/* -----------------07.07.98 12:03-------------------
- *  Actions kurzfristig unterbrechen
- * --------------------------------------------------*/
-class UnoActionRemoveContext
-{
-        SwDoc*      pDoc;
-    public:
-        UnoActionRemoveContext(SwDoc* pDoc);
-        ~UnoActionRemoveContext();
-};
-
-/******************************************************************************
- *
- ******************************************************************************/
-typedef com::sun::star::uno::Reference< com::sun::star::text::XTextRange > * XTextRangeRefPtr;
-SV_DECL_PTRARR(XTextRangeArr, XTextRangeRefPtr, 4, 4)
-
-void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-/* -----------------03.12.98 12:22-------------------
- *
- * --------------------------------------------------*/
-class SwXTextRange;
-class SwXTextCursor;
-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;}
-};
-
-/* -----------------03.12.98 12:16-------------------
- *
- * --------------------------------------------------*/
-enum SwGetPropertyStatesCaller
-{
-    SW_PROPERTY_STATE_CALLER_DEFAULT,
-    SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION,
-    SW_PROPERTY_STATE_CALLER_SINGLE_VALUE_ONLY,
-    SW_PROPERTY_STATE_CALLER_SWX_TEXT_PORTION_TOLERANT
-};
-#define CRSR_ATTR_MODE_TABLE        1   //attributes should be applied to a table selection
-#define CRSR_ATTR_MODE_DONTREPLACE  2   //attributes should be added, not replaced
-
-typedef cppu::WeakImplHelper12<
-                                ::com::sun::star::text::XSentenceCursor,
-                                ::com::sun::star::text::XWordCursor,
-                                ::com::sun::star::text::XParagraphCursor,
-                                ::com::sun::star::text::XRedline,
-                                ::com::sun::star::beans::XPropertySet,
-                                ::com::sun::star::beans::XPropertyState,
-                                ::com::sun::star::document::XDocumentInsertable,
-                                ::com::sun::star::lang::XServiceInfo,
-                                ::com::sun::star::util::XSortable,
-                                ::com::sun::star::container::XContentEnumerationAccess,
-                                ::com::sun::star::container::XEnumerationAccess,
-                                ::com::sun::star::beans::XMultiPropertyStates
-                            > SwXTextCursor_Base;
-class SwXTextCursor : public SwXTextCursor_Base,
-    public SwClient,
-    public OTextCursorHelper
-{
-    SwEventListenerContainer    aLstnrCntnr;
-    const SfxItemPropertySet*   m_pPropSet;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >                   xParentText;
-    SwSortOptions*              pLastSortOptions;
-
-    CursorType                  eType;
-
-    // --> FME 2006-03-07 #126177# We need to track if the RemoveCursor_Impl
-    // user event has been posted. In this case we have to remove the user
-    // event in ~SwXTextCursor().
-    ULONG mnUserEventId;
-    bool mbRemoveUserEvent;
-    // <--
-
-    DECL_STATIC_LINK( SwXTextCursor, RemoveCursor_Impl,
-                      ::com::sun::star::uno::Reference<
-                      ::com::sun::star::uno::XInterface>* );
-
-protected:
-    virtual ~SwXTextCursor();
-public:
-    void    DeleteAndInsert(const String& rText, const bool bForceExpandHints);
-    SwXTextCursor(::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  xParent, const SwPosition& rPos,
-                    CursorType eSet, SwDoc* pDoc, const SwPosition* pMark = 0);
-    SwXTextCursor(::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  xParent, SwUnoCrsr* pSourceCrsr, CursorType eSet = CURSOR_ALL);
-
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
-
-    DECLARE_XINTERFACE()
-
-    //XUnoTunnel
-    virtual sal_Int64 SAL_CALL getSomething( const ::com::sun::star::uno::Sequence< sal_Int8 >& aIdentifier ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XTextCursor - neu
-    virtual void SAL_CALL collapseToStart(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL collapseToEnd(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL isCollapsed(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL goLeft( sal_Int16 nCount, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL goRight( sal_Int16 nCount, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL gotoStart( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL gotoEnd( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL gotoRange( const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange >& xRange, BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XWordCursor - neu
-    virtual BOOL SAL_CALL isStartOfWord(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL isEndOfWord(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoNextWord( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoPreviousWord( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoEndOfWord( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoStartOfWord( BOOL bExpand ) throw(::com::sun::star::uno::RuntimeException);
-
-    //XSentenceCursor - neu
-    virtual BOOL SAL_CALL isStartOfSentence(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL isEndOfSentence(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoNextSentence( BOOL Expand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoPreviousSentence( BOOL Expand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoStartOfSentence( BOOL Expand ) throw(::com::sun::star::uno::RuntimeException);
-    virtual BOOL SAL_CALL gotoEndOfSentence( BOOL Expand ) throw(::com::sun::star::uno::RuntimeException);
-
-    //ParagraphCursor - neu
-    virtual BOOL SAL_CALL isStartOfParagraph(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL isEndOfParagraph(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL gotoStartOfParagraph(BOOL Expand) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL gotoEndOfParagraph(BOOL Expand) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL gotoNextParagraph(BOOL Expand) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL SAL_CALL gotoPreviousParagraph(BOOL Expand) throw( ::com::sun::star::uno::RuntimeException );
-
-    //XRedline
-    virtual void SAL_CALL makeRedline( const ::rtl::OUString& RedlineType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::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 );
-
-    //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);
-
-    static void SetPropertyValue(
-                        SwPaM& rPaM,
-                        const SfxItemPropertySet& rPropSet,
-                        const rtl::OUString& rPropertyName,
-                        const ::com::sun::star::uno::Any& aValue,
-                        USHORT nAttrMode = 0)
-                            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);
-     static ::com::sun::star::uno::Any  GetPropertyValue(   SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyState > GetPropertyStates( SwPaM& rPaM, const SfxItemPropertySet& rPropSet,     const ::com::sun::star::uno::Sequence< ::rtl::OUString >& PropertyNames, SwGetPropertyStatesCaller eCaller = SW_PROPERTY_STATE_CALLER_DEFAULT)          throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::beans::PropertyState GetPropertyState( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName)       throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-     static void SetPropertyToDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const rtl::OUString& rPropertyName) throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    static ::com::sun::star::uno::Any  GetPropertyDefault( SwPaM& rPaM, const SfxItemPropertySet& rPropSet, const ::rtl::OUString& rPropertyName)   throw(::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException);
-
-    //XDocumentInsertable - neu
-    virtual void SAL_CALL insertDocumentFromURL(const rtl::OUString& rURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aOptions) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::io::IOException, ::com::sun::star::uno::RuntimeException );
-
-    //XSortable - neu
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL createSortDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL sort(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xDescriptor) 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 );
-
-    //XEnumerationAccess
-    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 );
-
-    //XMultiPropertyStates
-    //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 setAllPropertiesToDefault(  ) throw (::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setPropertiesToDefault( const ::com::sun::star::uno::Sequence< ::rtl::OUString >& aPropertyNames ) throw (::com::sun::star::beans::UnknownPropertyException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any > SAL_CALL getPropertyDefaults( 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);
-
-
-    //SwClient
-    virtual void        Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-
-    virtual const SwPaM*        GetPaM() const;
-    virtual SwPaM*              GetPaM();
-    virtual const SwDoc*        GetDoc() const;
-    virtual SwDoc*              GetDoc();
-    SwUnoCrsr*          GetCrsr(){return (SwUnoCrsr*)GetRegisteredIn();}
-    const SwUnoCrsr*    GetCrsr()const{return (SwUnoCrsr*)GetRegisteredIn();}
-
-    static void         SetCrsrAttr(SwPaM& rPam, const SfxItemSet& rSet, USHORT nAttrMode );
-    // --> OD 2006-07-12 #i63870#
-    // split third parameter <bCurrentAttrOnly> into new parameters <bOnlyTxtAttr>
-    // and <bGetFromChrFmt> to get better control about resulting <SfxItemSet>
-//    static void         GetCrsrAttr(SwPaM& rPam, SfxItemSet& rSet, BOOL bCurrentAttrOnly = FALSE);
-    static void         GetCrsrAttr( SwPaM& rPam,
-                                     SfxItemSet& rSet,
-                                     BOOL bOnlyTxtAttr = FALSE,
-                                     BOOL bGetFromChrFmt = TRUE );
-    // <--
-    static void         getTextFromPam(SwPaM& aCrsr, rtl::OUString& rBuffer);
-    static SwFmtColl*   GetCurTxtFmtColl(SwPaM& rPam, BOOL bConditional);
-
-    static void         SelectPam(SwPaM& rCrsr, sal_Bool bExpand);
-    static void         SetString(SwCursor& rCrsr, const rtl::OUString& rString);
-
-    static              ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >
-                            createSortDescriptor(sal_Bool bFromTable);
-    static sal_Bool     convertSortProperties(
-                            const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& rDescriptor,
-                            SwSortOptions& rSortOpt);
-
-    // --> FME 2006-03-07 #126177#
-    void DoNotRemoveUserEvent() { mbRemoveUserEvent = false; }
-    // <--
-
-    bool IsAtEndOfMeta() const;
-};
-/*-----------------20.03.98 07:47-------------------
-
---------------------------------------------------*/
-/* das wird zunaechst nicht gebraucht - bisher fuer den XPropertySetCloner
-class SwXPropertySet : public ::com::sun::star::beans::XPropertySet,
-                        public UsrObject
-{
-    ::com::sun::star::uno::Sequence<::com::sun::star::uno::Any>*        pAny;
-    ::com::sun::star::uno::Sequence< Property >*    pInfo;
-
-public:
-    // Eigentumsuebergang der Pointer!
-    SwXPropertySet( ::com::sun::star::uno::Sequence<::com::sun::star::uno::Any>*        pAny,
-                    ::com::sun::star::uno::Sequence<Property>*  pInfo );
-    virtual ~SwXPropertySet();
-
-    SMART_UNO_DECLARATION( SwXPropertySet, UsrObject );
-
-    //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);
-
-};
-*/
-/*-----------------20.03.98 08:26-------------------
-
---------------------------------------------------*/
-/* das wird zunaechst nicht gebraucht - bisher fuer den XPropertySetCloner
-
-class SwXPropertySetInfo: public ::com::sun::star::beans::XPropertySetInfo, UsrObject
-{
-    ::com::sun::star::uno::Sequence< Property >*        pSeq;
-
-public:
-    SwXPropertySetInfo( const ::com::sun::star::uno::Sequence<Property>& rInfo );
-    virtual ~SwXPropertySetInfo();
-
-    SMART_UNO_DECLARATION( SwXPropertySetInfo, UsrObject );
-
-    virtual ::com::sun::star::uno::Sequence< Property > getProperties(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual Property getPropertyByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
-    virtual BOOL hasPropertyByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
-};
-*/
-
-typedef ::cppu::ImplInheritanceHelper5
-<
-    ::sfx2::MetadatableMixin,
-    ::com::sun::star::text::XTextContent,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XNamed,
-    ::com::sun::star::lang::XUnoTunnel
->
-SwBookmarkBaseClass;
-
-class SwXBookmark
-    : public SwBookmarkBaseClass
-    , private SwClient
-{
-    private:
-        SwEventListenerContainer m_aLstnrCntnr;
-        SwDoc* m_pDoc;
-        String m_aName;
-        ::sw::mark::IMark* m_pRegisteredBookmark;
-
-        void registerInMark(::sw::mark::IMark* const pBkmk)
-        {
-            if(pBkmk)
-                pBkmk->Add(this);
-            else if(m_pRegisteredBookmark)
-            {
-                m_aName = m_pRegisteredBookmark->GetName();
-                m_pRegisteredBookmark->Remove(this);
-            }
-            m_pRegisteredBookmark = pBkmk;
-        }
-
-    protected:
-        virtual ~SwXBookmark();
-    public:
-        SwXBookmark(::sw::mark::IMark* pMark = 0, SwDoc* pDoc = 0);
-
-        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);
-
-        //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 );
-
-        //XNamed
-        virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
-        virtual void SAL_CALL setName(const rtl::OUString& rName) 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);
-
-        void attachToRangeEx(const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange, IDocumentMarkAccess::MarkType eType) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
-        virtual 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 );
-
-        //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();
-
-        const ::sw::mark::IMark* GetBookmark() const
-            { return m_pRegisteredBookmark; }
-              ::sw::mark::IMark* GetBookmark()
-            { return m_pRegisteredBookmark; }
-        SwDoc* GetDoc()
-            { return m_pDoc; }
-};
-
-typedef cppu::ImplInheritanceHelper1< SwXBookmark, ::com::sun::star::text::XFormField > SwXFieldmark_BASE;
-
-class SwXFieldmark : public SwXFieldmark_BASE
-{
-    private:
-        bool isReplacementObject;
-    public:
-        SwXFieldmark(bool isReplacementObject, ::sw::mark::IMark* pBkm = 0, SwDoc* pDoc = 0);
-
-        virtual 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 );
-        virtual ::rtl::OUString SAL_CALL getDescription(void) throw( ::com::sun::star::uno::RuntimeException );
-        virtual ::sal_Int16 SAL_CALL getType(  ) throw (::com::sun::star::uno::RuntimeException);
-        virtual ::sal_Int16 SAL_CALL getRes(  ) throw (::com::sun::star::uno::RuntimeException);
-
-        virtual void SAL_CALL setType( ::sal_Int16 fieldType ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setRes( ::sal_Int16 res ) throw (::com::sun::star::uno::RuntimeException);
-        virtual void SAL_CALL setDescription( const ::rtl::OUString& description ) throw (::com::sun::star::uno::RuntimeException);
-};
-
-/*-----------------23.02.98 10:45-------------------
-
---------------------------------------------------*/
-
-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);
-};
-
-class SW_DLLPUBLIC SwXTextRange : public cppu::WeakImplHelper8
-<
-    ::com::sun::star::text::XTextRange,
-    ::com::sun::star::lang::XUnoTunnel,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XContentEnumerationAccess,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::beans::XPropertyState,
-    ::com::sun::star::container::XEnumerationAccess,
-    ::com::sun::star::text::XRedline
->,  private SwClient
-{
-    friend class SwXText;
-    enum RangePosition
-    {
-        RANGE_IN_TEXT, // 'normaler' ::com::sun::star::text::TextRange
-        RANGE_IN_FRAME,// TextPosition wurde mit einem Rahmen angelegt, der kein Uno-Objekt besitzt
-        RANGE_IN_CELL, // TextPosition wurde mit einer Zelle angelegt, die kein Uno-Objekt besitzt
-        RANGE_IS_TABLE, // Anker einer Tabelle
-        RANGE_INVALID  // von NewInstance erzeugt
-    } eRangePosition;
-
-    SwDoc*              pDoc;
-    SwTableBox*         pBox;
-    const SwStartNode*  pBoxStartNode;
-    SwDepend            aObjectDepend; //Format der Tabelle oder des Rahmens anmelden
-    const SfxItemPropertySet*   m_pPropSet;
-    //SwDepend  aFrameDepend;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >   xParentText;
-    ::sw::mark::IMark* pMark;
-
-    void    _CreateNewBookmark(SwPaM& rPam);
-    //TODO: new exception type for protected content
-    void    DeleteAndInsert(const String& rText, const bool bForceExpandHints)
-        throw( ::com::sun::star::uno::RuntimeException );
-protected:
-    virtual ~SwXTextRange();
-
-public:
-    SwXTextRange(SwPaM& rPam, const ::com::sun::star::uno::Reference< ::com::sun::star::text::XText > & rxParent, enum RangePosition eRange = RANGE_IN_TEXT);
-    // only for RANGE_IS_TABLE
-    SwXTextRange(SwFrmFmt& rTblFmt);
-
-    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);
-
-    //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 );
-
-    //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 );
-
-    //XEnumerationAccess
-    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);
-
-    //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);
-
-    //XRedline
-    virtual void SAL_CALL makeRedline( const ::rtl::OUString& RedlineType, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& RedlineProperties ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-
-    //SwClient
-    virtual void Modify(SfxPoolItem *pOld, SfxPoolItem *pNew);
-    BOOL GetPositions(SwPaM& rToFill) const;
-    const SwDoc* GetDoc() const
-        { return pDoc; }
-    SwDoc* GetDoc()
-        { return pDoc; }
-    const ::sw::mark::IMark * GetBookmark() const
-        { return pMark; }
-
-    static BOOL XTextRangeToSwPaM(SwUnoInternalPaM& rToFill,
-        const ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > & xTextRange);
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextRange > CreateTextRangeFromPosition(
-        SwDoc* pDoc,
-        const SwPosition& rPos, const SwPosition* pMark);
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  CreateParentXText(SwDoc* pDoc,
-                        const SwPosition& rPos);
-};
-
-/* -----------------15.05.98 08:29-------------------
- *
- * --------------------------------------------------*/
-typedef cppu::WeakImplHelper3
-<
-    ::com::sun::star::container::XIndexAccess,
-    ::com::sun::star::lang::XUnoTunnel,
-    ::com::sun::star::lang::XServiceInfo
->
-SwXTextRangesBaseClass;
-class SwXTextRanges : public SwXTextRangesBaseClass,
-    public SwClient
-{
-    XTextRangeArr*      pRangeArr;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >           xParentText;
-    XTextRangeArr*      GetRangesArray();
-    SwUnoCrsr*          GetCrsr() const { return (SwUnoCrsr*)GetRegisteredIn(); }
-protected:
-    virtual ~SwXTextRanges();
-public:
-    SwXTextRanges();
-    SwXTextRanges(SwPaM* pCrsr);
-
-
-    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);
-
-
-    //XIndexAccess
-    virtual sal_Int32 SAL_CALL getCount(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex) throw( ::com::sun::star::lang::IndexOutOfBoundsException, ::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);
-
-    //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);
-    const SwUnoCrsr*    GetCursor() const { return (const SwUnoCrsr*)GetRegisteredIn(); }
-};
-
-/*-----------------09.03.98 13:57-------------------
-
---------------------------------------------------*/
-
-class SwXTextSection;
-class SwXTextSectionClient : public SwClient
-{
-    friend class SwXTextSection;
-    SwXTextSection*                                                                 m_pSection;
-    ::com::sun::star::uno::WeakReference< ::com::sun::star::text::XTextSection >    m_xReference;
-    //SwClient
-    virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-    SwXTextSectionClient(
-            SwSectionFmt& rFmt,
-            SwXTextSection& rTextSection,
-            ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > xSection );
-    virtual ~SwXTextSectionClient();
-    DECL_STATIC_LINK( SwXTextSectionClient, RemoveSectionClient_Impl,
-                      SwXTextSectionClient* );
-
-public:
-    TYPEINFO();
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > GetXTextSection();
-
-    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection >
-            CreateXTextSection(SwSectionFmt* pFmt = 0, BOOL bIndexHeader = FALSE );
-    static SwXTextSectionClient* Create(
-            SwXTextSection& rSection,
-            ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection > xSection,
-            SwSectionFmt& rFmt );
-};
-
-struct SwTextSectionProperties_Impl;
-class SwXTextSection : public cppu::WeakImplHelper7
-<
-    ::com::sun::star::text::XTextSection,
-    ::com::sun::star::beans::XPropertyState,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::beans::XMultiPropertySet,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XNamed,
-    ::com::sun::star::lang::XUnoTunnel
->/*,
-    public SwClient*/
-{
-    friend class SwXTextSectionClient;
-    SwEventListenerContainer        aLstnrCntnr;
-    const SfxItemPropertySet*       m_pPropSet;
-
-    BOOL                            m_bIsDescriptor;
-    BOOL                            m_bIndexHeader;
-    String                          m_sName;
-    SwTextSectionProperties_Impl*   pProps;
-    SwXTextSectionClient*           m_pClient;
-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);
-
-    SwXTextSection(sal_Bool bWithFormat, sal_Bool bIndexHeader = FALSE);
-    virtual ~SwXTextSection();
-    void                            ResetClient() {m_pClient = 0;}
-    void                            SetClient( SwXTextSectionClient* pClient ){m_pClient = pClient;}
-
-public:
-    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);
-
-    //XTextSection
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection >  SAL_CALL getParentSection(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextSection >  > SAL_CALL getChildSections(void) 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 );
-
-    //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);
-
-    //XNamed
-    virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setName(const rtl::OUString& Name_) 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 );
-
-    //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 );
-
-    SwSectionFmt*   GetFmt()const;
-    static SwXTextSection* GetImplementation(::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface> xRef );
-};
-/*-----------------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();
-};
-
-/*-----------------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* pParent, SwUnoCrsr* pCrsr);
-};
-/* -----------------23.03.99 12:57-------------------
- *
- * --------------------------------------------------*/
-#define PARAFRAME_PORTION_PARAGRAPH     0
-#define PARAFRAME_PORTION_CHAR          1
-#define PARAFRAME_PORTION_TEXTRANGE     2
-
-class SwXParaFrameEnumeration : public cppu::WeakImplHelper2
-<
-    ::com::sun::star::container::XEnumeration,
-    ::com::sun::star::lang::XServiceInfo
->,
-    public SwClient
-{
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextContent >
-        m_xNextObject;    // created by hasMoreElements
-    FrameDependList_t m_Frames;
-
-    SwUnoCrsr*          GetCursor() const
-    {return static_cast<SwUnoCrsr*>(const_cast<SwModify*>(GetRegisteredIn()));}
-
-public:
-    SwXParaFrameEnumeration(const SwPaM& rPaM,
-        sal_uInt8 nParaFrameMode, SwFrmFmt* pFmt = 0);
-    ~SwXParaFrameEnumeration();
-
-    // 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 );
-
-    // XServiceInfo
-    virtual rtl::OUString SAL_CALL getImplementationName()
-        throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_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()
-        throw( ::com::sun::star::uno::RuntimeException );
-
-    //SwClient
-    virtual void    Modify( SfxPoolItem *pOld, SfxPoolItem *pNew);
-};
-
-
-/* -----------------29.09.98 09:01-------------------
- *
- * --------------------------------------------------*/
-/* os: 04.12.98 11:40 hier gibt es noch keine sinnvolle Definition
-#define MAX_SORT_FIELDS 3 // das ist eher willkuerlich (wie im Dialog)
-class SwXTextSortDescriptor : public XTextSortDescriptor,
-                                public UsrObject
-{
-    SwSortOptions   aSortOptions;
-    BOOL            bUseHeader;
-public:
-    SwXTextSortDescriptor(BOOL bUsedInTable);
-    virtual ~SwXTextSortDescriptor();
-
-    //XTextSortDescriptor
-    virtual sal_Unicode getTextColumnSeparator(void) const;
-    virtual void setTextColumnSeparator(sal_Unicode TextColumnSeparator_);
-
-    //XSortDescriptor
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::util::SortField > getSortFields(void) const;
-    virtual void setSortFields(const ::com::sun::star::uno::Sequence< ::com::sun::star::util::SortField >& SortFields_);
-    virtual sal_uInt16 getMaxFieldCount(void) const;
-    virtual ColumnsOrRows getOrientation(void) const;
-    virtual void setOrientation(ColumnsOrRows Orientation_);
-    virtual BOOL getUseHeader(void) const;
-    virtual void setUseHeader(BOOL UseHeader_);
-
-    const SwSortOptions&    GetSortOptions() const {return aSortOptions;}
-    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);
-};
-/* -----------------27.08.98 15:11-------------------
- *
- * --------------------------------------------------*/
-typedef ::cppu::WeakImplHelper5
-<
-    ::com::sun::star::text::XTextContent,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::container::XNamed,
-    ::com::sun::star::lang::XUnoTunnel
->
-SwRefMarkBaseClass;
-
-class SwXReferenceMark : public SwRefMarkBaseClass,
-    public SwClient
-{
-    SwEventListenerContainer    aLstnrCntnr;
-    SwDoc*                      pDoc;
-    const SwFmtRefMark*         pMark;
-    String                      sMarkName;
-    BOOL                        m_bIsDescriptor;
-
-    BOOL    IsValid() const {return 0 != GetRegisteredIn();}
-    void    InsertRefMark( SwPaM& rPam, SwXTextCursor * pCursor );
-public:
-    SwXReferenceMark(SwDoc* pDoc, const SwFmtRefMark* pMark);
-    ~SwXReferenceMark();
-
-    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);
-
-    //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 );
-
-    //XNamed
-    virtual rtl::OUString SAL_CALL getName(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setName(const rtl::OUString& Name_) 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 SwFmtRefMark* GetMark()const {return pMark;}
-    const String&       GetMarkName() const {return sMarkName;}
-    SwDoc*              GetDoc() const{return pDoc;}
-    void                Invalidate();
-};
-#endif
-
-
diff --git a/sw/inc/unoparaframeenum.hxx b/sw/inc/unoparaframeenum.hxx
new file mode 100644
index 000000000000..7e5b43f1e637
--- /dev/null
+++ b/sw/inc/unoparaframeenum.hxx
@@ -0,0 +1,131 @@
+/*************************************************************************
+ *
+ * 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_UNOPARAFRAMEENUM_HXX
+#define SW_UNOPARAFRAMEENUM_HXX
+
+#include <deque>
+
+#include <boost/shared_ptr.hpp>
+
+#include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/container/XEnumeration.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+
+#include <cppuhelper/implbase2.hxx>
+
+#include <unobaseclass.hxx>
+
+
+class SwDepend;
+class SwNodeIndex;
+class SwPaM;
+class SwFrmFmt;
+
+
+struct FrameDependSortListEntry
+{
+    xub_StrLen nIndex;
+    sal_uInt32 nOrder;
+    ::boost::shared_ptr<SwDepend> pFrameDepend;
+
+    FrameDependSortListEntry (xub_StrLen const i_nIndex,
+                sal_uInt32 const i_nOrder, SwDepend * const i_pDepend)
+        : nIndex(i_nIndex), nOrder(i_nOrder), pFrameDepend(i_pDepend) { }
+};
+
+typedef ::std::deque< FrameDependSortListEntry >
+    FrameDependSortList_t;
+
+typedef ::std::deque< ::boost::shared_ptr<SwDepend> >
+    FrameDependList_t;
+
+
+// OD 2004-05-07 #i28701# - adjust 4th parameter
+void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
+                         FrameDependSortList_t & rFrames,
+                         const bool _bAtCharAnchoredObjs );
+
+
+/* -----------------23.03.99 12:57-------------------
+ *
+ * --------------------------------------------------*/
+
+enum ParaFrameMode
+{
+    PARAFRAME_PORTION_PARAGRAPH,
+    PARAFRAME_PORTION_CHAR,
+    PARAFRAME_PORTION_TEXTRANGE,
+};
+
+typedef ::cppu::WeakImplHelper2
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XEnumeration
+> SwXParaFrameEnumeration_Base;
+
+class SwXParaFrameEnumeration
+    : public SwXParaFrameEnumeration_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXParaFrameEnumeration();
+
+public:
+
+    SwXParaFrameEnumeration(const SwPaM& rPaM,
+        const enum ParaFrameMode eParaFrameMode, SwFrmFmt *const pFmt = 0);
+
+    // 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_UNOPARAFRAMEENUM_HXX
+
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
new file mode 100644
index 000000000000..8743737c338e
--- /dev/null
+++ b/sw/inc/unoparagraph.hxx
@@ -0,0 +1,369 @@
+/*************************************************************************
+ *
+ * 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 <memory>
+
+#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 <unobaseclass.hxx>
+
+
+struct SwPosition;
+class SwPaM;
+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
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXParagraph();
+
+    SwXParagraph(::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XText > const & xParent,
+            SwTxtNode & rTxtNode,
+            const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
+
+public:
+
+    /// descriptor
+    SwXParagraph();
+
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XTextContent>
+        CreateXParagraph(SwDoc & rDoc, SwTxtNode& rTxtNode,
+            ::com::sun::star::uno::Reference< ::com::sun::star::text::XText>
+                const& xParentText = 0,
+            const sal_Int32 nSelStart = -1, const sal_Int32 nSelEnd = - 1);
+
+    const SwTxtNode * GetTxtNode() const;
+    bool            IsDescriptor() const;
+    /// make rPaM select the paragraph
+    bool SelectPaM(SwPaM & rPaM);
+    /// for SwXText
+    void attachToText(SwXText & rParent, SwTxtNode & rTxtNode);
+
+    // 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 SwSimpleEnumeration_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXParagraphEnumeration();
+
+public:
+
+    /// takes ownership of cursor
+    SwXParagraphEnumeration(
+            ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+                const & xParent,
+            ::std::auto_ptr<SwUnoCrsr> pCursor,
+            const CursorType eType,
+            SwStartNode const*const pStartNode = 0,
+            SwTable const*const pTable = 0);
+
+    // 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/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/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 52f2ab16a368..ba08afc1f8bf 100644
--- a/sw/inc/unoredlines.hxx
+++ b/sw/inc/unoredlines.hxx
@@ -78,8 +78,9 @@ public:
 /* -----------------------------12.01.01 14:58--------------------------------
 
  ---------------------------------------------------------------------------*/
-class SwXRedlineEnumeration : public SwSimpleEnumerationBaseClass,
-    public SwClient
+class SwXRedlineEnumeration
+    : public SwSimpleEnumeration_Base
+    , public SwClient
 {
     SwDoc* pDoc;
     USHORT nCurrentIndex;
diff --git a/sw/inc/unorefmark.hxx b/sw/inc/unorefmark.hxx
new file mode 100644
index 000000000000..61b6d09df06b
--- /dev/null
+++ b/sw/inc/unorefmark.hxx
@@ -0,0 +1,178 @@
+/*************************************************************************
+ *
+ * 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_UNOREFMARK_HXX
+#define SW_UNOREFMARK_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/XNamed.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+
+#include <cppuhelper/implbase5.hxx>
+
+#include <unobaseclass.hxx>
+
+
+class SwDoc;
+class SwModify;
+class SwFmtRefMark;
+
+
+/* -----------------27.08.98 15:11-------------------
+ *
+ * --------------------------------------------------*/
+typedef ::cppu::WeakImplHelper5
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::container::XNamed
+,   ::com::sun::star::text::XTextContent
+> SwXReferenceMark_Base;
+
+class SwXReferenceMark
+    : public SwXReferenceMark_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXReferenceMark();
+
+public:
+
+    SwXReferenceMark(SwDoc *const pDoc, const SwFmtRefMark *const pMark);
+
+    static SwXReferenceMark *
+        CreateXReferenceMark(SwDoc & rDoc, SwFmtRefMark const& rMarkFmt);
+    /// may return 0
+    static SwXReferenceMark *
+        GetReferenceMark(SwModify const& rUnoCB, SwFmtRefMark const& rMarkFmt);
+
+    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);
+
+    // XNamed
+    virtual ::rtl::OUString SAL_CALL getName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+        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);
+
+};
+
+#endif // SW_UNOREFMARK_HXX
+
diff --git a/sw/inc/unosection.hxx b/sw/inc/unosection.hxx
new file mode 100644
index 000000000000..6f3eb1794c84
--- /dev/null
+++ b/sw/inc/unosection.hxx
@@ -0,0 +1,251 @@
+/*************************************************************************
+ *
+ * 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_UNOSECTION_HXX
+#define SW_UNOSECTION_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/container/XNamed.hpp>
+#include <com/sun/star/text/XTextContent.hpp>
+#include <com/sun/star/text/XTextSection.hpp>
+
+#include <cppuhelper/implbase7.hxx>
+
+#include <unobaseclass.hxx>
+
+
+class SwSectionFmt;
+
+
+/*-----------------09.03.98 13:57-------------------
+
+--------------------------------------------------*/
+
+
+struct SwTextSectionProperties_Impl;
+
+typedef ::cppu::WeakImplHelper7
+<   ::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::container::XNamed
+,   ::com::sun::star::text::XTextSection
+> SwXTextSection_Base;
+
+class SwXTextSection
+    : public SwXTextSection_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    SwXTextSection(SwSectionFmt *const pFmt, const bool bIndexHeader = false);
+
+    virtual ~SwXTextSection();
+
+public:
+
+    SwSectionFmt*   GetFmt() const;
+
+    static ::com::sun::star::uno::Reference<
+            ::com::sun::star::text::XTextSection >
+        CreateXTextSection(SwSectionFmt *const pFmt = 0,
+                const bool bIndexHeader = false);
+
+    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);
+
+    // XNamed
+    virtual ::rtl::OUString SAL_CALL getName()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setName(const ::rtl::OUString& rName)
+        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);
+
+    // XTextSection
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextSection > SAL_CALL
+        getParentSection()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence<
+                ::com::sun::star::uno::Reference<
+                    ::com::sun::star::text::XTextSection >  > SAL_CALL
+        getChildSections()
+        throw (::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOSECTION_HXX
+
diff --git a/sw/inc/unotbl.hxx b/sw/inc/unotbl.hxx
index a8ca07bb0f34..d6daa705b739 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -30,7 +30,9 @@
 #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>
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
@@ -39,17 +41,30 @@
 #include <com/sun/star/table/XCellRange.hpp>
 #include <com/sun/star/sheet/XCellRangeData.hpp>
 #include <com/sun/star/table/XAutoFormattable.hpp>
-#include <cppuhelper/implbase10.hxx> // helper for implementations
-#include <cppuhelper/implbase7.hxx> // helper for implementations
-#include <cppuhelper/implbase5.hxx> // helper for implementations
 
-class SwTableBoxFmt;
+#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 <calbck.hxx>
+#include <TextCursorHelper.hxx>
+#include <unoevtlstnr.hxx>
+#include <unotext.hxx>
+
+
+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--------------------------------
@@ -91,13 +106,15 @@ class SwXCell : public SwXCellBaseClass,
     // table position where pBox was found last
     sal_uInt16              nFndPos;
 
-    using SwXText::IsValid;
-
 protected:
     virtual const SwStartNode *GetStartNode() const;
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor >         createCursor()throw(::com::sun::star::uno::RuntimeException);
 
-    sal_Bool    IsValid();
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >
+        CreateCursor()
+        throw (::com::sun::star::uno::RuntimeException);
+
+    bool IsValid() const;
 
     virtual ~SwXCell();
 
diff --git a/sw/inc/unotext.hxx b/sw/inc/unotext.hxx
new file mode 100644
index 000000000000..3c805da5127c
--- /dev/null
+++ b/sw/inc/unotext.hxx
@@ -0,0 +1,343 @@
+/*************************************************************************
+ *
+ * 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 <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:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual void PrepareForAttach(
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xRange,
+            SwPaM const & rPam);
+    virtual bool CheckForOwnMemberMeta(
+            const SwPaM & rPam, const bool bAbsorb)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+               ::com::sun::star::uno::RuntimeException);
+
+protected:
+
+    bool            IsValid() const;
+    void            Invalidate();
+    void            SetDoc(SwDoc *const pDoc);
+
+    virtual ~SwXText();
+
+public: /*not protected because C++ is retarded*/
+    virtual const SwStartNode *GetStartNode() const;
+
+public:
+
+    SwXText(SwDoc *const pDoc, const enum CursorType eType);
+
+    const SwDoc*    GetDoc() const;
+          SwDoc*    GetDoc();
+
+    virtual ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextCursor >
+        CreateCursor()
+        throw (::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..8fd4e8c2a442
--- /dev/null
+++ b/sw/inc/unotextbodyhf.hxx
@@ -0,0 +1,214 @@
+/*************************************************************************
+ *
+ * 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 <unotext.hxx>
+
+
+class SwDoc;
+class SwFrmFmt;
+class SwXTextCursor;
+
+
+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 *const pDoc);
+
+    SwXTextCursor * CreateTextCursor(const bool bIgnoreTables = 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
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+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();
+
+    SwXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+
+public:
+
+    static ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+        CreateXHeadFootText(SwFrmFmt & rHeadFootFmt, const bool bIsHeader);
+    static bool IsXHeadFootText(SwClient *const pClient);
+
+    // 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/inc/unotextcursor.hxx b/sw/inc/unotextcursor.hxx
new file mode 100644
index 000000000000..e976af91e147
--- /dev/null
+++ b/sw/inc/unotextcursor.hxx
@@ -0,0 +1,351 @@
+/*************************************************************************
+ *
+ * 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_UNOTEXTCURSOR_HXX
+#define SW_UNOTEXTCURSOR_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/XMultiPropertyStates.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/util/XSortable.hpp>
+#include <com/sun/star/document/XDocumentInsertable.hpp>
+#include <com/sun/star/text/XSentenceCursor.hpp>
+#include <com/sun/star/text/XWordCursor.hpp>
+#include <com/sun/star/text/XParagraphCursor.hpp>
+#include <com/sun/star/text/XRedline.hpp>
+
+#include <cppuhelper/implbase12.hxx>
+
+#include <comphelper/uno3.hxx>
+
+#include <unobaseclass.hxx>
+#include <TextCursorHelper.hxx>
+
+
+class SwDoc;
+struct SwPosition;
+class SwUnoCrsr;
+
+
+typedef ::cppu::WeakImplHelper12
+<   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::beans::XPropertyState
+,   ::com::sun::star::beans::XMultiPropertyStates
+,   ::com::sun::star::container::XEnumerationAccess
+,   ::com::sun::star::container::XContentEnumerationAccess
+,   ::com::sun::star::util::XSortable
+,   ::com::sun::star::document::XDocumentInsertable
+,   ::com::sun::star::text::XSentenceCursor
+,   ::com::sun::star::text::XWordCursor
+,   ::com::sun::star::text::XParagraphCursor
+,   ::com::sun::star::text::XRedline
+> SwXTextCursor_Base;
+
+class SwXTextCursor
+    : public SwXTextCursor_Base
+    , public OTextCursorHelper
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXTextCursor();
+
+public:
+
+    SwXTextCursor(
+            SwDoc & rDoc,
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XText > const& xParent,
+            const enum CursorType eType,
+            SwPosition const& rPos,
+            SwPosition const*const pMark = 0);
+    SwXTextCursor(
+            ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XText > const& xParent,
+            SwPaM const& rSourceCursor,
+            const enum CursorType eType = CURSOR_ALL);
+
+          SwUnoCrsr *   GetCursor();
+    const SwUnoCrsr *   GetCursor() const;
+
+    bool IsAtEndOfMeta() const;
+
+    void DeleteAndInsert(::rtl::OUString const& rText,
+                const bool bForceExpandHints);
+
+    // OTextCursorHelper
+    virtual const SwPaM*        GetPaM() const;
+    virtual SwPaM*              GetPaM();
+    virtual const SwDoc*        GetDoc() const;
+    virtual SwDoc*              GetDoc();
+
+    DECLARE_XINTERFACE()
+
+    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);
+
+    // 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);
+
+    // XMultiPropertyStates
+    virtual void SAL_CALL setAllPropertiesToDefault()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL setPropertiesToDefault(
+            const ::com::sun::star::uno::Sequence< ::rtl::OUString >&
+                rPropertyNames)
+        throw (::com::sun::star::beans::UnknownPropertyException,
+                ::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >
+        SAL_CALL getPropertyDefaults(
+            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);
+
+    // 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);
+
+    // XSortable
+    virtual ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue > SAL_CALL
+        createSortDescriptor()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL sort(
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& xDescriptor)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XDocumentInsertable
+    virtual void SAL_CALL insertDocumentFromURL(
+            const ::rtl::OUString& rURL,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& rOptions)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::io::IOException,
+                ::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);
+
+    // XTextCursor
+    virtual void SAL_CALL collapseToStart()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL collapseToEnd()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isCollapsed()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL goLeft(sal_Int16 nCount, sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL goRight(sal_Int16 nCount, sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL gotoStart(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL gotoEnd(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL gotoRange(
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange >& xRange,
+            sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XWordCursor
+    virtual sal_Bool SAL_CALL isStartOfWord()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isEndOfWord()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoNextWord(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoPreviousWord(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoEndOfWord(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoStartOfWord(sal_Bool bExpand)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XSentenceCursor
+    virtual sal_Bool SAL_CALL isStartOfSentence()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isEndOfSentence()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoNextSentence(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoPreviousSentence(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoStartOfSentence(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoEndOfSentence(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XParagraphCursor
+    virtual sal_Bool SAL_CALL isStartOfParagraph()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL isEndOfParagraph()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoStartOfParagraph(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoEndOfParagraph(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoNextParagraph(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL gotoPreviousParagraph(sal_Bool Expand)
+        throw (::com::sun::star::uno::RuntimeException);
+
+    // XRedline
+    virtual void SAL_CALL makeRedline(
+            const ::rtl::OUString& rRedlineType,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& RedlineProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOTEXTCURSOR_HXX
+
diff --git a/sw/inc/unotextrange.hxx b/sw/inc/unotextrange.hxx
new file mode 100644
index 000000000000..164b35b703da
--- /dev/null
+++ b/sw/inc/unotextrange.hxx
@@ -0,0 +1,342 @@
+/*************************************************************************
+ *
+ * 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_UNOTEXTRANGE_HXX
+#define SW_UNOTEXTRANGE_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/container/XIndexAccess.hpp>
+#include <com/sun/star/container/XEnumerationAccess.hpp>
+#include <com/sun/star/container/XContentEnumerationAccess.hpp>
+#include <com/sun/star/text/XTextRange.hpp>
+#include <com/sun/star/text/XRedline.hpp>
+
+#include <cppuhelper/implbase3.hxx>
+#include <cppuhelper/implbase8.hxx>
+
+#include <pam.hxx>
+#include <unobaseclass.hxx>
+
+
+class SwDoc;
+struct SwPosition;
+class SwPaM;
+class SwUnoCrsr;
+class SwFrmFmt;
+
+/* -----------------29.04.98 07:35-------------------
+ *
+ * --------------------------------------------------*/
+class SwUnoInternalPaM
+    : public SwPaM
+{
+
+private:
+    SwUnoInternalPaM(const SwUnoInternalPaM&);
+    SwUnoInternalPaM& operator=(const SwPaM& rPaM);
+
+public:
+    SwUnoInternalPaM(SwDoc& rDoc);
+    virtual ~SwUnoInternalPaM();
+
+};
+
+
+namespace sw {
+
+    void DeepCopyPaM(SwPaM const & rSource, SwPaM & rTarget);
+
+    bool XTextRangeToSwPaM(SwUnoInternalPaM& rToFill,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > & xTextRange);
+
+    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >
+        CreateParentXText(SwDoc & rDoc, const SwPosition& rPos);
+
+    bool GetDefaultTextContentValue(::com::sun::star::uno::Any& rAny,
+        const ::rtl::OUString& rPropertyName, USHORT nWID = 0);
+
+} // namespace sw
+
+
+typedef ::cppu::WeakImplHelper8
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::beans::XPropertySet
+,   ::com::sun::star::beans::XPropertyState
+,   ::com::sun::star::container::XEnumerationAccess
+,   ::com::sun::star::container::XContentEnumerationAccess
+,   ::com::sun::star::text::XTextRange
+,   ::com::sun::star::text::XRedline
+> SwXTextRange_Base;
+
+class SW_DLLPUBLIC SwXTextRange
+    : public SwXTextRange_Base
+{
+
+private:
+
+    friend class SwXText;
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    enum RangePosition
+    {
+        RANGE_IN_TEXT,  // "ordinary" ::com::sun::star::text::TextRange
+        RANGE_IN_CELL,  // position created with a cell that has no uno object
+        RANGE_IS_TABLE, // anchor of a table
+    };
+
+    void    SetPositions(SwPaM const& rPam);
+    //TODO: new exception type for protected content
+    void    DeleteAndInsert(
+                const ::rtl::OUString& rText, const bool bForceExpandHints)
+        throw (::com::sun::star::uno::RuntimeException);
+    void    Invalidate();
+
+    virtual ~SwXTextRange();
+
+public:
+
+    SwXTextRange(SwPaM& rPam,
+            const ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XText > & xParent,
+            const enum RangePosition eRange = RANGE_IN_TEXT);
+    // only for RANGE_IS_TABLE
+    SwXTextRange(SwFrmFmt& rTblFmt);
+
+    const SwDoc* GetDoc() const;
+          SwDoc* GetDoc();
+    bool GetPositions(SwPaM & rToFill) const;
+
+    static ::com::sun::star::uno::Reference<
+                ::com::sun::star::text::XTextRange > CreateXTextRange(
+            SwDoc & rDoc,
+            const SwPosition& rPos, const SwPosition *const pMark);
+
+    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);
+
+    // 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);
+
+    // 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);
+
+    // 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);
+
+    // XRedline
+    virtual void SAL_CALL makeRedline(
+            const ::rtl::OUString& rRedlineType,
+            const ::com::sun::star::uno::Sequence<
+                ::com::sun::star::beans::PropertyValue >& RedlineProperties)
+        throw (::com::sun::star::lang::IllegalArgumentException,
+                ::com::sun::star::uno::RuntimeException);
+
+};
+
+/* -----------------15.05.98 08:29-------------------
+ *
+ * --------------------------------------------------*/
+
+typedef ::cppu::WeakImplHelper3
+<   ::com::sun::star::lang::XUnoTunnel
+,   ::com::sun::star::lang::XServiceInfo
+,   ::com::sun::star::container::XIndexAccess
+> SwXTextRanges_Base;
+
+class SwXTextRanges
+    : public SwXTextRanges_Base
+{
+
+private:
+
+    class Impl;
+    ::sw::UnoImplPtr<Impl> m_pImpl;
+
+    virtual ~SwXTextRanges();
+
+public:
+
+    SwXTextRanges(SwPaM *const pCrsr);
+
+    const SwUnoCrsr* GetCursor() const;
+
+    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);
+
+    // 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);
+
+    // XIndexAccess
+    virtual sal_Int32 SAL_CALL getCount()
+        throw (::com::sun::star::uno::RuntimeException);
+    virtual ::com::sun::star::uno::Any SAL_CALL getByIndex(sal_Int32 nIndex)
+        throw (::com::sun::star::lang::IndexOutOfBoundsException,
+                ::com::sun::star::lang::WrappedTargetException,
+                ::com::sun::star::uno::RuntimeException);
+
+};
+
+#endif // SW_UNOTEXTRANGE_HXX
+
diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index 7bb2af6393d1..19f0c625e02f 100644..100755
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -29,9 +29,11 @@
  ************************************************************************/
 #ifndef _UNOTXDOC_HXX
 #define _UNOTXDOC_HXX
+
 #include "swdllapi.h"
 #include <svl/svarray.hxx>
 #include <sfx2/sfxbasemodel.hxx>
+
 #include <com/sun/star/beans/PropertyValues.hpp>
 #include <com/sun/star/style/XStyleFamiliesSupplier.hpp>
 #include <com/sun/star/style/XAutoStylesSupplier.hpp>
@@ -61,6 +63,7 @@
 #include <com/sun/star/util/XLinkUpdate.hpp>
 #include <com/sun/star/view/XRenderable.hpp>
 #include <com/sun/star/lang/XServiceInfo.hpp>
+#include <com/sun/star/frame/XController.hpp>
 #include <com/sun/star/beans/XPropertySet.hpp>
 #include <com/sun/star/beans/XPropertyState.hpp>
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
@@ -78,6 +81,8 @@
 #include <cppuhelper/implbase4.hxx> // helper for implementations
 #include <RefreshListenerContainer.hxx>
 
+#include <viewopt.hxx>
+
 #define __IFC32 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
 Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31, Ifc32
 
@@ -114,6 +119,8 @@ public Ifc31, public Ifc32
 
 __DEF_IMPLHELPER_EX( 32 )
 
+namespace css = ::com::sun::star;
+
 class SwDoc;
 class SwDocShell;
 class UnoActionContext;
@@ -122,10 +129,17 @@ class SwXDrawPage;
 class SwUnoCrsr;
 class SwXDocumentPropertyHelper;
 class SfxViewFrame;
+class SwPrintUIOptions;
+class SwPrintData;
+class SwRenderData;
+class SwPrtOptions;
+class SwWrtShell;
+
 
 typedef UnoActionContext* UnoActionContextPtr;
 SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
 
+
 /******************************************************************************
  *
  ******************************************************************************/
@@ -133,38 +147,38 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
 
 typedef cppu::WeakImplHelper32
 <
-    ::com::sun::star::text::XTextDocument,
-    ::com::sun::star::text::XLineNumberingProperties,
-    ::com::sun::star::text::XChapterNumberingSupplier,
-    ::com::sun::star::text::XNumberingRulesSupplier,
-    ::com::sun::star::text::XFootnotesSupplier,
-    ::com::sun::star::text::XEndnotesSupplier,
-    ::com::sun::star::util::XReplaceable,
-    ::com::sun::star::text::XPagePrintable,
-    ::com::sun::star::text::XReferenceMarksSupplier,
-    ::com::sun::star::text::XTextTablesSupplier,
-    ::com::sun::star::text::XTextFramesSupplier,
-    ::com::sun::star::text::XBookmarksSupplier,
-    ::com::sun::star::text::XTextSectionsSupplier,
-    ::com::sun::star::text::XTextGraphicObjectsSupplier,
-    ::com::sun::star::text::XTextEmbeddedObjectsSupplier,
-    ::com::sun::star::text::XTextFieldsSupplier,
-    ::com::sun::star::style::XStyleFamiliesSupplier,
-    ::com::sun::star::style::XAutoStylesSupplier,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::drawing::XDrawPageSupplier,
-    ::com::sun::star::text::XDocumentIndexesSupplier,
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::beans::XPropertyState,
-    ::com::sun::star::document::XLinkTargetSupplier,
-    ::com::sun::star::document::XRedlinesSupplier,
-    ::com::sun::star::util::XRefreshable,
-    ::com::sun::star::util::XLinkUpdate,
-    ::com::sun::star::view::XRenderable,
-    ::com::sun::star::xforms::XFormsSupplier,
-    ::com::sun::star::text::XFlatParagraphIteratorProvider,
-    ::com::sun::star::document::XDocumentLanguages,
-    ::com::sun::star::util::XCloneable
+    css::text::XTextDocument,
+    css::text::XLineNumberingProperties,
+    css::text::XChapterNumberingSupplier,
+    css::text::XNumberingRulesSupplier,
+    css::text::XFootnotesSupplier,
+    css::text::XEndnotesSupplier,
+    css::util::XReplaceable,
+    css::text::XPagePrintable,
+    css::text::XReferenceMarksSupplier,
+    css::text::XTextTablesSupplier,
+    css::text::XTextFramesSupplier,
+    css::text::XBookmarksSupplier,
+    css::text::XTextSectionsSupplier,
+    css::text::XTextGraphicObjectsSupplier,
+    css::text::XTextEmbeddedObjectsSupplier,
+    css::text::XTextFieldsSupplier,
+    css::style::XStyleFamiliesSupplier,
+    css::style::XAutoStylesSupplier,
+    css::lang::XServiceInfo,
+    css::drawing::XDrawPageSupplier,
+    css::text::XDocumentIndexesSupplier,
+    css::beans::XPropertySet,
+    css::beans::XPropertyState,
+    css::document::XLinkTargetSupplier,
+    css::document::XRedlinesSupplier,
+    css::util::XRefreshable,
+    css::util::XLinkUpdate,
+    css::view::XRenderable,
+    css::xforms::XFormsSupplier,
+    css::text::XFlatParagraphIteratorProvider,
+    css::document::XDocumentLanguages,
+    css::util::XCloneable
 >
 SwXTextDocumentBaseClass;
 
@@ -181,47 +195,51 @@ class SW_DLLPUBLIC SwXTextDocument : public SwXTextDocumentBaseClass,
     sal_Bool                    bObjectValid;
 
     SwXDrawPage*            pDrawPage;
-    ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage > *          pxXDrawPage;
+    css::uno::Reference< css::drawing::XDrawPage > *            pxXDrawPage;
 
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >               xBodyText;
+    css::uno::Reference< css::text::XText >                 xBodyText;
     SwXBodyText*            pBodyText;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAggregation >             xNumFmtAgg;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXNumberingRules;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXFootnotes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *        pxXFootnoteSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXEndnotes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *        pxXEndnoteSettings;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXReferenceMarks;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > *   pxXTextFieldTypes;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFieldMasters;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextSections;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXBookmarks;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextTables;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXTextFrames;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXGraphicObjects;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXEmbeddedObjects;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxXStyleFamilies;
-    mutable ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyles > *  pxXAutoStyles;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace > *        pxXChapterNumbering;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > *     pxXDocumentIndexes;
-
-    ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > *         pxXLineNumberingProperties;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess > *          pxLinkTargetSupplier;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >*    pxXRedlines;
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer>      xXFormsContainer;
+    css::uno::Reference< css::uno::XAggregation >           xNumFmtAgg;
+
+    css::uno::Reference< css::container::XIndexAccess > *     pxXNumberingRules;
+    css::uno::Reference< css::container::XIndexAccess > *     pxXFootnotes;
+    css::uno::Reference< css::beans::XPropertySet > *        pxXFootnoteSettings;
+    css::uno::Reference< css::container::XIndexAccess > *       pxXEndnotes;
+    css::uno::Reference< css::beans::XPropertySet > *        pxXEndnoteSettings;
+    css::uno::Reference< css::container::XNameAccess > *            pxXReferenceMarks;
+    css::uno::Reference< css::container::XEnumerationAccess > * pxXTextFieldTypes;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextFieldMasters;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextSections;
+    css::uno::Reference< css::container::XNameAccess > *            pxXBookmarks;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextTables;
+    css::uno::Reference< css::container::XNameAccess > *            pxXTextFrames;
+    css::uno::Reference< css::container::XNameAccess > *            pxXGraphicObjects;
+    css::uno::Reference< css::container::XNameAccess > *            pxXEmbeddedObjects;
+    css::uno::Reference< css::container::XNameAccess > *            pxXStyleFamilies;
+    mutable css::uno::Reference< css::style::XAutoStyles > *  pxXAutoStyles;
+    css::uno::Reference< css::container::XIndexReplace > *        pxXChapterNumbering;
+    css::uno::Reference< css::container::XIndexAccess > *       pxXDocumentIndexes;
+
+    css::uno::Reference< css::beans::XPropertySet > *       pxXLineNumberingProperties;
+    css::uno::Reference< css::container::XNameAccess > *            pxLinkTargetSupplier;
+    css::uno::Reference< css::container::XEnumerationAccess >*  pxXRedlines;
+    css::uno::Reference< css::container::XNameContainer>        xXFormsContainer;
 
     //temporary frame to enable PDF export if no valid view is available
-    SfxViewFrame*                                                                       m_pHiddenViewFrame;
-    ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface>                    xPropertyHelper;
-    SwXDocumentPropertyHelper*                                                              pPropertyHelper;
+    SfxViewFrame*                                   m_pHiddenViewFrame;
+    css::uno::Reference< css::uno::XInterface>      xPropertyHelper;
+    SwXDocumentPropertyHelper*                      pPropertyHelper;
+
+    SwPrintUIOptions *                              m_pPrintUIOptions;
+    SwRenderData *                               m_pRenderData;
 
     void                    GetBodyText();
     void                    GetNumberFormatter();
 
     // used for XRenderable implementation
-    SfxViewShell *  GuessViewShell();
-    SwDoc *         GetRenderDoc( SfxViewShell *&rpView, const ::com::sun::star::uno::Any& rSelection );
+    SfxViewShell *  GuessViewShell( /* out */ bool &rbIsSwSrcView, const css::uno::Reference< css::frame::XController > xController = css::uno::Reference< css::frame::XController >() );
+    SwDoc *         GetRenderDoc( SfxViewShell *&rpView, const css::uno::Any& rSelection, bool bIsPDFExport );
+    SfxViewShell *  GetRenderView( bool &rbIsSwSrcView, const css::uno::Sequence< css::beans::PropertyValue >& rxOptions, bool bIsPDFExport );
 
     rtl::OUString           maBuildId;
 
@@ -234,173 +252,173 @@ public:
     SwXTextDocument(SwDocShell* pShell);
 
     inline void notifyRefreshListeners() { aRefreshCont.Refreshed(); }
-    virtual     ::com::sun::star::uno::Any SAL_CALL queryInterface( const ::com::sun::star::uno::Type& aType ) throw(::com::sun::star::uno::RuntimeException);
+    virtual     css::uno::Any SAL_CALL queryInterface( const css::uno::Type& aType ) throw(css::uno::RuntimeException);
     virtual void SAL_CALL acquire(  ) throw();
     virtual void SAL_CALL release(  ) throw();
 
     //XWeak
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XAdapter > SAL_CALL queryAdapter(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::uno::XAdapter > SAL_CALL queryAdapter(  ) throw(css::uno::RuntimeException);
 
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Type > SAL_CALL getTypes(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Sequence< css::uno::Type > SAL_CALL getTypes(  ) throw(css::uno::RuntimeException);
 
-    static const ::com::sun::star::uno::Sequence< sal_Int8 > & getUnoTunnelId();
+    static const css::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 sal_Int64 SAL_CALL getSomething( const css::uno::Sequence< sal_Int8 >& aIdentifier ) throw(css::uno::RuntimeException);
 
     //XTextDocument
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XText >  SAL_CALL getText(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL reformat(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::text::XText >  SAL_CALL getText(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL reformat(void) throw( css::uno::RuntimeException );
 
     //XModel
-    virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aArgs ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::rtl::OUString SAL_CALL getURL(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getArgs(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL connectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL disconnectController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL lockControllers(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL unlockControllers(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController > SAL_CALL getCurrentController(  ) throw(::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL setCurrentController( const ::com::sun::star::uno::Reference< ::com::sun::star::frame::XController >& xController ) throw(::com::sun::star::container::NoSuchElementException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL attachResource( const ::rtl::OUString& aURL, const css::uno::Sequence< css::beans::PropertyValue >& aArgs ) throw(css::uno::RuntimeException);
+    virtual ::rtl::OUString SAL_CALL getURL(  ) throw(css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getArgs(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL connectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL disconnectController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL lockControllers(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL unlockControllers(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasControllersLocked(  ) throw(css::uno::RuntimeException);
+    virtual css::uno::Reference< css::frame::XController > SAL_CALL getCurrentController(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setCurrentController( const css::uno::Reference< css::frame::XController >& xController ) throw(css::container::NoSuchElementException, css::uno::RuntimeException);
+    virtual css::uno::Reference< css::uno::XInterface > SAL_CALL getCurrentSelection(  ) throw(css::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 );
+    virtual void SAL_CALL dispose(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeEventListener(const css::uno::Reference< css::lang::XEventListener > & aListener) throw( css::uno::RuntimeException );
 
     //XCloseable
-    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (::com::sun::star::util::CloseVetoException, ::com::sun::star::uno::RuntimeException);
+    virtual void SAL_CALL close( sal_Bool bDeliverOwnership ) throw (css::util::CloseVetoException, css::uno::RuntimeException);
 
     //XLineNumberingProperties
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet > SAL_CALL getLineNumberingProperties(void) throw( css::uno::RuntimeException );
 
     //XChapterNumberingSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexReplace >  SAL_CALL getChapterNumberingRules(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexReplace >  SAL_CALL getChapterNumberingRules(void) throw( css::uno::RuntimeException );
 
     //XNumberingRulesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess > SAL_CALL getNumberingRules() throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::container::XIndexAccess > SAL_CALL getNumberingRules() throw (css::uno::RuntimeException);
 
     //XFootnotesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getFootnotes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getFootnoteSettings(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getFootnotes(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getFootnoteSettings(void) throw( css::uno::RuntimeException );
 
     //XEndnotesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getEndnotes(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::beans::XPropertySet >  SAL_CALL getEndnoteSettings(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getEndnotes(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::beans::XPropertySet >  SAL_CALL getEndnoteSettings(void) throw( css::uno::RuntimeException );
 
     //XReplaceable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Int32 SAL_CALL replaceAll(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::util::XReplaceDescriptor >  SAL_CALL createReplaceDescriptor(void) throw( css::uno::RuntimeException );
+    virtual sal_Int32 SAL_CALL replaceAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
 
     //XSearchable
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL findAll(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL findFirst(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL findNext(const ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface > & xStartAt, const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::util::XSearchDescriptor >  SAL_CALL createSearchDescriptor(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL findAll(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findFirst(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL findNext(const css::uno::Reference< css::uno::XInterface > & xStartAt, const css::uno::Reference< css::util::XSearchDescriptor > & xDesc) throw( css::uno::RuntimeException );
 
     //XPagePrintable
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL setPagePrintSettings(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& aSettings) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL printPages(const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions) throw( ::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getPagePrintSettings(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL setPagePrintSettings(const css::uno::Sequence< css::beans::PropertyValue >& aSettings) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL printPages(const css::uno::Sequence< css::beans::PropertyValue >& xOptions) throw( css::lang::IllegalArgumentException, css::uno::RuntimeException );
 
     //XReferenceMarksSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getReferenceMarks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getReferenceMarks(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextFieldsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess >  SAL_CALL getTextFields(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextFieldMasters(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextFieldsSupplier
+    virtual css::uno::Reference< css::container::XEnumerationAccess >  SAL_CALL getTextFields(void) throw( css::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFieldMasters(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextEmbeddedObjectsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getEmbeddedObjects(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextEmbeddedObjectsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getEmbeddedObjects(void) throw( css::uno::RuntimeException );
 
-//  // ::com::sun::star::text::XTextShapesSupplier
-//    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  getShapes(void) throw( ::com::sun::star::uno::RuntimeException );
+//  // css::text::XTextShapesSupplier
+//    virtual css::uno::Reference< css::container::XIndexAccess >  getShapes(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XBookmarksSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getBookmarks(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XBookmarksSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getBookmarks(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextSectionsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextSections(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextSectionsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextSections(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextTablesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextTables(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextTablesSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextTables(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextGraphicObjectsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getGraphicObjects(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextGraphicObjectsSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getGraphicObjects(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XTextFramesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getTextFrames(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XTextFramesSupplier
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getTextFrames(void) throw( css::uno::RuntimeException );
 
     //XStyleFamiliesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getStyleFamilies(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getStyleFamilies(void) throw( css::uno::RuntimeException );
 
     //XAutoStylesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::style::XAutoStyles > SAL_CALL getAutoStyles(  ) throw (::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::style::XAutoStyles > SAL_CALL getAutoStyles(  ) throw (css::uno::RuntimeException);
 
     //XMultiServiceFactory
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier)
-                throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier,
-                const ::com::sun::star::uno::Sequence< ::com::sun::star::uno::Any >& Arguments)
-                throw( ::com::sun::star::uno::Exception, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void)
-                throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstance(const rtl::OUString& ServiceSpecifier)
+                throw( css::uno::Exception, css::uno::RuntimeException );
+    virtual css::uno::Reference< css::uno::XInterface >  SAL_CALL createInstanceWithArguments(const rtl::OUString& ServiceSpecifier,
+                const css::uno::Sequence< css::uno::Any >& Arguments)
+                throw( css::uno::Exception, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getAvailableServiceNames(void)
+                throw( css::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 );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::drawing::XDrawPageSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::drawing::XDrawPage >  SAL_CALL getDrawPage(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::drawing::XDrawPageSupplier
+    virtual css::uno::Reference< css::drawing::XDrawPage >  SAL_CALL getDrawPage(void) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::text::XDocumentIndexesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XIndexAccess >  SAL_CALL getDocumentIndexes(void) throw( ::com::sun::star::uno::RuntimeException );
+    // css::text::XDocumentIndexesSupplier
+    virtual css::uno::Reference< css::container::XIndexAccess >  SAL_CALL getDocumentIndexes(void) throw( css::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);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::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);
+    virtual css::beans::PropertyState SAL_CALL getPropertyState( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyState > SAL_CALL getPropertyStates( const css::uno::Sequence< ::rtl::OUString >& rPropertyNames ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyToDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyDefault( const ::rtl::OUString& rPropertyName ) throw (css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XLinkTargetSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks(void) throw( css::uno::RuntimeException );
 
     //XRedlinesSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XEnumerationAccess > SAL_CALL getRedlines(  ) throw(::com::sun::star::uno::RuntimeException);
+    virtual css::uno::Reference< css::container::XEnumerationAccess > SAL_CALL getRedlines(  ) throw(css::uno::RuntimeException);
 
-    // ::com::sun::star::util::XRefreshable
-    virtual void SAL_CALL refresh(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL addRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > & l) throw( ::com::sun::star::uno::RuntimeException );
-    virtual void SAL_CALL removeRefreshListener(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XRefreshListener > & l) throw( ::com::sun::star::uno::RuntimeException );
+    // css::util::XRefreshable
+    virtual void SAL_CALL refresh(void) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL addRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException );
+    virtual void SAL_CALL removeRefreshListener(const css::uno::Reference< css::util::XRefreshListener > & l) throw( css::uno::RuntimeException );
 
-    // ::com::sun::star::util::XLinkUpdate,
-    virtual void SAL_CALL updateLinks(  ) throw(::com::sun::star::uno::RuntimeException);
+    // css::util::XLinkUpdate,
+    virtual void SAL_CALL updateLinks(  ) throw(css::uno::RuntimeException);
 
-    // ::com::sun::star::view::XRenderable
-    virtual sal_Int32 SAL_CALL getRendererCount( const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
-    virtual void SAL_CALL render( sal_Int32 nRenderer, const ::com::sun::star::uno::Any& aSelection, const ::com::sun::star::uno::Sequence< ::com::sun::star::beans::PropertyValue >& xOptions ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    // css::view::XRenderable
+    virtual sal_Int32 SAL_CALL getRendererCount( const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    virtual css::uno::Sequence< css::beans::PropertyValue > SAL_CALL getRenderer( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
+    virtual void SAL_CALL render( sal_Int32 nRenderer, const css::uno::Any& aSelection, const css::uno::Sequence< css::beans::PropertyValue >& xOptions ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    // ::com::sun::star::xforms::XFormsSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameContainer > SAL_CALL getXForms(  ) throw (::com::sun::star::uno::RuntimeException);
+    // css::xforms::XFormsSupplier
+    virtual css::uno::Reference< css::container::XNameContainer > SAL_CALL getXForms(  ) throw (css::uno::RuntimeException);
 
-    // ::com::sun::star::document::XDocumentLanguages
-    virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
+    // css::document::XDocumentLanguages
+    virtual css::uno::Sequence< css::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (css::lang::IllegalArgumentException, css::uno::RuntimeException);
 
-    // ::com::sun::star::text::XFlatParagraphIteratorProvider:
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
+    // css::text::XFlatParagraphIteratorProvider:
+    virtual css::uno::Reference< css::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (css::uno::RuntimeException);
 
     // ::com::sun::star::util::XCloneable
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::util::XCloneable > SAL_CALL createClone(  ) throw (::com::sun::star::uno::RuntimeException);
@@ -414,15 +432,16 @@ public:
 
     void                        InitNewDoc();
 
-    SwUnoCrsr*                  CreateCursorForSearch(::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr);
-    SwUnoCrsr*                  FindAny(const ::com::sun::star::uno::Reference< ::com::sun::star::util::XSearchDescriptor > & xDesc,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextCursor > & xCrsr, sal_Bool bAll,
+    SwUnoCrsr*                  CreateCursorForSearch(css::uno::Reference< css::text::XTextCursor > & xCrsr);
+    SwUnoCrsr*                  FindAny(const css::uno::Reference< css::util::XSearchDescriptor > & xDesc,
+                                            css::uno::Reference< css::text::XTextCursor > & xCrsr, sal_Bool bAll,
                                             sal_Int32& nResult,
-                                            ::com::sun::star::uno::Reference< ::com::sun::star::uno::XInterface >  xLastResult);
+                                            css::uno::Reference< css::uno::XInterface >  xLastResult);
 
     SwXDrawPage*                GetDrawPage();
     SwDocShell*                 GetDocShell() {return pDocShell;}
 
+
     void * SAL_CALL operator new( size_t ) throw();
     void SAL_CALL operator delete( void * ) throw();
 
@@ -432,8 +451,8 @@ public:
  --------------------------------------------------*/
 class SwXLinkTargetSupplier : public cppu::WeakImplHelper2
 <
-    ::com::sun::star::container::XNameAccess,
-    ::com::sun::star::lang::XServiceInfo
+    css::container::XNameAccess,
+    css::lang::XServiceInfo
 >
 {
     SwXTextDocument* pxDoc;
@@ -450,18 +469,18 @@ public:
     ~SwXLinkTargetSupplier();
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::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);
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::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 );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
     //
     void    Invalidate() {pxDoc = 0;}
@@ -471,52 +490,52 @@ public:
  --------------------------------------------------*/
 class SwXLinkNameAccessWrapper : public cppu::WeakImplHelper4
 <
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::container::XNameAccess,
-    ::com::sun::star::lang::XServiceInfo,
-    ::com::sun::star::document::XLinkTargetSupplier
+    css::beans::XPropertySet,
+    css::container::XNameAccess,
+    css::lang::XServiceInfo,
+    css::document::XLinkTargetSupplier
 >
 {
-    ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >    xRealAccess;
+    css::uno::Reference< css::container::XNameAccess >    xRealAccess;
     const SfxItemPropertySet*                                                       pPropSet;
     const String                                                                    sLinkSuffix;
     const String                                                                    sLinkDisplayName;
-    ::com::sun::star::uno::Reference< ::com::sun::star::text::XTextDocument >       xDoc;
+    css::uno::Reference< css::text::XTextDocument >         xDoc;
     SwXTextDocument*                                                                pxDoc;
 
 
 public:
-    SwXLinkNameAccessWrapper(::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  xAccess,
+    SwXLinkNameAccessWrapper(css::uno::Reference< css::container::XNameAccess >  xAccess,
             const String& rLinkDisplayName, String sSuffix);
     SwXLinkNameAccessWrapper(SwXTextDocument& rxDoc,
             const String& rLinkDisplayName, String sSuffix);
     ~SwXLinkNameAccessWrapper();
 
     //XNameAccess
-    virtual ::com::sun::star::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( ::com::sun::star::container::NoSuchElementException, ::com::sun::star::lang::WrappedTargetException, ::com::sun::star::uno::RuntimeException );
-    virtual ::com::sun::star::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( ::com::sun::star::uno::RuntimeException );
-    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Any SAL_CALL getByName(const rtl::OUString& Name)  throw( css::container::NoSuchElementException, css::lang::WrappedTargetException, css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getElementNames(void) throw( css::uno::RuntimeException );
+    virtual sal_Bool SAL_CALL hasByName(const rtl::OUString& Name) throw( css::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);
+    virtual css::uno::Type SAL_CALL getElementType(  ) throw(css::uno::RuntimeException);
+    virtual sal_Bool SAL_CALL hasElements(  ) throw(css::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);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
 
     //XLinkTargetSupplier
-    virtual ::com::sun::star::uno::Reference< ::com::sun::star::container::XNameAccess >  SAL_CALL getLinks(void) throw( ::com::sun::star::uno::RuntimeException );
+    virtual css::uno::Reference< css::container::XNameAccess >  SAL_CALL getLinks(void) throw( css::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 );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 
 };
 /* -----------------26.10.99 15:46-------------------
@@ -524,8 +543,8 @@ public:
  --------------------------------------------------*/
 class SwXOutlineTarget : public cppu::WeakImplHelper2
 <
-    ::com::sun::star::beans::XPropertySet,
-    ::com::sun::star::lang::XServiceInfo
+    css::beans::XPropertySet,
+    css::lang::XServiceInfo
 >
 {
     const SfxItemPropertySet*   pPropSet;
@@ -536,37 +555,61 @@ public:
     ~SwXOutlineTarget();
 
     //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);
+    virtual css::uno::Reference< css::beans::XPropertySetInfo > SAL_CALL getPropertySetInfo(  ) throw(css::uno::RuntimeException);
+    virtual void SAL_CALL setPropertyValue( const ::rtl::OUString& aPropertyName, const css::uno::Any& aValue ) throw(css::beans::UnknownPropertyException, css::beans::PropertyVetoException, css::lang::IllegalArgumentException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual css::uno::Any SAL_CALL getPropertyValue( const ::rtl::OUString& PropertyName ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addPropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& xListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removePropertyChangeListener( const ::rtl::OUString& aPropertyName, const css::uno::Reference< css::beans::XPropertyChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL addVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::uno::RuntimeException);
+    virtual void SAL_CALL removeVetoableChangeListener( const ::rtl::OUString& PropertyName, const css::uno::Reference< css::beans::XVetoableChangeListener >& aListener ) throw(css::beans::UnknownPropertyException, css::lang::WrappedTargetException, css::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 );
+    virtual rtl::OUString SAL_CALL getImplementationName(void) throw( css::uno::RuntimeException );
+    virtual BOOL SAL_CALL supportsService(const rtl::OUString& ServiceName) throw( css::uno::RuntimeException );
+    virtual css::uno::Sequence< rtl::OUString > SAL_CALL getSupportedServiceNames(void) throw( css::uno::RuntimeException );
 };
 #endif
 
 class SwXDocumentPropertyHelper : public SvxUnoForbiddenCharsTable
 {
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xDashTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xGradientTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xHatchTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xBitmapTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xTransGradientTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xMarkerTable;
-    com::sun::star::uno::Reference < com::sun::star::uno::XInterface > xDrawDefaults;
+    css::uno::Reference < css::uno::XInterface > xDashTable;
+    css::uno::Reference < css::uno::XInterface > xGradientTable;
+    css::uno::Reference < css::uno::XInterface > xHatchTable;
+    css::uno::Reference < css::uno::XInterface > xBitmapTable;
+    css::uno::Reference < css::uno::XInterface > xTransGradientTable;
+    css::uno::Reference < css::uno::XInterface > xMarkerTable;
+    css::uno::Reference < css::uno::XInterface > xDrawDefaults;
 
     SwDoc*  m_pDoc;
 public:
     SwXDocumentPropertyHelper(SwDoc& rDoc);
     ~SwXDocumentPropertyHelper();
-    com::sun::star::uno::Reference<com::sun::star::uno::XInterface> GetDrawTable(short nWhich);
+    css::uno::Reference<css::uno::XInterface> GetDrawTable(short nWhich);
     void Invalidate();
 
     virtual void onChange();
 };
+
+
+/*-- 06.01.2004 15:08:34---------------------------------------------------
+    The class SwViewOptionAdjust_Impl is used to adjust the SwViewOption of
+    the current ViewShell so that fields are not printed as commands and
+    hidden characters are always invisible. Hidden text and place holders
+    should be printed according to the current print options.
+    After printing the view options are restored
+  -----------------------------------------------------------------------*/
+class SwViewOptionAdjust_Impl
+{
+    SwWrtShell &    m_rShell;
+    SwViewOption    m_aOldViewOptions;
+//    SwViewOption    m_aRenderViewOptions;   // view options to use when rendering for PDF export or printing
+//    bool            m_bRestoreViewOptions;
+
+public:
+    SwViewOptionAdjust_Impl( SwWrtShell& rSh, const SwViewOption &rViewOptions );
+    ~SwViewOptionAdjust_Impl();
+
+    void AdjustViewOptions( const SwPrtOptions *pPrtOptions );
+};
+
+
diff --git a/sw/inc/viewopt.hxx b/sw/inc/viewopt.hxx
index 8f3386682276..5cf26c263d98 100644..100755
--- a/sw/inc/viewopt.hxx
+++ b/sw/inc/viewopt.hxx
@@ -82,8 +82,7 @@ namespace svtools{ class ColorConfig;}
 #define VIEWOPT_CORE2_SMOOTHSCROLL      0x00000004L
 #define VIEWOPT_CORE2_CRSR_IN_PROT      0x00000008L
 #define VIEWOPT_CORE2_PDF_EXPORT        0x00000010L
-
-
+#define VIEWOPT_CORE2_PRINTING          0x00000020L
 #define VIEWOPT_CORE2_BIGMARKHDL        0x00000040L
 
 #define VIEWOPT_2_UNUSED1           0x00000100L
@@ -387,6 +386,12 @@ public:
     inline void SetPDFExport(BOOL b)
         { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PDF_EXPORT) : (nCore2Options &= ~VIEWOPT_CORE2_PDF_EXPORT);}
 
+    inline BOOL IsPrinting() const
+        {return nCore2Options & VIEWOPT_CORE2_PRINTING ? TRUE : FALSE;}
+
+    inline void SetPrinting(BOOL b)
+        { (b != 0) ? (nCore2Options |= VIEWOPT_CORE2_PRINTING) : (nCore2Options &= ~VIEWOPT_CORE2_PRINTING);}
+
 /*---------------------------------------------------------------------------
 
 ----------------------------------------------------------------------------*/
@@ -456,7 +461,8 @@ public:
     SwViewOption& operator=( const SwViewOption &rOpt );
     // Vergleichsmethoden
     BOOL IsEqualFlags ( const SwViewOption &rOpt ) const;
-    inline BOOL operator==( const SwViewOption &rOpt ) const;
+    inline BOOL operator == ( const SwViewOption &rOpt ) const;
+    inline BOOL operator != ( const SwViewOption &rOpt ) const  { return !(*this == rOpt); }
 
 
 /*---------------------------------------------------------------------------
diff --git a/sw/inc/viewsh.hxx b/sw/inc/viewsh.hxx
index f12b3ecbe9bc..8de10dfce94d 100644..100755
--- a/sw/inc/viewsh.hxx
+++ b/sw/inc/viewsh.hxx
@@ -39,6 +39,7 @@
 #include <swrect.hxx>
 #include <errhdl.hxx>
 #include <vcl/mapmod.hxx>
+#include <vcl/print.hxx>
 
 namespace com { namespace sun { namespace star { namespace accessibility {
            class XAccessible; } } } }
@@ -70,6 +71,7 @@ class SfxViewShell;
 class SwViewOption;
 class SwViewImp;
 class SwPrtOptions;
+class SwPrintData;
 class SwPagePreViewPrtData;
 class Window;
 class OutputDevice;
@@ -92,12 +94,19 @@ class SwPostItMgr;
 // #i74769#
 class SdrPaintWindow;
 
+namespace vcl
+{
+    class OldStylePrintAdaptor;
+}
+
+
 //JP 19.07.98: - Bug 52312
 // define fuer Flags, die im CTOR oder den darunter liegenden Schichten
 // benoetigt werden.
 // Zur Zeit wird fuer die DrawPage das PreView Flag benoetigt
 #define VSHELLFLAG_ISPREVIEW            ((long)0x1)
 
+
 class SW_DLLPUBLIC ViewShell : public Ring
 {
     friend void SetOutDev( ViewShell *pSh, OutputDevice *pOut );
@@ -186,7 +195,7 @@ class SW_DLLPUBLIC ViewShell : public Ring
     SW_DLLPRIVATE void Scroll();    //Scrollen wenn sich aus der LayAction Scrollmoeglichkeiten
                     //ergaben.
 
-    SW_DLLPRIVATE void PrepareForPrint( const SwPrtOptions &rOptions );
+    SW_DLLPRIVATE void PrepareForPrint( const SwPrintData &rOptions );
 
     SW_DLLPRIVATE void ImplApplyViewOptions( const SwViewOption &rOpt );
 
@@ -209,8 +218,7 @@ public:
     const SwNodes& GetNodes() const;
 
     //Nach Druckerwechsel, vom Doc
-    //pPDFOut != NULL is used for PDF export.
-    void            InitPrt( SfxPrinter * , OutputDevice *pPDFOut = NULL );
+    void            InitPrt( OutputDevice *pOutDev );
 
     //Klammerung von zusammengehoerenden Aktionen.
     inline void StartAction();
@@ -361,22 +369,25 @@ public:
     void   ChgAllPageOrientation( sal_uInt16 eOri );
     void   ChgAllPageSize( Size &rSz );
 
-    //Druckauftrag abwickeln.
-    // pPDFOut != Null is: do PDF Export (no printing!)
-    sal_Bool Prt( SwPrtOptions& rOptions, SfxProgress* pProgress,
-                  OutputDevice* pPDFOut = NULL );
+    // printing of one page.
+    // bIsPDFExport == true is: do PDF Export (no printing!)
+    sal_Bool PrintOrPDFExport( OutputDevice *pOutDev, const SwPrtOptions &rPrintData,
+            sal_Int32 nRenderer /* offset in vector of pages to print */ );
+
+    // printing of one brochure page
+    void PrintProspect( OutputDevice *pOutDev, const SwPrintData &rPrintData,
+            sal_Int32 nRenderer /* offset in vector of page pairs for prospect printing */ );
 
-    //"Drucken" fuer OLE 2.0
-    static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, SwPrtOptions& rOptions,
+    // printing for OLE 2.0
+    static void PrtOle2( SwDoc *pDoc, const SwViewOption *pOpt, const SwPrintData& rOptions,
                          OutputDevice* pOleOut, const Rectangle& rRect );
 
     // creates temporary doc with selected text for PDF export
-    SwDoc * CreatePrtDoc( SfxPrinter* pPrt, SfxObjectShellRef& );
+    SwDoc * CreatePrtDoc( SfxObjectShellRef& );
     SwDoc * FillPrtDoc( SwDoc* pPrtDoc, const SfxPrinter* pPrt );
 
     //Wird intern fuer die Shell gerufen die Druckt. Formatiert die Seiten.
-    void CalcPagesForPrint( sal_uInt16 nMax, SfxProgress* pProgress = 0,
-        const String* pStr = NULL, ULONG nMergeAct = 0, ULONG nMergeCnt = 0 );
+    void CalcPagesForPrint( sal_uInt16 nMax );
 
     //All about fields.
     void UpdateFlds(sal_Bool bCloseDB = sal_False);
@@ -475,14 +486,6 @@ public:
     */
     void AdjustOptionsForPagePreview( const SwPrtOptions &_rPrintOptions );
 
-    // print page/print preview
-    void PrintPreViewPage( SwPrtOptions& rOptions, sal_uInt16 nRowCol,
-                           SfxProgress& rProgress,
-                           const SwPagePreViewPrtData* = 0 );
-
-    // Prospekt-Format drucken
-    void PrintProspect( SwPrtOptions&, SfxProgress& , BOOL bRTL);
-
     sal_Bool IsViewLocked() const { return bViewLocked; }
     void LockView( sal_Bool b )   { bViewLocked = b;    }