1 files changed, 28 insertions, 11 deletions
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();