diff options
author | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:44 +0100 |
---|---|---|
committer | Michael Stahl <mst@openoffice.org> | 2010-01-05 16:37:44 +0100 |
commit | af7ef16cd1dd50610a5d89798a3ef68aa43de922 (patch) | |
tree | 6a0cdbc301c0bbe5ccebfcad6051466b1a56dc24 /sw/source/core/unocore | |
parent | a36e10b3749788ccfb5c79827f53af04301866e1 (diff) |
swunolocking1: #i105557#: unoobj.hxx: split out unoparagraph.hxx:
move SwXParagraph{,Enumeration} from unoobj.hxx to new unoparagraph.hxx.
move enum CursorType to unobaseclass.hxx.
Diffstat (limited to 'sw/source/core/unocore')
-rw-r--r-- | sw/source/core/unocore/unobkm.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unocoll.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unodraw.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unoframe.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unoftn.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unoidx.cxx | 6 | ||||
-rw-r--r-- | sw/source/core/unocore/unoobj2.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unoparagraph.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unoredline.cxx | 2 | ||||
-rw-r--r-- | sw/source/core/unocore/unorefmk.cxx | 1 | ||||
-rw-r--r-- | sw/source/core/unocore/unosect.cxx | 9 | ||||
-rw-r--r-- | sw/source/core/unocore/unotbl.cxx | 7 | ||||
-rw-r--r-- | sw/source/core/unocore/unotext.cxx | 3 |
13 files changed, 22 insertions, 14 deletions
diff --git a/sw/source/core/unocore/unobkm.cxx b/sw/source/core/unocore/unobkm.cxx index da9568603b01..0ec0442457f5 100644 --- a/sw/source/core/unocore/unobkm.cxx +++ b/sw/source/core/unocore/unobkm.cxx @@ -31,10 +31,12 @@ // MARKER(update_precomp.py): autogen include statement, do not remove #include "precompiled_sw.hxx" + #include <unobookmark.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <IMark.hxx> diff --git a/sw/source/core/unocore/unocoll.cxx b/sw/source/core/unocore/unocoll.cxx index cc9c3d34050a..598e95cbf385 100644 --- a/sw/source/core/unocore/unocoll.cxx +++ b/sw/source/core/unocore/unocoll.cxx @@ -75,6 +75,7 @@ #include <slist> #include <iterator> +#include <unoparagraph.hxx> #include <unobookmark.hxx> #include <unorefmark.hxx> #include <unometa.hxx> diff --git a/sw/source/core/unocore/unodraw.cxx b/sw/source/core/unocore/unodraw.cxx index 5a050eb690ed..ec978f02a0ec 100644 --- a/sw/source/core/unocore/unodraw.cxx +++ b/sw/source/core/unocore/unodraw.cxx @@ -38,6 +38,7 @@ #include <unodraw.hxx> #include <unocoll.hxx> #include <unoframe.hxx> +#include <unoparagraph.hxx> #include <unoprnms.hxx> #include <svx/unoprnms.hxx> #include <swunohelper.hxx> diff --git a/sw/source/core/unocore/unoframe.cxx b/sw/source/core/unocore/unoframe.cxx index 1f9d39bca94c..87bc0ff6b173 100644 --- a/sw/source/core/unocore/unoframe.cxx +++ b/sw/source/core/unocore/unoframe.cxx @@ -61,6 +61,7 @@ #include <frmfmt.hxx> #include <frame.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <unoevent.hxx> diff --git a/sw/source/core/unocore/unoftn.cxx b/sw/source/core/unocore/unoftn.cxx index 98ee87c2ae33..cf1b6dc516c4 100644 --- a/sw/source/core/unocore/unoftn.cxx +++ b/sw/source/core/unocore/unoftn.cxx @@ -36,6 +36,7 @@ #include <vcl/svapp.hxx> #include <rtl/uuid.h> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unomap.hxx> #include <unoprnms.hxx> #include <doc.hxx> diff --git a/sw/source/core/unocore/unoidx.cxx b/sw/source/core/unocore/unoidx.cxx index 5633ca1f0661..3e1fde6746b3 100644 --- a/sw/source/core/unocore/unoidx.cxx +++ b/sw/source/core/unocore/unoidx.cxx @@ -43,9 +43,7 @@ #include <com/sun/star/frame/XModel.hpp> #include <com/sun/star/text/XTextDocument.hpp> #include <com/sun/star/beans/PropertyAttribute.hpp> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <swtypes.hxx> #include <shellres.hxx> #include <viewsh.hxx> @@ -58,18 +56,18 @@ #include <pagedesc.hxx> #include <unomap.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <doctxm.hxx> #include <txttxmrk.hxx> #include <unocrsr.hxx> #include <unostyle.hxx> #include <ndtxt.hxx> #include <unoidx.hxx> -#ifndef _DOCSH_HXX //autogen #include <docsh.hxx> -#endif #include <chpfld.hxx> #include <SwStyleNameMapper.hxx> + using namespace ::com::sun::star; using ::rtl::OUString; diff --git a/sw/source/core/unocore/unoobj2.cxx b/sw/source/core/unocore/unoobj2.cxx index 26a237b5625a..b8435fe17166 100644 --- a/sw/source/core/unocore/unoobj2.cxx +++ b/sw/source/core/unocore/unoobj2.cxx @@ -78,6 +78,7 @@ #include <txtrfmrk.hxx> #include <unoclbck.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unomap.hxx> #include <unoport.hxx> #include <unocrsrhelper.hxx> diff --git a/sw/source/core/unocore/unoparagraph.cxx b/sw/source/core/unocore/unoparagraph.cxx index 4fbf9a7062d1..bb7c30667ab1 100644 --- a/sw/source/core/unocore/unoparagraph.cxx +++ b/sw/source/core/unocore/unoparagraph.cxx @@ -35,6 +35,7 @@ #include <cmdid.h> #include <unomid.h> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unoport.hxx> #include <unomap.hxx> #include <unocrsr.hxx> diff --git a/sw/source/core/unocore/unoredline.cxx b/sw/source/core/unocore/unoredline.cxx index b04a7fea1fae..80297bb64321 100644 --- a/sw/source/core/unocore/unoredline.cxx +++ b/sw/source/core/unocore/unoredline.cxx @@ -40,6 +40,7 @@ #include <section.hxx> #include <unoprnms.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unocoll.hxx> #include <unomap.hxx> #include <unocrsr.hxx> @@ -50,6 +51,7 @@ #include <com/sun/star/util/DateTime.hpp> #include <com/sun/star/text/XTextTable.hpp> + using namespace ::com::sun::star; using ::rtl::OUString; using ::rtl::OUStringBuffer; diff --git a/sw/source/core/unocore/unorefmk.cxx b/sw/source/core/unocore/unorefmk.cxx index 25f87488d4d5..45c79b5edcf5 100644 --- a/sw/source/core/unocore/unorefmk.cxx +++ b/sw/source/core/unocore/unorefmk.cxx @@ -35,6 +35,7 @@ #include <vcl/svapp.hxx> #include <unoobj.hxx> #include <unorefmark.hxx> +#include <unoparagraph.hxx> #include <unomap.hxx> #include <unocrsr.hxx> #include <doc.hxx> diff --git a/sw/source/core/unocore/unosect.cxx b/sw/source/core/unocore/unosect.cxx index 1308c6ad7d3e..e3c0c56908a9 100644 --- a/sw/source/core/unocore/unosect.cxx +++ b/sw/source/core/unocore/unosect.cxx @@ -38,24 +38,21 @@ #include <hintids.hxx> #include <svtools/urihelper.hxx> #include <svx/brshitem.hxx> -#ifndef _SVX_XMLCNITEM_HXX #include <svx/xmlcnitm.hxx> -#endif #include <sfx2/linkmgr.hxx> #include <sfx2/lnkbase.hxx> #include <vos/mutex.hxx> #include <vcl/svapp.hxx> #include <fmtclds.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <unoredline.hxx> #include <redline.hxx> #include <unomap.hxx> #include <unocrsr.hxx> #include <section.hxx> #include <doc.hxx> -#ifndef _DOCSH_HXX #include <docsh.hxx> -#endif #include <sfx2/docfile.hxx> #include <docary.hxx> #include <swundo.hxx> @@ -65,13 +62,12 @@ #include <doctxm.hxx> #include <fmtftntx.hxx> #include <fmtclbl.hxx> -#ifndef _COM_SUN_STAR_BEANS_PROPERTYATTRIBUTE_HPPP_ #include <com/sun/star/beans/PropertyAttribute.hpp> -#endif #include <svx/frmdiritem.hxx> /* #109700# */ #include <svx/lrspitem.hxx> + using namespace ::com::sun::star; using namespace ::com::sun::star::lang; using namespace ::com::sun::star::uno; @@ -80,6 +76,7 @@ using namespace ::com::sun::star::container; using namespace ::com::sun::star::beans; using ::rtl::OUString; + TYPEINIT1(SwXTextSectionClient, SwClient); /*-- 20.12.2005 09:56:33--------------------------------------------------- diff --git a/sw/source/core/unocore/unotbl.cxx b/sw/source/core/unocore/unotbl.cxx index 20dde56ead7d..b0514f74d4ab 100644 --- a/sw/source/core/unocore/unotbl.cxx +++ b/sw/source/core/unocore/unotbl.cxx @@ -33,16 +33,12 @@ #include "precompiled_sw.hxx" - - // STL includes #include <list> #include <float.h> // for DBL_MIN #include <swtypes.hxx> -#ifndef _CMDID_H #include <cmdid.h> -#endif #include <unotbl.hxx> #include <unostyle.hxx> #include <section.hxx> @@ -87,6 +83,7 @@ #include <com/sun/star/table/CellContentType.hpp> #include <unotbl.hxx> #include <unoobj.hxx> +#include <unoparagraph.hxx> #include <svtools/zforlist.hxx> // SvNumberFormatter #include <svx/brkitem.hxx> #include <svx/shaditem.hxx> @@ -103,9 +100,11 @@ #include <unochart.hxx> #include <rtl/math.hxx> + using namespace ::com::sun::star; using ::rtl::OUString; + //----------------------------------------------------------------------------- // from unoobj.cxx extern void lcl_SetTxtFmtColl(const uno::Any& rAny, SwPaM& rPaM) throw (lang::IllegalArgumentException); diff --git a/sw/source/core/unocore/unotext.cxx b/sw/source/core/unocore/unotext.cxx index bbb371d66974..fed9109b094e 100644 --- a/sw/source/core/unocore/unotext.cxx +++ b/sw/source/core/unocore/unotext.cxx @@ -53,6 +53,7 @@ #include <unomap.hxx> #include <unoprnms.hxx> #include <undobj.hxx> +#include <unoparagraph.hxx> #include <unocrsrhelper.hxx> #include <docsh.hxx> #include <docary.hxx> @@ -70,9 +71,11 @@ #include <iostream> + using namespace ::com::sun::star; using ::rtl::OUString; + const sal_Char cInvalidObject[] = "this object is invalid"; /****************************************************************** * SwXText |