swunolocking1: #i105557#: unoobj.hxx: move misc stuff:

 move GetPageDescByName_Impl from unoobj.hxx to pagedesc.hxx.
 move UnoActionContext, UnoActionRemoveContext, ClientModify,
  CreateUnoTunnelId from unoobj.hxx to unobaseclass.hxx.
 move UnoActionContext, UnoActionRemoveContext from unoobj.cxx to unoobj2.cxx.

54 files changed, 170 insertions, 225 deletions

diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index dd80b7f94f..3c734f4d5a 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/unobaseclass.hxx b/sw/inc/unobaseclass.hxx
index 48c00de279..43418f9585 100644
--- a/sw/inc/unobaseclass.hxx
+++ b/sw/inc/unobaseclass.hxx
@@ -30,18 +30,22 @@
 #ifndef _UNOBASECLASS_HXX
 #define _UNOBASECLASS_HXX
 
-#include <calbck.hxx>
 #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-------------------
@@ -64,5 +68,39 @@ enum CursorType
     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);
+
 #endif
 
diff --git a/sw/inc/unoobj.hxx b/sw/inc/unoobj.hxx
index 8806bf13eb..98cf280617 100644
--- a/sw/inc/unoobj.hxx
+++ b/sw/inc/unoobj.hxx
@@ -59,38 +59,12 @@ class GetCurTxtFmtColl;
  *
  * --------------------------------------------------*/
 
-SwPageDesc*	GetPageDescByName_Impl(SwDoc& rDoc, const String& rName);
-::com::sun::star::uno::Sequence< sal_Int8 > CreateUnoTunnelId();
 
 
-/*-----------------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();
-};
-
 /******************************************************************************
  *
  ******************************************************************************/
 
-void ClientModify(SwClient* pClient, SfxPoolItem *pOld, SfxPoolItem *pNew);
 
 
 /*-----------------20.03.98 07:47-------------------
diff --git a/sw/inc/unoparagraph.hxx b/sw/inc/unoparagraph.hxx
index 6ef62e00c1..984786b0d1 100644
--- a/sw/inc/unoparagraph.hxx
+++ b/sw/inc/unoparagraph.hxx
@@ -359,7 +359,7 @@ public:
 
 --------------------------------------------------*/
 class SwXParagraphEnumeration
