BreakIterator moved from text to i18n

6 files changed, 78 insertions, 48 deletions

diff --git a/sw/source/core/text/guess.cxx b/sw/source/core/text/guess.cxx
index 1a741da6bea1..08809c94adb9 100644
--- a/sw/source/core/text/guess.cxx
+++ b/sw/source/core/text/guess.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: guess.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tl $ $Date: 2000-10-27 12:08:48 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,12 +89,12 @@
 #include <viewsh.hxx>
 #endif
 
-#ifndef _COM_SUN_STAR_TEXT_BREAKTYPE_HPP_
-#include <com/sun/star/text/BreakType.hpp>
+#ifndef _COM_SUN_STAR_I18N_BREAKTYPE_HPP_
+#include <com/sun/star/i18n/BreakType.hpp>
 #endif
 
 using namespace ::com::sun::star::uno;
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 using namespace ::com::sun::star::linguistic2;
 
 inline sal_Bool IsDelim( const xub_Unicode cCh )
diff --git a/sw/source/core/text/itratr.cxx b/sw/source/core/text/itratr.cxx
index 693f63c62266..06552cd654a8 100644
--- a/sw/source/core/text/itratr.cxx
+++ b/sw/source/core/text/itratr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itratr.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: ama $ $Date: 2000-09-27 11:50:18 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -81,8 +81,8 @@
 #ifndef _SV_SVAPP_HXX
 #include <vcl/svapp.hxx>
 #endif
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_
-#include <com/sun/star/text/ScriptType.hdl>
+#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
+#include <com/sun/star/i18n/ScriptType.hdl>
 #endif
 
 #ifndef _FMTANCHR_HXX //autogen
