swunolocking1: #i105557#: remove unnecessary includes of unoobj.hxx

6 files changed, 32 insertions, 14 deletions

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/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/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/unoidx.hxx b/sw/inc/unoidx.hxx
index 5ea20f65c89d..ef503926ad1f 100644
--- a/sw/inc/unoidx.hxx
+++ b/sw/inc/unoidx.hxx
@@ -30,15 +30,26 @@
 #ifndef _UNOIDX_HXX
 #define _UNOIDX_HXX
 
+#include <com/sun/star/lang/XUnoTunnel.hpp>
+#include <com/sun/star/beans/XPropertySet.hpp>
+#include <com/sun/star/beans/XPropertySetInfo.hpp>
+#include <com/sun/star/container/XNamed.hpp>
+#include <com/sun/star/container/XIndexReplace.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/implbase5.hxx>
+
+#include <unoevtlstnr.hxx>
 #include <unocoll.hxx>
 #include <toxe.hxx>
+
+
+class SfxItemPropertySet;
 class SwTOXBaseSection;
 class SwTOXMark;
 class SwTOXType;
+
 /* -----------------07.12.98 10:08-------------------
  *
  * --------------------------------------------------*/
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index fba401974a5b..06999d846c81 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -41,12 +41,8 @@
 #define _SVSTDARR_ULONGS
 #include <svtools/svarray.hxx>
 #endif
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
-#ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
-#endif
 #include <unotools/charclass.hxx>
 #include <unotools/transliterationwrapper.hxx>
 #include <doc.hxx>
@@ -69,14 +65,13 @@
 #include <chpfld.hxx>
 #include <reffld.hxx>
 #include <flddropdown.hxx>
-#ifndef _DBMGR_HXX
 #include <dbmgr.hxx>
-#endif
 #include <section.hxx>
 #include <cellatr.hxx>
 #include <docary.hxx>
 #include <authfld.hxx>
 #include <txtinet.hxx>
+#include <fmtcntnt.hxx>
 #ifndef _POOLFMT_HRC
 #include <poolfmt.hrc>      // fuer InitFldTypes
 #endif
diff --git a/sw/source/core/fields/expfld.cxx b/sw/source/core/fields/expfld.cxx
index 38745a12ba7b..05a8dee4253e 100644
--- a/sw/source/core/fields/expfld.cxx
+++ b/sw/source/core/fields/expfld.cxx
@@ -31,7 +31,6 @@
 // MARKER(update_precomp.py): autogen include statement, do not remove
 #include "precompiled_sw.hxx"
 
-
 #include <hintids.hxx>
 #include <unotools/collatorwrapper.hxx>
 #include <unotools/charclass.hxx>
@@ -41,6 +40,7 @@
 #include <svx/fontitem.hxx>
 #include <com/sun/star/text/SetVariableType.hpp>
 #include <unofield.hxx>
+#include <frmfmt.hxx>
 #include <fmtfld.hxx>
 #include <txtfld.hxx>
 #include <fmtanchr.hxx>