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.

8 files changed, 3 insertions, 16 deletions

diff --git a/sw/source/filter/xml/XMLRedlineImportHelper.cxx b/sw/source/filter/xml/XMLRedlineImportHelper.cxx
index 0102462b4864..4b89f042977f 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 74196dfbd9ce..98009fccef38 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 357546259777..cba68f69091e 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 d3d8772e43da..3fc753058f3c 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 cf96a699dd7f..003318dbe989 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 e9acd9a7ab77..733bf0749faf 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 b80a8f15eda8..05b9d1740f4f 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 acf49038078a..fdd551566789 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"