@@ -161,7 +161,7 @@
 #include <fmtsrnd.hxx>
 #endif
 
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 
 /*************************************************************************
  *                      SwAttrIter::Chg()
diff --git a/sw/source/core/text/itrform2.cxx b/sw/source/core/text/itrform2.cxx
index cf7b97a60129..522a9300c765 100644
--- a/sw/source/core/text/itrform2.cxx
+++ b/sw/source/core/text/itrform2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: itrform2.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: ama $ $Date: 2000-11-14 08:21:35 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 
 #pragma hdrstop
 
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_
-#include <com/sun/star/text/ScriptType.hdl>
+#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
+#include <com/sun/star/i18n/ScriptType.hdl>
 #endif
 #ifndef _TXATBASE_HXX //autogen
 #include <txatbase.hxx>
@@ -150,7 +150,7 @@
 #endif
 #endif
 
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 
 #define MAX_TXTPORLEN 300
 
diff --git a/sw/source/core/text/porfld.cxx b/sw/source/core/text/porfld.cxx
index 81d35d593905..1ae85a1011a5 100644
--- a/sw/source/core/text/porfld.cxx
+++ b/sw/source/core/text/porfld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: porfld.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ama $ $Date: 2000-09-29 13:54:25 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -69,8 +69,8 @@
 #include <hintids.hxx>
 #endif
 
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_
-#include <com/sun/star/text/ScriptType.hdl>
+#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
+#include <com/sun/star/i18n/ScriptType.hdl>
 #endif
 
 #ifndef _GRAPH_HXX //autogen
@@ -116,10 +116,14 @@
 #ifndef _DOC_HXX
 #include <doc.hxx>
 #endif
-#include "breakit.hxx"
-#include "porrst.hxx"
+#ifndef _BREAKIT_HXX
+#include <breakit.hxx>
+#endif
+#ifndef _PORRST_HXX
+#include <porrst.hxx>
+#endif
 
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 
 /*************************************************************************
  *                      class SwFldPortion
diff --git a/sw/source/core/text/redlnitr.cxx b/sw/source/core/text/redlnitr.cxx
index 487720060cc6..a52713e987f3 100644
--- a/sw/source/core/text/redlnitr.cxx
+++ b/sw/source/core/text/redlnitr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: redlnitr.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: ama $ $Date: 2000-09-29 13:55:44 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,23 +73,46 @@
 #ifndef _SHL_HXX
 #include <tools/shl.hxx>
 #endif
-#ifndef _COM_SUN_STAR_TEXT_SCRIPTTYPE_HDL_
-#include <com/sun/star/text/ScriptType.hdl>
+#ifndef _COM_SUN_STAR_I18N_SCRIPTTYPE_HDL_
+#include <com/sun/star/i18n/ScriptType.hdl>
 #endif
 
-#include "swmodule.hxx"
-
-#include "redline.hxx"      // SwRedline
-#include "txtatr.hxx"       // SwTxt ...
-#include "docary.hxx"       // SwRedlineTbl
-#include "itratr.hxx"       // SwAttrIter
-#include "ndtxt.hxx"        // SwTxtNode
-#include "swfntcch.hxx"     // SwFontAccess
-#include "doc.hxx"          // SwDoc
-#include "txatbase.hxx"     // SwTxtAttr
-#include "rootfrm.hxx"
-#include "frmsh.hxx"
-#include "breakit.hxx"
+#ifndef _SWMODULE_HXX
+#include <swmodule.hxx>
+#endif
+#ifndef _REDLINE_HXX
+#include <redline.hxx>      // SwRedline
+#endif
+#ifndef _TXTATR_HXX
+#include <txtatr.hxx>       // SwTxt ...
+#endif
+#ifndef _DOCARY_HXX
+#include <docary.hxx>       // SwRedlineTbl
+#endif
+#ifndef _ITRATR_HXX
+#include <itratr.hxx>       // SwAttrIter
+#endif
+#ifndef _NDTXT_HXX
+#include <ndtxt.hxx>        // SwTxtNode
+#endif
+#ifndef _SWFNTCCH_HXX
+#include <swfntcch.hxx>     // SwFontAccess
+#endif
+#ifndef _DOC_HXX
+#include <doc.hxx>          // SwDoc
+#endif
+#ifndef _TXATBASE_HXX
+#include <txatbase.hxx>     // SwTxtAttr
+#endif
+#ifndef _ROOTFRM_HXX
+#include <rootfrm.hxx>
+#endif
+#ifndef _FRMSH_HXX
+#include <frmsh.hxx>
+#endif
+#ifndef _BREAKIT_HXX
+#include <breakit.hxx>
+#endif
 
 //////////////////////////
 
@@ -107,11 +130,14 @@
 #ifndef _APP_HXX //autogen
 #include <vcl/svapp.hxx>
 #endif
+#ifndef _REDLNITR_HXX
+#include <redlnitr.hxx>
+#endif
+#ifndef _EXTINPUT_HXX
+#include <extinput.hxx>
+#endif
 
-#include "redlnitr.hxx"
-#include "extinput.hxx"
-
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 
 /*************************************************************************
  *                      SwAttrIter::CtorInit()
diff --git a/sw/source/core/text/txthyph.cxx b/sw/source/core/text/txthyph.cxx
index a8f410f873a5..0968ddd2eb4e 100644
--- a/sw/source/core/text/txthyph.cxx
+++ b/sw/source/core/text/txthyph.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txthyph.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tl $ $Date: 2000-10-27 12:12:13 $
+ *  last change: $Author: jp $ $Date: 2000-11-20 16:27:07 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,8 +72,8 @@
 #ifndef _UNO_LINGU_HXX
 #include <svx/unolingu.hxx>
 #endif
-#ifndef _COM_SUN_STAR_TEXT_WORDTYPE_HPP_
-#include <com/sun/star/text/WordType.hpp>
+#ifndef _COM_SUN_STAR_I18N_WORDTYPE_HPP_
+#include <com/sun/star/i18n/WordType.hpp>
 #endif
 
 #ifndef _VIEWOPT_HXX
@@ -119,7 +119,7 @@ using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 using namespace ::com::sun::star::beans;
 using namespace ::com::sun::star::linguistic2;
-using namespace ::com::sun::star::text;
+using namespace ::com::sun::star::i18n;
 
 /*************************************************************************
  *                      SwTxtFormatInfo::HyphWord()