INTEGRATION: CWS gcframework_DEV300 (1.22.90); FILE MERGED

2008/01/09 07:48:52 tl 1.22.90.4: defines fixed
2008/01/08 10:04:28 tl 1.22.90.3: RESYNC: (1.22-1.25); FILE MERGED
2007/09/26 10:46:06 fme 1.22.90.2: ## New grammar checking API
2007/09/18 14:24:40 fme 1.22.90.1: ## New grammar checking interfaces

1 files changed, 22 insertions, 13 deletions

diff --git a/sw/inc/unotxdoc.hxx b/sw/inc/unotxdoc.hxx
index cc7fd55b11ab..04fa3ff1fa22 100644
--- a/sw/inc/unotxdoc.hxx
+++ b/sw/inc/unotxdoc.hxx
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: unotxdoc.hxx,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-23 16:22:52 $
+ *  last change: $Author: obo $ $Date: 2008-02-26 09:44:47 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -149,6 +149,9 @@
 #ifndef _COM_SUN_STAR_CONTAINER_XNAMECONTAINER_HPP_
 #include <com/sun/star/container/XNameContainer.hpp>
 #endif
+#ifndef _COM_SUN_STAR_TEXT_XFLATPARAGRAPHITERATORPROVIDER_HPP_
+#include <com/sun/star/text/XFlatParagraphIteratorProvider.hpp>
+#endif
 #ifndef _COM_SUN_STAR_DOCUMENT_XDOCUMENTLANGUAGES_HPP
 #include <com/sun/star/document/XDocumentLanguages.hpp>
 #endif
@@ -174,18 +177,19 @@
 #include <RefreshListenerContainer.hxx>
 #endif
 
-#define __IFC30 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
-Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30
+#define __IFC31 Ifc1, Ifc2, Ifc3, Ifc4, Ifc5, Ifc6, Ifc7, Ifc8, Ifc9, Ifc10, Ifc11, Ifc12, Ifc13, Ifc14, Ifc15, Ifc16, \
+Ifc17, Ifc18, Ifc19, Ifc20, Ifc21, Ifc22, Ifc23, Ifc24, Ifc25, Ifc26, Ifc27, Ifc28, Ifc29, Ifc30, Ifc31
 
-#define __CLASS_IFC30 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
+#define __CLASS_IFC31 class Ifc1, class Ifc2, class Ifc3, class Ifc4, class Ifc5, class Ifc6, class Ifc7, \
 class Ifc8, class Ifc9, class Ifc10, class Ifc11, class Ifc12, class Ifc13, class Ifc14, class Ifc15, class Ifc16, \
 class Ifc17, class Ifc18, class Ifc19, class Ifc20, class Ifc21, class Ifc22, class Ifc23, class Ifc24,\
-class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30
+class Ifc25, class Ifc26, class Ifc27, class Ifc28, class Ifc29, class Ifc30, class Ifc31
 
-#define __PUBLIC_IFC30 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
+#define __PUBLIC_IFC31 public Ifc1, public Ifc2, public Ifc3, public Ifc4, public Ifc5, public Ifc6, public Ifc7, public Ifc8, public Ifc9, public Ifc10, public Ifc11, public Ifc12, \
 public Ifc13, public Ifc14, public Ifc15, public Ifc16, public Ifc17, public Ifc18, \
-public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23 , public Ifc24, \
-public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30
+public Ifc19, public Ifc20, public Ifc21, public Ifc22, public Ifc23, public Ifc24, \
+public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc30, \
+public Ifc31
 
 #ifndef _CPPUHELPER_IMPLBASE_EX_HXX_
 #include <cppuhelper/implbase_ex.hxx>
@@ -194,7 +198,7 @@ public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc
 #ifndef _CPPUHELPER_IMPLBASE_EX_PRE_HXX_
 #include <cppuhelper/implbase_ex_pre.hxx>
 #endif
-#define __IFC_EX_TYPE_INIT30( class_cast ) \
+#define __IFC_EX_TYPE_INIT31( class_cast ) \
     __IFC_EX_TYPE_INIT( class_cast, 1 ), __IFC_EX_TYPE_INIT( class_cast, 2 ), \
     __IFC_EX_TYPE_INIT( class_cast, 3 ), __IFC_EX_TYPE_INIT( class_cast, 4 ), \
     __IFC_EX_TYPE_INIT( class_cast, 5 ), __IFC_EX_TYPE_INIT( class_cast, 6 ), \
@@ -209,13 +213,14 @@ public Ifc25, public Ifc26, public Ifc27, public Ifc28, public Ifc29, public Ifc
     __IFC_EX_TYPE_INIT( class_cast, 23 ), __IFC_EX_TYPE_INIT( class_cast, 24 ), \
     __IFC_EX_TYPE_INIT( class_cast, 25 ), __IFC_EX_TYPE_INIT( class_cast, 26 ), \
     __IFC_EX_TYPE_INIT( class_cast, 27 ), __IFC_EX_TYPE_INIT( class_cast, 28 ), \
-    __IFC_EX_TYPE_INIT( class_cast, 29 ),__IFC_EX_TYPE_INIT( class_cast, 30 )
+    __IFC_EX_TYPE_INIT( class_cast, 29 ), __IFC_EX_TYPE_INIT( class_cast, 30 ), \
+    __IFC_EX_TYPE_INIT( class_cast, 31)
 
 #ifndef _CPPUHELPER_IMPLBASE_EX_POST_HXX_
 #include <cppuhelper/implbase_ex_post.hxx>
 #endif
 
-__DEF_IMPLHELPER_EX( 30 )
+__DEF_IMPLHELPER_EX( 31 )
 
 class SwDoc;
 class SwDocShell;
@@ -234,7 +239,7 @@ SV_DECL_PTRARR(ActionContextArr, UnoActionContextPtr, 4, 4)
  ******************************************************************************/
 
 
-typedef cppu::WeakImplHelper30
+typedef cppu::WeakImplHelper31
 <
     ::com::sun::star::text::XTextDocument,
     ::com::sun::star::text::XLineNumberingProperties,
@@ -265,6 +270,7 @@ typedef cppu::WeakImplHelper30
     ::com::sun::star::util::XLinkUpdate,
     ::com::sun::star::view::XRenderable,
     ::com::sun::star::xforms::XFormsSupplier,
+    ::com::sun::star::text::XFlatParagraphIteratorProvider,
     ::com::sun::star::document::XDocumentLanguages
 >
 SwXTextDocumentBaseClass;
@@ -500,6 +506,9 @@ public:
     // ::com::sun::star::document::XDocumentLanguages
     virtual ::com::sun::star::uno::Sequence< ::com::sun::star::lang::Locale > SAL_CALL getDocumentLanguages( ::sal_Int16 nScriptTypes, ::sal_Int16 nCount ) throw (::com::sun::star::lang::IllegalArgumentException, ::com::sun::star::uno::RuntimeException);
 
+    // ::com::sun::star::text::XFlatParagraphIteratorProvider:
+    virtual ::com::sun::star::uno::Reference< ::com::sun::star::text::XFlatParagraphIterator > SAL_CALL getFlatParagraphIterator(::sal_Int32 nTextMarkupType, sal_Bool bAutomatic ) throw (::com::sun::star::uno::RuntimeException);
+
     virtual ::com::sun::star::uno::Reference< ::com::sun::star::document::XDocumentInfo > SAL_CALL getDocumentInfo() throw (::com::sun::star::uno::RuntimeException);
 
     //