-    : public SwSimpleEnumerationBaseClass
+    : public SwSimpleEnumeration_Base
     , public SwClient
 {
 
diff --git a/sw/inc/unoredlines.hxx b/sw/inc/unoredlines.hxx
index 8f932617f4..f87ac44188 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/unotbl.hxx b/sw/inc/unotbl.hxx
index 53fa8fb8c5..bc66e61c26 100644
--- a/sw/inc/unotbl.hxx
+++ b/sw/inc/unotbl.hxx
@@ -51,6 +51,7 @@
 #include <comphelper/uno3.hxx>
 #include <tools/string.hxx>
 
+#include <calbck.hxx>
 #include <TextCursorHelper.hxx>
 #include <unoevtlstnr.hxx>
 #include <unotext.hxx>
diff --git a/sw/source/core/unocore/TextCursorHelper.cxx b/sw/source/core/unocore/TextCursorHelper.cxx
index b21587a155..6e8fb9efe4 100644
--- a/sw/source/core/unocore/TextCursorHelper.cxx
+++ b/sw/source/core/unocore/TextCursorHelper.cxx
@@ -30,8 +30,10 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include "TextCursorHelper.hxx"
-#include "unoobj.hxx"
+#include "unobaseclass.hxx"
+
 
 using namespace ::com::sun::star;
 /* -----------------------------03.03.03 11:07--------------------------------
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx
index bf52d0c0db..a22eb8a2b1 100644
--- a/sw/source/core/unocore/unobkm.cxx
+++ b/sw/source/core/unocore/unobkm.cxx
@@ -35,7 +35,6 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <TextCursorHelper.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unoparagraph.hxx>
 #include <unomap.hxx>
diff --git a/sw/source/core/unocore/unochart.cxx b/sw/source/core/unocore/unochart.cxx
index 2c1cb1ceb5..ef7817ebb5 100644
--- a/sw/source/core/unocore/unochart.cxx
+++ b/sw/source/core/unocore/unochart.cxx
@@ -34,7 +34,6 @@
 #include <memory>
 #include <algorithm>
 
-
 #include <com/sun/star/chart/ChartDataRowSource.hpp>
 #include <com/sun/star/chart2/data/LabelOrigin.hpp>
 #include <cppuhelper/interfacecontainer.hxx>
@@ -51,7 +50,7 @@
 #include <swtable.hxx>
 #include <unoprnms.hxx>
 #include <unomap.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unocrsr.hxx>
 #include <unotbl.hxx>
 #include <doc.hxx>
diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx
index cc9b47bbb7..60b6897e88 100644
--- a/sw/source/core/unocore/unocoll.cxx
+++ b/sw/source/core/unocore/unocoll.cxx
@@ -874,7 +874,8 @@ namespace
     }
 
     template<FlyCntType T>
-    class SwXFrameEnumeration : public SwSimpleEnumerationBaseClass
+    class SwXFrameEnumeration
+        : public SwSimpleEnumeration_Base
     {
         private:
             typedef ::std::slist< Any > frmcontainer_t;
diff --git a/sw/source/core/unocore/unocrsrhelper.cxx b/sw/source/core/unocore/unocrsrhelper.cxx
index b55017b76e..676c1839ad 100644
--- a/sw/source/core/unocore/unocrsrhelper.cxx
+++ b/sw/source/core/unocore/unocrsrhelper.cxx
@@ -36,7 +36,6 @@
 
 #include <cmdid.h>
 #include <unocrsrhelper.hxx>
-#include <unoobj.hxx>
 #include <unofootnote.hxx>
 #include <unotextcursor.hxx>
 #include <unorefmark.hxx>
diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx
index d7163f7f00..67c7249571 100644
--- a/sw/source/core/unocore/unodraw.cxx
+++ b/sw/source/core/unocore/unodraw.cxx
@@ -37,7 +37,6 @@
 #include <unomid.h>
 #include <unodraw.hxx>
 #include <unocoll.hxx>
-#include <unoobj.hxx>
 #include <unoframe.hxx>
 #include <unoparagraph.hxx>
 #include <unotextrange.hxx>
@@ -443,7 +442,8 @@ uno::Reference< drawing::XShape >  SwFmDrawPage::_CreateShape( SdrObject *pObj )
 ****************************************************************************/
 namespace
 {
-    class SwXShapesEnumeration : public SwSimpleEnumerationBaseClass
+    class SwXShapesEnumeration
+        : public SwSimpleEnumeration_Base
     {
         private:
             typedef ::std::slist< ::com::sun::star::uno::Any > shapescontainer_t;
diff --git a/sw/source/core/unocore/unofield.cxx b/sw/source/core/unocore/unofield.cxx
index cde0e276dd..31f4659c22 100644
--- a/sw/source/core/unocore/unofield.cxx
+++ b/sw/source/core/unocore/unofield.cxx
@@ -41,7 +41,6 @@
 #include <ndtxt.hxx>
 #include <unomap.hxx>
 #include <unoprnms.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unocoll.hxx>
diff --git a/sw/source/core/unocore/unoflatpara.cxx b/sw/source/core/unocore/unoflatpara.cxx
index de481a867a..c5055394cd 100644
--- a/sw/source/core/unocore/unoflatpara.cxx
+++ b/sw/source/core/unocore/unoflatpara.cxx
@@ -46,7 +46,7 @@
 #include <viewimp.hxx>
 #include <breakit.hxx>
 #include <pam.hxx>
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
 #include <unotextrange.hxx>
 #include <pagefrm.hxx>
 #include <cntfrm.hxx>
diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx
index da2fe60bdb..f4d7ea34be 100644
--- a/sw/source/core/unocore/unoframe.cxx
+++ b/sw/source/core/unocore/unoframe.cxx
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <com/sun/star/embed/NoVisualAreaSizeException.hpp>
 #include <com/sun/star/container/XChild.hpp>
 #include <com/sun/star/embed/XClassifiedObject.hpp>
@@ -60,7 +61,6 @@
 #include <ndole.hxx>
 #include <frmfmt.hxx>
 #include <frame.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
@@ -100,6 +100,7 @@
 #include <unoframe.hxx>
 #include <fmtanchr.hxx>
 #include <fmtclds.hxx>
+#include <fmtcntnt.hxx>
 #include <frmatr.hxx>
 #include <ndtxt.hxx>
 #include <ndgrf.hxx>
diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx
index f6fc715203..7c0f8adbe3 100644
--- a/sw/source/core/unocore/unoftn.cxx
+++ b/sw/source/core/unocore/unoftn.cxx
@@ -34,7 +34,8 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
-#include <unoobj.hxx>
+
+#include <unomid.h>
 #include <unofootnote.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx
index 085848fcfb..904e7dfcdb 100644
--- a/sw/source/core/unocore/unoidx.cxx
+++ b/sw/source/core/unocore/unoidx.cxx
@@ -55,8 +55,8 @@
 #include <poolfmt.hrc>
 #endif
 #include <pagedesc.hxx>
+#include <fmtcntnt.hxx>
 #include <unomap.hxx>
-#include <unoobj.hxx>
 #include <unoparagraph.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
diff --git a/sw/source/core/unocore/unoobj.cxx b/sw/source/core/unocore/unoobj.cxx
index 55586df381..8b0f76bfbe 100644
--- a/sw/source/core/unocore/unoobj.cxx
+++ b/sw/source/core/unocore/unoobj.cxx
@@ -82,7 +82,6 @@
 #include <fmtrfmrk.hxx>
 #include <txtrfmrk.hxx>
 #include <unoclbck.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unomap.hxx>
@@ -187,50 +186,6 @@ SwUnoInternalPaM&	SwUnoInternalPaM::operator=(const SwPaM& rPaM)
     }
     return *this;
 }
-/****************************************************************************
-    ActionContext
-****************************************************************************/
-UnoActionContext::UnoActionContext(SwDoc* pDc) :
-    pDoc(pDc)
-{
-    SwRootFrm* pRootFrm = pDoc->GetRootFrm();
-    if(pRootFrm)
-        pRootFrm->StartAllAction();
-}
-/*-----------------04.03.98 11:56-------------------
-
---------------------------------------------------*/
-UnoActionContext::~UnoActionContext()
-{
-    //das Doc kann hier schon entfernt worden sein
-    if(pDoc)
-    {
-        SwRootFrm* pRootFrm = pDoc->GetRootFrm();
-        if(pRootFrm)
-            pRootFrm->EndAllAction();
-    }
-}
-
-/****************************************************************************
-    ActionRemoveContext
-****************************************************************************/
-UnoActionRemoveContext::UnoActionRemoveContext(SwDoc* pDc) :
-    pDoc(pDc)
-{
-    SwRootFrm* pRootFrm = pDoc->GetRootFrm();
-    if(pRootFrm)
-        pRootFrm->UnoRemoveAllActions();
-}
-/* -----------------07.07.98 12:05-------------------
- *
- * --------------------------------------------------*/
-UnoActionRemoveContext::~UnoActionRemoveContext()
-{
-    SwRootFrm* pRootFrm = pDoc->GetRootFrm();
-    if(pRootFrm)
-        pRootFrm->UnoRestoreAllActions();
-
-}
 
 /*-----------------09.03.98 08:29-------------------
 
diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx
index 92a9fff1f0..903e97f9bc 100644
--- a/sw/source/core/unocore/unoobj2.cxx
+++ b/sw/source/core/unocore/unoobj2.cxx
@@ -76,7 +76,6 @@
 #include <fmtrfmrk.hxx>
 #include <txtrfmrk.hxx>
 #include <unoclbck.hxx>
-#include <unoobj.hxx>
 #include <unoparaframeenum.hxx>
 #include <unofootnote.hxx>
 #include <unotextbodyhf.hxx>
@@ -100,6 +99,7 @@
 #include <flypos.hxx>
 #include <txtftn.hxx>
 #include <fmtftn.hxx>
+#include <fmtcntnt.hxx>
 #include <com/sun/star/text/WrapTextMode.hpp>
 #include <com/sun/star/text/TextContentAnchorType.hpp>
 #include <com/sun/star/style/PageStyleLayout.hpp>
@@ -227,6 +227,60 @@ void CollectFrameAtNode( SwClient& rClnt, const SwNodeIndex& rIdx,
     }
 }
 
+/****************************************************************************
+    ActionContext
+****************************************************************************/
+UnoActionContext::UnoActionContext(SwDoc *const pDoc)
+    : m_pDoc(pDoc)
+{
+    SwRootFrm *const pRootFrm = m_pDoc->GetRootFrm();
+    if (pRootFrm)
+    {
+        pRootFrm->StartAllAction();
+    }
+}
+
+/*-----------------04.03.98 11:56-------------------
+
+--------------------------------------------------*/
+UnoActionContext::~UnoActionContext()
+{
+    // Doc may already have been removed here
+    if (m_pDoc)
+    {
+        SwRootFrm *const pRootFrm = m_pDoc->GetRootFrm();
+        if (pRootFrm)
+        {
+            pRootFrm->EndAllAction();
+        }
+    }
+}
+
+/****************************************************************************
+    ActionRemoveContext
+****************************************************************************/
+UnoActionRemoveContext::UnoActionRemoveContext(SwDoc *const pDoc)
+    : m_pDoc(pDoc)
+{
+    SwRootFrm *const pRootFrm = m_pDoc->GetRootFrm();
+    if (pRootFrm)
+    {
+        pRootFrm->UnoRemoveAllActions();
+    }
+}
+
+/* -----------------07.07.98 12:05-------------------
+ *
+ * --------------------------------------------------*/
+UnoActionRemoveContext::~UnoActionRemoveContext()
+{
+    SwRootFrm *const pRootFrm = m_pDoc->GetRootFrm();
+    if (pRootFrm)
+    {
+        pRootFrm->UnoRestoreAllActions();
+    }
+}
+
 
 /*-- 09.12.98 14:18:58---------------------------------------------------
 
@@ -752,6 +806,7 @@ SwDoc* SwXTextCursor::GetDoc()
     return	 GetCrsr() ? GetCrsr()->GetDoc() : 0;
 }
 
+
 /*-- 09.12.98 14:19:03---------------------------------------------------
 
   -----------------------------------------------------------------------*/
diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx
index 57f9679a24..c83920d101 100644
--- a/sw/source/core/unocore/unoparagraph.cxx
+++ b/sw/source/core/unocore/unoparagraph.cxx
@@ -33,7 +33,6 @@
 
 #include <cmdid.h>
 #include <unomid.h>
-#include <unoobj.hxx>
 #include <unoparaframeenum.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
diff --git a/sw/source/core/unocore/unoport.cxx b/sw/source/core/unocore/unoport.cxx
index 54db4b2e7b..8ddb5a7f20 100644
--- a/sw/source/core/unocore/unoport.cxx
+++ b/sw/source/core/unocore/unoport.cxx
@@ -36,9 +36,9 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <svtools/itemprop.hxx>
+
 #include <unocrsrhelper.hxx>
 #include <unoport.hxx>
-#include <unoobj.hxx>
 #include <unoparaframeenum.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
@@ -51,6 +51,7 @@
 #include <doc.hxx>
 #include <fmtflcnt.hxx>
 #include <fmtfld.hxx>
+#include <frmfmt.hxx>
 
 #include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/beans/SetPropertyTolerantFailed.hpp>
diff --git a/sw/source/core/unocore/unoportenum.cxx b/sw/source/core/unocore/unoportenum.cxx
index 094671f97b..07f27201f6 100644
--- a/sw/source/core/unocore/unoportenum.cxx
+++ b/sw/source/core/unocore/unoportenum.cxx
@@ -46,7 +46,7 @@
 #include <docary.hxx>
 #include <tox.hxx>
 #include <unoclbck.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unoparaframeenum.hxx>
 #include <unotextcursor.hxx>
 #include <unorefmark.hxx>
@@ -56,6 +56,7 @@
 #include <unometa.hxx>
 #include <fmtanchr.hxx>
 #include <fmtrfmrk.hxx>
+#include <frmfmt.hxx>
 #include <unoidx.hxx>
 #include <redline.hxx>
 #include <crsskip.hxx>
diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx
index ceeb6ac051..bbd81aa140 100644
--- a/sw/source/core/unocore/unoredline.cxx
+++ b/sw/source/core/unocore/unoredline.cxx
@@ -31,15 +31,19 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#include <com/sun/star/util/DateTime.hpp>
+#include <com/sun/star/text/XTextTable.hpp>
 
+#include <rtl/ustrbuf.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+
 #include <pagedesc.hxx>
 #include "poolfmt.hxx"
 #include <redline.hxx>
 #include <section.hxx>
 #include <unoprnms.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
@@ -49,9 +53,6 @@
 #include <unoredline.hxx>
 #include <doc.hxx>
 #include <docary.hxx>
-#include <rtl/ustrbuf.hxx>
-#include <com/sun/star/util/DateTime.hpp>
-#include <com/sun/star/text/XTextTable.hpp>
 
 
 using namespace ::com::sun::star;
diff --git a/sw/source/core/unocore/unoredlines.cxx b/sw/source/core/unocore/unoredlines.cxx
index 44f554d581..05c70eb723 100644
--- a/sw/source/core/unocore/unoredlines.cxx
+++ b/sw/source/core/unocore/unoredlines.cxx
@@ -31,19 +31,21 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#include <com/sun/star/beans/XPropertySet.hpp>
 
+#include <tools/debug.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
+
 #include <unoredlines.hxx>
 #include <unoredline.hxx>
-#include <unoobj.hxx>
-#include <tools/debug.hxx>
+#include <unomid.h>
 #include <pagedesc.hxx>
 #include "poolfmt.hxx"
 #include <doc.hxx>
 #include <docary.hxx>
 #include <redline.hxx>
-#include <com/sun/star/beans/XPropertySet.hpp>
+
 
 using namespace ::com::sun::star;
 using ::rtl::OUString;
diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx
index 2c2b076d03..42ef834cbf 100644
--- a/sw/source/core/unocore/unorefmk.cxx
+++ b/sw/source/core/unocore/unorefmk.cxx
@@ -33,7 +33,8 @@
 
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#include <unoobj.hxx>
+
+#include <unomid.h>
 #include <unotextrange.hxx>
 #include <unorefmark.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx
index ce78e9f4f8..c2b706250c 100644
--- a/sw/source/core/unocore/unosect.cxx
+++ b/sw/source/core/unocore/unosect.cxx
@@ -31,6 +31,7 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
+#include <com/sun/star/beans/PropertyAttribute.hpp>
 #include <com/sun/star/text/SectionFileLink.hpp>
 
 #include <cmdid.h>
@@ -43,7 +44,6 @@
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <fmtclds.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unosection.hxx>
 #include <unoparagraph.hxx>
@@ -64,7 +64,7 @@
 #include <doctxm.hxx>
 #include <fmtftntx.hxx>
 #include <fmtclbl.hxx>
-#include <com/sun/star/beans/PropertyAttribute.hpp>
+#include <fmtcntnt.hxx>
 #include <svx/frmdiritem.hxx>
 /* #109700# */
 #include <svx/lrspitem.hxx>
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 4caa5a735e..4f20d516fe 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -61,20 +61,15 @@
 #include <com/sun/star/text/HoriOrientation.hpp>
 #include <com/sun/star/style/LineNumberPosition.hpp>
 #include <com/sun/star/awt/XBitmap.hpp>
-#ifndef _COM_SUN_STAR_BEANS_PropertyAttribute_HPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/style/VerticalAlignment.hpp>
-#include <unoobj.hxx>
 #include <vcl/font.hxx>
 #include <svx/flstitem.hxx>
 #include <vcl/metric.hxx>
 #include <svtools/ctrltool.hxx>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
-#ifndef _TOOLKIT_UNOHLP_HXX
 #include <toolkit/helper/vclunohelper.hxx>
-#endif
 #include <svx/unofdesc.hxx>
 #include <fmtornt.hxx>
 #include <SwStyleNameMapper.hxx>
diff --git a/sw/source/core/unocore/unosrch.cxx b/sw/source/core/unocore/unosrch.cxx
index 8ee8e3e141..dfb21c071c 100644
--- a/sw/source/core/unocore/unosrch.cxx
+++ b/sw/source/core/unocore/unosrch.cxx
@@ -30,13 +30,14 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#include "unosrch.hxx"
-
 
+#include "unosrch.hxx"
 #include <doc.hxx>
 #include <hints.hxx>
 #include <unomap.hxx>
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
+#include <unomid.h>
+
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include "svx/unolingu.hxx"
diff --git a/sw/source/core/unocore/unostyle.cxx b/sw/source/core/unocore/unostyle.cxx
index 24251fe230..1108dcf71f 100644
--- a/sw/source/core/unocore/unostyle.cxx
+++ b/sw/source/core/unocore/unostyle.cxx
@@ -60,7 +60,6 @@
 #include <unoprnms.hxx>
 #include <shellio.hxx>
 #include <docstyle.hxx>
-#include <unoobj.hxx>
 #include <unotextbodyhf.hxx>
 #include <fmthdft.hxx>
 #include <fmtpdsc.hxx>
diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx
index 2e119b7339..e594ba50d6 100644
--- a/sw/source/core/unocore/unotbl.cxx
+++ b/sw/source/core/unocore/unotbl.cxx
@@ -83,7 +83,6 @@
 #include <com/sun/star/chart2/data/XLabeledDataSequence.hpp>
 #include <com/sun/star/table/CellContentType.hpp>
 #include <unotbl.hxx>
-#include <unoobj.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
 #include <unoparagraph.hxx>
diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx
index 8407089198..b758f9104b 100644
--- a/sw/source/core/unocore/unotext.cxx
+++ b/sw/source/core/unocore/unotext.cxx
@@ -34,12 +34,13 @@
 
 #include <com/sun/star/drawing/XDrawPageSupplier.hpp>
 #include <com/sun/star/text/ControlCharacter.hpp>
+#include <com/sun/star/text/TableColumnSeparator.hpp>
 
-#include <cmdid.h>
 #include <vos/mutex.hxx>
 #include <vcl/svapp.hxx>
 #include <rtl/uuid.h>
-#include <unoobj.hxx>
+
+#include <cmdid.h>
 #include <unotextbodyhf.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
@@ -68,9 +69,10 @@
 #include <section.hxx>
 #include <IMark.hxx>
 #include <fmtanchr.hxx>
+#include <fmtcntnt.hxx>
 #include <crsskip.hxx>
 #include <ndtxt.hxx>
-#include <com/sun/star/text/TableColumnSeparator.hpp>
+
 #include <memory>
 #include <stdlib.h>
 
diff --git a/sw/source/filter/html/htmlforw.cxx b/sw/source/filter/html/htmlforw.cxx
index 8d2d305c23..a0a2b7a862 100644
--- a/sw/source/filter/html/htmlforw.cxx
+++ b/sw/source/filter/html/htmlforw.cxx
@@ -63,7 +63,7 @@
 #include <svx/postitem.hxx>
 #include <svx/udlnitem.hxx>
 #include <svx/crsditem.hxx>
-#include <unoobj.hxx>
+
 #include <docsh.hxx>
 #include <fmtanchr.hxx>
 #include <docary.hxx>
diff --git a/sw/source/filter/ww8/ww8atr.cxx b/sw/source/filter/ww8/ww8atr.cxx
index 288a415223..d03bfa5eb7 100644
--- a/sw/source/filter/ww8/ww8atr.cxx
+++ b/sw/source/filter/ww8/ww8atr.cxx
@@ -128,9 +128,7 @@
 
 #include <writerfilter/doctok/sprmids.hxx>
 
-#if OSL_DEBUG_LEVEL > 1
-#  include <fmtcntnt.hxx>
-#endif
+#include <fmtcntnt.hxx>
 #include "writerhelper.hxx"
 #include "writerwordglue.hxx"
 #include "wrtww8.hxx"
diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index bd535912f6..3cabf2e49b 100644
--- a/sw/source/filter/xml/XMLRedlineImportHelper.cxx
+++ b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
@@ -34,7 +34,6 @@
 
 #include "XMLRedlineImportHelper.hxx"
 #include <unotextcursor.hxx>
-#include "unoobj.hxx"
 #include <unotextrange.hxx>
 #include <unocrsr.hxx>
 #include "doc.hxx"
diff --git a/sw/source/filter/xml/xmlexp.cxx b/sw/source/filter/xml/xmlexp.cxx
index 577d36e480..e4149fa60f 100644
--- a/sw/source/filter/xml/xmlexp.cxx
+++ b/sw/source/filter/xml/xmlexp.cxx
@@ -56,7 +56,6 @@
 #include <docsh.hxx>
 #include <docstat.hxx>
 #include <swerror.h>
-#include <unoobj.hxx>
 #include <unotext.hxx>
 #include <xmltexte.hxx>
 #include <xmlexp.hxx>
diff --git a/sw/source/filter/xml/xmlfmt.cxx b/sw/source/filter/xml/xmlfmt.cxx
index ec50718350..92fa625296 100644
--- a/sw/source/filter/xml/xmlfmt.cxx
+++ b/sw/source/filter/xml/xmlfmt.cxx
@@ -43,7 +43,6 @@
 #include <format.hxx>
 #include <fmtcol.hxx>
 #include <hints.hxx>
-#include <unoobj.hxx>
 #include <poolfmt.hxx>
 #include <charfmt.hxx>
 #include <paratr.hxx>
@@ -57,19 +56,11 @@
 #include <xmloff/xmltkmap.hxx>
 #include "xmlitem.hxx"
 #include <xmloff/xmlstyle.hxx>
-#ifndef _XMLOFF_TXTSTYLI_HXX
 #include <xmloff/txtstyli.hxx>
-#endif
-#ifndef _XMLOFF_TXTIMP_HXX
 #include <xmloff/txtimp.hxx>
-#endif
-#ifndef _XMLOFF_FAMILIES_HXX
 #include <xmloff/families.hxx>
-#endif
 #include <xmloff/XMLTextMasterStylesContext.hxx>
-#ifndef _XMLOFF_XMLTEXTSHAPESTYLECONTEXT_HXX
 #include <xmloff/XMLTextShapeStyleContext.hxx>
-#endif
 #include <xmloff/XMLGraphicsDefaultStyle.hxx>
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
@@ -79,6 +70,7 @@
 #include <unotxdoc.hxx>
 #include <docsh.hxx>
 
+
 using namespace ::com::sun::star;
 using ::rtl::OUString;
 using ::rtl::OUStringBuffer;
diff --git a/sw/source/filter/xml/xmlfonte.cxx b/sw/source/filter/xml/xmlfonte.cxx
index b43419a399..f2503ec54e 100644
--- a/sw/source/filter/xml/xmlfonte.cxx
+++ b/sw/source/filter/xml/xmlfonte.cxx
@@ -35,7 +35,6 @@
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <xmloff/XMLFontAutoStylePool.hxx>
 #include <svx/fontitem.hxx>
-//#include <unoobj.hxx>
 #include <unotext.hxx>
 #include <doc.hxx>
 #include <xmlexp.hxx>
diff --git a/sw/source/filter/xml/xmlimp.cxx b/sw/source/filter/xml/xmlimp.cxx
index 49db3512b6..1039515a8d 100644
--- a/sw/source/filter/xml/xmlimp.cxx
+++ b/sw/source/filter/xml/xmlimp.cxx
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <com/sun/star/text/XTextDocument.hpp>
 #include <com/sun/star/text/XTextRange.hpp>
 #include <com/sun/star/drawing/XDrawPage.hpp>
@@ -47,7 +48,6 @@
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <doc.hxx>
 #include <TextCursorHelper.hxx>
-#include <unoobj.hxx>
 #include <unotext.hxx>
 #include <unotextrange.hxx>
 #include "unocrsr.hxx"
diff --git a/sw/source/filter/xml/xmlmeta.cxx b/sw/source/filter/xml/xmlmeta.cxx
index 3bac5aa2b4..d6ebfb2d25 100644
--- a/sw/source/filter/xml/xmlmeta.cxx
+++ b/sw/source/filter/xml/xmlmeta.cxx
@@ -45,7 +45,6 @@
 #include "docstat.hxx"
 #include "docsh.hxx"
 #include <doc.hxx>
-#include <unoobj.hxx>
 #include "xmlimp.hxx"
 #include "xmlexp.hxx"
 
diff --git a/sw/source/filter/xml/xmltble.cxx b/sw/source/filter/xml/xmltble.cxx
index 04f654db61..0b4783e2e4 100644
--- a/sw/source/filter/xml/xmltble.cxx
+++ b/sw/source/filter/xml/xmltble.cxx
@@ -61,7 +61,6 @@
 #include <ndole.hxx>
 #include <xmloff/nmspmap.hxx>
 #include <sfx2/linkmgr.hxx>  // for cTokenSeperator
-#include "unoobj.hxx"
 #include "unotbl.hxx"
 #include "xmltexte.hxx"
 #include "xmlexp.hxx"
diff --git a/sw/source/filter/xml/xmltexti.cxx b/sw/source/filter/xml/xmltexti.cxx
index f40ce0a5a5..3373bfa75d 100644
--- a/sw/source/filter/xml/xmltexti.cxx
+++ b/sw/source/filter/xml/xmltexti.cxx
@@ -50,13 +50,13 @@
 #include <xmloff/txtprmap.hxx>
 #include <xmloff/i18nmap.hxx>
 #include "unocrsr.hxx"
-#include "unoobj.hxx"
 #include "TextCursorHelper.hxx"
 #include "unoframe.hxx"
 #include "doc.hxx"
 #include "unocoll.hxx"
 #include <fmtfsize.hxx>
 #include <fmtanchr.hxx>
+#include <fmtcntnt.hxx>
 #include "xmlimp.hxx"
 #include "xmltbli.hxx"
 #include "xmltexti.hxx"
diff --git a/sw/source/ui/app/docsh2.cxx b/sw/source/ui/app/docsh2.cxx
index 1b0a0c1c0e..050c0bacca 100644
--- a/sw/source/ui/app/docsh2.cxx
+++ b/sw/source/ui/app/docsh2.cxx
@@ -30,30 +30,19 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
-#ifndef _COM_SUN_STAR_LANG_XMultiServiceFactory_HPP_
-#include <com/sun/star/lang/XMultiServiceFactory.hpp>
-#endif
 
-#ifndef _UNOTOOLS_PROCESSFACTORY_HXX
-#include <comphelper/processfactory.hxx>
-#endif
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
 #include <com/sun/star/frame/XDispatchHelper.hpp>
 
+#include <comphelper/processfactory.hxx>
 
 #include <hintids.hxx>
 #include <tools/urlobj.hxx>
 #include <unotools/tempfile.hxx>
-#ifndef _WRKWIN_HXX //autogen
 #include <vcl/wrkwin.hxx>
-#endif
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <svtools/lckbitem.hxx>
 #include <svtools/eitem.hxx>
-/*
-#include <svtools/macitem.hxx>
-*/
 #include <svtools/zforlist.hxx>
 #include <svtools/zformat.hxx>
 #include <svtools/pathoptions.hxx>
@@ -90,51 +79,33 @@
 #include <swunodef.hxx>
 #include <fmtcol.hxx>
 #include <swevent.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx> 		// fuer die aktuelle Sicht
-#endif
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>	  	// Dokumenterzeugung
-#endif
 #include <wrtsh.hxx>
 #include <fldbas.hxx>
 #include <viewopt.hxx>
-#ifndef _GLOBDOC_HXX
 #include <globdoc.hxx>
-#endif
 #include <fldwrap.hxx>
-#ifndef _REDLNDLG_HXX
 #include <redlndlg.hxx>
-#endif
 #include <docstyle.hxx>
 #include <doc.hxx>
 #include <pagedesc.hxx>
 #include <shellio.hxx>
-#ifndef _PVIEW_HXX
 #include <pview.hxx>
-#endif
-#ifndef _SRCVIEW_HXX
 #include <srcview.hxx>
-#endif
 #include <poolfmt.hxx>
 #include <usrpref.hxx>
-#ifndef _WDOCSH_HXX
 #include <wdocsh.hxx>
-#endif
 #include <unotxdoc.hxx>
 #include <acmplwrd.hxx>
 #include <swmodule.hxx>
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
 #include <swwait.hxx>
 #include <swcli.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #include <globals.h>
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
 #ifndef _APP_HRC
 #include <app.hrc>
 #endif
diff --git a/sw/source/ui/envelp/labelexp.cxx b/sw/source/ui/envelp/labelexp.cxx
index 21a9dcf599..0b0f557bbb 100644
--- a/sw/source/ui/envelp/labelexp.cxx
+++ b/sw/source/ui/envelp/labelexp.cxx
@@ -43,7 +43,7 @@
 #include <labfmt.hxx>
 #include <unotools.hxx>
 #include <unoatxt.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unoprnms.hxx>
 
 
diff --git a/sw/source/ui/misc/glossary.cxx b/sw/source/ui/misc/glossary.cxx
index 89a37a86e7..787a04af90 100644
--- a/sw/source/ui/misc/glossary.cxx
+++ b/sw/source/ui/misc/glossary.cxx
@@ -30,25 +30,18 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #ifdef SW_DLLIMPLEMENTATION
 #undef SW_DLLIMPLEMENTATION
 #endif
 
-
-
 #define _SVSTDARR_STRINGSDTOR
 #define _SVSTDARR_STRINGS
 #include <hintids.hxx>
 
-#ifndef _MENU_HXX //autogen
 #include <vcl/menu.hxx>
-#endif
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
-#ifndef _HELP_HXX //autogen
 #include <vcl/help.hxx>
-#endif
 #ifndef _SVSTDARR_HXX
 #include <svtools/svstdarr.hxx>
 #endif
@@ -64,7 +57,6 @@
 #include <sfx2/viewfrm.hxx>
 #include <unocrsr.hxx>
 #include <unotools.hxx>
-#include <unoobj.hxx>
 #include <comphelper/processfactory.hxx>
 #include <ucbhelper/content.hxx>
 #include <com/sun/star/ui/dialogs/XFilePicker.hpp>
@@ -75,12 +67,8 @@
 #include <swwait.hxx>
 #include <swtypes.hxx>
 #include <wrtsh.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
-#ifndef _BASESH_HXX
 #include <basesh.hxx>
-#endif
 #include <glossary.hxx>
 #include <gloshdl.hxx>
 #include <glosbib.hxx>
@@ -88,20 +76,12 @@
 #include <glosdoc.hxx>
 #include <macassgn.hxx>
 #include <swevent.hxx>
-#ifndef _DOCSH_HXX
 #include <docsh.hxx>
-#endif
 #include <shellio.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#ifndef _SWERROR_H
 #include <swerror.h>
-#endif
 #ifndef _GLOBALS_HRC
 #include <globals.hrc>
 #endif
diff --git a/sw/source/ui/shells/drwtxtsh.cxx b/sw/source/ui/shells/drwtxtsh.cxx
index ad6ab1d2e7..7118acd7e7 100644
--- a/sw/source/ui/shells/drwtxtsh.cxx
+++ b/sw/source/ui/shells/drwtxtsh.cxx
@@ -30,6 +30,7 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <hintids.hxx>
 #include <i18npool/lang.h>
 #include <svtools/slstitm.hxx>
@@ -53,7 +54,6 @@
 #include <svx/outliner.hxx>
 #include <svx/editstat.hxx>
 #include <svx/svdoutl.hxx>
-#include <unoobj.hxx>
 #include <com/sun/star/i18n/TransliterationModules.hpp>
 #include <com/sun/star/i18n/TextConversionOption.hpp>
 #include <com/sun/star/ui/dialogs/XExecutableDialog.hpp>
@@ -67,12 +67,8 @@
 #include <swundo.hxx>
 #include <breakit.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
 #ifndef _GLOBALS_HRC
 #include <globals.hrc>
 #endif
diff --git a/sw/source/ui/shells/tabsh.cxx b/sw/source/ui/shells/tabsh.cxx
index 577ea95c64..014d0d460c 100644
--- a/sw/source/ui/shells/tabsh.cxx
+++ b/sw/source/ui/shells/tabsh.cxx
@@ -108,16 +108,12 @@
 #ifndef _TABLE_HRC
 #include <table.hrc>
 #endif
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #ifndef _GLOBALS_HRC
 #include <globals.hrc>
 #endif
-#ifndef _HELPID_H
 #include <helpid.h>
-#endif
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
 
 #define SwTableShell
 #include <sfx2/msg.hxx>
diff --git a/sw/source/ui/table/chartins.cxx b/sw/source/ui/table/chartins.cxx
index c8a836cc43..1032536616 100644
--- a/sw/source/ui/table/chartins.cxx
+++ b/sw/source/ui/table/chartins.cxx
@@ -33,9 +33,7 @@
 
 
 #include <sfx2/viewfrm.hxx>
-#ifndef _MSGBOX_HXX //autogen
 #include <vcl/msgbox.hxx>
-#endif
 #include <sfx2/dispatch.hxx>
 #include <sfx2/basedlgs.hxx>
 #include <IDocumentUndoRedo.hxx>
@@ -45,24 +43,19 @@
 #include <swmodule.hxx>
 #include <wrtsh.hxx>
 #include <docsh.hxx>
-#ifndef _VIEW_HXX
 #include <view.hxx>
-#endif
 #include <chartins.hxx>
 #include <tablemgr.hxx>
 #include <frmfmt.hxx>
 #include <swtable.hxx>
 #include <tblsel.hxx>
-#include <unoobj.hxx>
 #include <unochart.hxx>
 #include <autoedit.hxx>
 #include <doc.hxx>
 
 #include <edtwin.hxx>
 
-#ifndef _CMDID_H
 #include <cmdid.h>
-#endif
 #ifndef _CHARTINS_HRC
 #include <chartins.hrc>
 #endif
diff --git a/sw/source/ui/uno/SwXDocumentSettings.cxx b/sw/source/ui/uno/SwXDocumentSettings.cxx
index 60474dff99..8389d9d2f9 100644
--- a/sw/source/ui/uno/SwXDocumentSettings.cxx
+++ b/sw/source/ui/uno/SwXDocumentSettings.cxx
@@ -30,16 +30,13 @@
 
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
+
 #include <vos/mutex.hxx>
 #include <sfx2/sfxbasecontroller.hxx>
 #include <SwXDocumentSettings.hxx>
 #include <SwXPrintPreviewSettings.hxx>
-#ifndef _COMPHELPER_MASTERPROPERTSETINFO_HXX_
 #include <comphelper/MasterPropertySetInfo.hxx>
-#endif
-#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_
 #include <com/sun/star/beans/PropertyAttribute.hpp>
-#endif
 #include <com/sun/star/i18n/XForbiddenCharacters.hpp>
 #include <com/sun/star/document/PrinterIndependentLayout.hpp>
 #include <doc.hxx>
@@ -50,7 +47,6 @@
 #include <editsh.hxx>
 #include <drawdoc.hxx>
 #include <svtools/zforlist.hxx>
-#include <unoobj.hxx>
 #include <unotxdoc.hxx>
 #include <cmdid.h>
 #include <svx/zoomitem.hxx>
diff --git a/sw/source/ui/uno/unoatxt.cxx b/sw/source/ui/uno/unoatxt.cxx
index 062246c88f..f9b672df97 100644
--- a/sw/source/ui/uno/unoatxt.cxx
+++ b/sw/source/ui/uno/unoatxt.cxx
@@ -49,7 +49,7 @@
 #include <gloslst.hxx>
 #include <unoatxt.hxx>
 #include <unomap.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <TextCursorHelper.hxx>
diff --git a/sw/source/ui/uno/unodispatch.cxx b/sw/source/ui/uno/unodispatch.cxx
index 44b82239b1..02e669d3b2 100644
--- a/sw/source/ui/uno/unodispatch.cxx
+++ b/sw/source/ui/uno/unodispatch.cxx
@@ -31,17 +31,18 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <vcl/svapp.hxx>
 #include <sfx2/viewfrm.hxx>
 #include <sfx2/dispatch.hxx>
+#include <svx/dataaccessdescriptor.hxx>
+
 #include <unodispatch.hxx>
-#include <unoobj.hxx>
+#include <unobaseclass.hxx>
 #include <view.hxx>
 #include <cmdid.h>
 #include "wrtsh.hxx"
 #include "dbmgr.hxx"
-#include <svx/dataaccessdescriptor.hxx>
+
 
 using namespace ::com::sun::star;
 using namespace rtl;
diff --git a/sw/source/ui/uno/unomod.cxx b/sw/source/ui/uno/unomod.cxx
index d5315fbd33..18cccf6d7b 100644
--- a/sw/source/ui/uno/unomod.cxx
+++ b/sw/source/ui/uno/unomod.cxx
@@ -35,7 +35,7 @@
 #include <swtypes.hxx>
 #include <tools/debug.hxx>
 #include <unomod.hxx>
-#include <unoobj.hxx>
+#include <unomid.h>
 #include <unoprnms.hxx>
 #include <unomap.hxx>
 #include <prtopt.hxx>
diff --git a/sw/source/ui/uno/unotxdoc.cxx b/sw/source/ui/uno/unotxdoc.cxx
index cc994acb9c..5c2c3a7e52 100644
--- a/sw/source/ui/uno/unotxdoc.cxx
+++ b/sw/source/ui/uno/unotxdoc.cxx
@@ -49,7 +49,7 @@
 #include <svtools/stritem.hxx>
 #include <unotxdoc.hxx>
 #include <svtools/numuno.hxx>
-#include <unoobj.hxx>
+#include <fldbas.hxx>
 #include <unotextbodyhf.hxx>
 #include <unotextrange.hxx>
 #include <unotextcursor.hxx>
diff --git a/sw/source/ui/uno/unotxvw.cxx b/sw/source/ui/uno/unotxvw.cxx
index be1b453633..19f1aa0dea 100644
--- a/sw/source/ui/uno/unotxvw.cxx
+++ b/sw/source/ui/uno/unotxvw.cxx
@@ -47,7 +47,6 @@
 #include <view.hxx>
 #include <viewopt.hxx>
 #include <unomod.hxx>
-#include <unoobj.hxx>
 #include <unoframe.hxx>
 #include <unocrsr.hxx>
 #include <wrtsh.hxx>
diff --git a/sw/source/ui/utlui/swrenamexnameddlg.cxx b/sw/source/ui/utlui/swrenamexnameddlg.cxx
index 288a51b7bc..d338cb6ebb 100644
--- a/sw/source/ui/utlui/swrenamexnameddlg.cxx
+++ b/sw/source/ui/utlui/swrenamexnameddlg.cxx
@@ -63,7 +63,6 @@
 #include <view.hxx>
 #include <wrtsh.hxx>
 #include <swmodule.hxx>
-#include <unoobj.hxx>
 #include <unocrsr.hxx>
 
 #include "swrenamexnameddlg.hxx"