replaced International with IntlWrapper

22 files changed, 135 insertions, 124 deletions

diff --git a/sw/inc/fchrfmt.hxx b/sw/inc/fchrfmt.hxx
index f0e4cd6198..ae69a0836e 100644
--- a/sw/inc/fchrfmt.hxx
+++ b/sw/inc/fchrfmt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fchrfmt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-03-20 10:50:20 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 #endif
 
 class SwCharFmt;
-class International;
+class IntlWrapper;
 
 // ATT_CHARFMT *********************************************
 
@@ -97,7 +97,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/fmtanchr.hxx b/sw/inc/fmtanchr.hxx
index 8b257d0092..fc28026cb9 100644
--- a/sw/inc/fmtanchr.hxx
+++ b/sw/inc/fmtanchr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtanchr.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,7 +75,7 @@
 #endif
 
 struct SwPosition;
-class International;
+class IntlWrapper;
 #define IVER_FMTANCHOR_LONGIDX ((USHORT)1)
 
 //FlyAnchor, Anker des Freifliegenden Rahmen ----
@@ -105,7 +105,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			GetVersion( USHORT nFFVer ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
diff --git a/sw/inc/fmtclbl.hxx b/sw/inc/fmtclbl.hxx
index 2ba00c19f4..9d9f7eebd7 100644
--- a/sw/inc/fmtclbl.hxx
+++ b/sw/inc/fmtclbl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtclbl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,7 @@
 #include <format.hxx>
 #endif
 
-class International;
+class IntlWrapper;
 
 class SwFmtNoBalancedColumns : public SfxBoolItem
 {
@@ -88,7 +88,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 */	virtual USHORT			 GetVersion( USHORT nFFVer ) const;
 };
 
diff --git a/sw/inc/fmtclds.hxx b/sw/inc/fmtclds.hxx
index 54213c6e08..608615746b 100644
--- a/sw/inc/fmtclds.hxx
+++ b/sw/inc/fmtclds.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtclds.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,7 +156,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/fmtcnct.hxx b/sw/inc/fmtcnct.hxx
index afbfe3bb70..18e61e2ae6 100644
--- a/sw/inc/fmtcnct.hxx
+++ b/sw/inc/fmtcnct.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtcnct.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@
 
 
 class SwFlyFrmFmt;
-class International;
+class IntlWrapper;
 
 //Verbindung (Textfluss) zwischen zwei FlyFrms
 
@@ -103,7 +103,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
 
diff --git a/sw/inc/fmteiro.hxx b/sw/inc/fmteiro.hxx
index fa851b61a1..4d36952a38 100644
--- a/sw/inc/fmteiro.hxx
+++ b/sw/inc/fmteiro.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmteiro.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,7 @@
 #include <format.hxx>
 #endif
 
-class International;
+class IntlWrapper;
 
 class SwFmtEditInReadonly : public SfxBoolItem
 {
@@ -88,7 +88,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
 };
 
diff --git a/sw/inc/fmtfsize.hxx b/sw/inc/fmtfsize.hxx
index b1f92463de..3f83a6ee10 100644
--- a/sw/inc/fmtfsize.hxx
+++ b/sw/inc/fmtfsize.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtfsize.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-03-20 10:50:20 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@
 #include <format.hxx>
 #endif
 
-class International;
+class IntlWrapper;
 
 //Die Framesize ---------------------------------
 
@@ -123,7 +123,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index af598e7714..cf91f71611 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtftntx.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -123,7 +123,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 
     inline BOOL IsAtEnd() const { return FTNEND_ATPGORDOCEND != GetValue(); }
 
diff --git a/sw/inc/fmthdft.hxx b/sw/inc/fmthdft.hxx
index 9acd564bbd..9e7167021a 100644
--- a/sw/inc/fmthdft.hxx
+++ b/sw/inc/fmthdft.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmthdft.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,7 +75,7 @@
 #endif
 
 class SwFrmFmt;
-class International;
+class IntlWrapper;
 
 
 //Kopfzeile, fuer Seitenformate
@@ -103,7 +103,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     const SwFrmFmt *GetHeaderFmt() const { return (SwFrmFmt*)pRegisteredIn; }
           SwFrmFmt *GetHeaderFmt()		 { return (SwFrmFmt*)pRegisteredIn; }
@@ -137,7 +137,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     const SwFrmFmt *GetFooterFmt() const { return (SwFrmFmt*)pRegisteredIn; }
           SwFrmFmt *GetFooterFmt()		 { return (SwFrmFmt*)pRegisteredIn; }
diff --git a/sw/inc/fmtinfmt.hxx b/sw/inc/fmtinfmt.hxx
index c60d543672..c04c3c3088 100644
--- a/sw/inc/fmtinfmt.hxx
+++ b/sw/inc/fmtinfmt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtinfmt.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 
 class SvxMacro;
 class SvxMacroTableDtor;
-class International;
+class IntlWrapper;
 // ATT_INETFMT *********************************************
 
 class SwFmtINetFmt: public SfxPoolItem
@@ -101,7 +101,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 
     virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
diff --git a/sw/inc/fmtline.hxx b/sw/inc/fmtline.hxx
index 48a47cfabd..af72ec2169 100644
--- a/sw/inc/fmtline.hxx
+++ b/sw/inc/fmtline.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtline.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 #ifndef _FORMAT_HXX //autogen
 #include <format.hxx>
 #endif
-class International;
+class IntlWrapper;
 
 class SwFmtLineNumber: public SfxPoolItem
 {
@@ -91,7 +91,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/fmtlsplt.hxx b/sw/inc/fmtlsplt.hxx
index 4168920ffd..4862281aff 100644
--- a/sw/inc/fmtlsplt.hxx
+++ b/sw/inc/fmtlsplt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtlsplt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-03-20 10:50:20 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -70,7 +70,7 @@
 #ifndef _FORMAT_HXX //autogen
 #include <format.hxx>
 #endif
-class International;
+class IntlWrapper;
 
 class SwFmtLayoutSplit : public SfxBoolItem
 {
@@ -85,7 +85,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
 
     virtual BOOL        importXML( const ::rtl::OUString& rValue,USHORT,
diff --git a/sw/inc/fmtornt.hxx b/sw/inc/fmtornt.hxx
index 5f2fd3b6c1..6af81ec894 100644
--- a/sw/inc/fmtornt.hxx
+++ b/sw/inc/fmtornt.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtornt.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-03-20 10:50:20 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -77,7 +77,7 @@
 #include <orntenum.hxx>
 #endif
 
-class International;
+class IntlWrapper;
 
 #define IVER_VERTORIENT_REL ((USHORT)0x0001)
 
@@ -102,7 +102,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
@@ -151,7 +151,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
 
diff --git a/sw/inc/fmtpdsc.hxx b/sw/inc/fmtpdsc.hxx
index c2029ec3ce..f1020c43cd 100644
--- a/sw/inc/fmtpdsc.hxx
+++ b/sw/inc/fmtpdsc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtpdsc.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-03-20 10:50:20 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -78,7 +78,7 @@
 class SwPageDesc;
 class SwHistory;
 class SwPaM;
-class International;
+class IntlWrapper;
 
 //Pagedescriptor
 //Client vom SwPageDesc der durch das Attribut "beschrieben" wird.
@@ -114,7 +114,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			GetVersion( USHORT nFFVer ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/fmtruby.hxx b/sw/inc/fmtruby.hxx
index 5ad7f038a9..e29acb0280 100644
--- a/sw/inc/fmtruby.hxx
+++ b/sw/inc/fmtruby.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtruby.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-23 20:20:23 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -98,7 +98,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 
     virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
diff --git a/sw/inc/fmtsrnd.hxx b/sw/inc/fmtsrnd.hxx
index a075d7bb47..bf775c5703 100644
--- a/sw/inc/fmtsrnd.hxx
+++ b/sw/inc/fmtsrnd.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtsrnd.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -71,7 +71,7 @@
 #include <svtools/eitem.hxx>
 #endif
 
-class International;
+class IntlWrapper;
 
 //SwFmtSurround, wie soll sich der ---------------
 //	Dokumentinhalt unter dem Rahmen verhalten ---
@@ -107,7 +107,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			GetVersion( USHORT nFFVer ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/fmturl.hxx b/sw/inc/fmturl.hxx
index eceb87aea6..d13a567e34 100644
--- a/sw/inc/fmturl.hxx
+++ b/sw/inc/fmturl.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmturl.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -73,7 +73,7 @@
 #endif
 
 class ImageMap;
-class International;
+class IntlWrapper;
 
 // URL, ServerMap und ClientMap
 
@@ -102,7 +102,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			GetVersion( USHORT nFFVer ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/inc/grfatr.hxx b/sw/inc/grfatr.hxx
index c08a6232fc..aff5cac879 100644
--- a/sw/inc/grfatr.hxx
+++ b/sw/inc/grfatr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: grfatr.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-12-14 11:46:54 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -125,7 +125,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
@@ -182,7 +182,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
                                             BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal,
@@ -206,7 +206,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 };
 
 class SwContrastGrf : public SfxInt16Item
@@ -223,7 +223,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 };
 
 class SwChannelGrf : public SfxInt16Item
@@ -240,7 +240,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 };
 
 class SwChannelRGrf : public SwChannelGrf
@@ -296,7 +296,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal,
                                             BYTE nMemberId = 0 ) const;
@@ -322,7 +322,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
 };
 
 class SwTransparencyGrf : public SfxByteItem
@@ -339,7 +339,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* pIntl = 0 ) const;
+                                    const IntlWrapper* pIntl = 0 ) const;
     virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
     virtual	BOOL			PutValue( const com::sun::star::uno::Any& rVal,
@@ -363,7 +363,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     virtual	BOOL        	QueryValue( com::sun::star::uno::Any& rVal,
                                         BYTE nMemberId = 0 ) const;
diff --git a/sw/inc/paratr.hxx b/sw/inc/paratr.hxx
index 76e18ad6b4..1a953b2b5c 100644
--- a/sw/inc/paratr.hxx
+++ b/sw/inc/paratr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: paratr.hxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ama $ $Date: 2001-04-10 14:13:12 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:32:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -84,7 +84,7 @@
 #endif
 
 class SwCharFmt;
-class International;
+class IntlWrapper;
 
 /*************************************************************************
 |*    class		SwFmtDrop
@@ -122,7 +122,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0) const;
+                                    const IntlWrapper*    pIntl = 0) const;
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
@@ -175,7 +175,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
 
     virtual BOOL        importXML( const ::rtl::OUString& rValue,USHORT,
@@ -224,7 +224,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
     virtual USHORT			 GetVersion( USHORT nFFVer ) const;
 
     virtual	BOOL        	 QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId ) const;
diff --git a/sw/source/ui/inc/uiitems.hxx b/sw/source/ui/inc/uiitems.hxx
index 8d14a253ed..a93836bd6a 100644
--- a/sw/source/ui/inc/uiitems.hxx
+++ b/sw/source/ui/inc/uiitems.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uiitems.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-04-27 12:04:46 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:33:31 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -67,7 +67,7 @@
 #include <svtools/intitem.hxx>
 #endif
 class SwNumRule;
-class International;
+class IntlWrapper;
 
 /*--------------------------------------------------------------------
     Beschreibung: Container fuer FootNote
@@ -88,7 +88,7 @@ public:
                                     SfxMapUnit eCoreMetric,
                                     SfxMapUnit ePresMetric,
                                     String &rText,
-                                    const International* 	pIntl = 0 ) const;
+                                    const IntlWrapper*    pIntl = 0 ) const;
 
     virtual BOOL             QueryValue( com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 ) const;
     virtual	BOOL			 PutValue( const com::sun::star::uno::Any& rVal, BYTE nMemberId = 0 );
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index a8d58eaa43..f12de484cd 100644
--- a/sw/source/ui/utlui/attrdesc.cxx
+++ b/sw/source/ui/utlui/attrdesc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: attrdesc.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:30 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:33:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,6 +79,13 @@
 #include <goodies/grfmgr.hxx>
 #endif
 
+#ifndef _UNOTOOLS_INTLWRAPPER_HXX
+#include <unotools/intlwrapper.hxx>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+
 #ifndef _FMTANCHR_HXX //autogen
 #include <fmtanchr.hxx>
 #endif
@@ -169,7 +176,8 @@ static sal_Char __READONLY_DATA sKomma[] = ", ";
     if( Count() )
     {
         SfxItemIter aIter( *this );
-        const International& rInt = Application::GetAppInternational();
+        const IntlWrapper rInt( ::comphelper::getProcessServiceFactory(),
+            Application::GetAppInternational().GetLanguage() );
         while( TRUE )
         {
 #if SUPD>546
@@ -210,7 +218,7 @@ SfxItemPresentation SwFmtCharFmt::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -248,7 +256,7 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -268,7 +276,7 @@ SfxItemPresentation SwFmtINetFmt::GetPresentation
 
 SfxItemPresentation SwFmtRuby::GetPresentation( SfxItemPresentation ePres,
                             SfxMapUnit eCoreMetric, SfxMapUnit ePresMetric,
-                            String &rText, const International* pIntl ) const
+                            String &rText, const IntlWrapper* pIntl ) const
 {
     switch ( ePres )
     {
@@ -296,7 +304,7 @@ SfxItemPresentation SwFmtDrop::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     rText.Erase();
@@ -339,7 +347,7 @@ SfxItemPresentation SwRegisterItem::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     XubString& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -369,7 +377,7 @@ SfxItemPresentation SwNumRuleItem::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     XubString& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -403,7 +411,7 @@ SfxItemPresentation SwFmtFrmSize::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -463,7 +471,7 @@ SfxItemPresentation SwFmtHeader::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -492,7 +500,7 @@ SfxItemPresentation SwFmtFooter::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -518,7 +526,7 @@ SfxItemPresentation SwFmtSurround::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -576,7 +584,7 @@ SfxItemPresentation SwFmtVertOrient::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -635,7 +643,7 @@ SfxItemPresentation SwFmtHoriOrient::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -693,7 +701,7 @@ SfxItemPresentation SwFmtAnchor::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -732,7 +740,7 @@ SfxItemPresentation SwFmtPageDesc::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -763,7 +771,7 @@ SfxItemPresentation SwFmtCol::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -807,7 +815,7 @@ SfxItemPresentation SwFmtURL::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     rText.Erase();
@@ -850,7 +858,7 @@ SfxItemPresentation SwFmtEditInReadonly::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     rText.Erase();
@@ -877,7 +885,7 @@ SfxItemPresentation SwFmtLayoutSplit::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -902,7 +910,7 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -949,7 +957,7 @@ SfxItemPresentation SwFmtChain::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 		pIntl
+    const IntlWrapper*        pIntl
 )	const
 {
     switch ( ePres )
@@ -985,7 +993,7 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 	pIntl
+    const IntlWrapper*    pIntl
 )	const
 {
     switch ( ePres )
@@ -1016,7 +1024,7 @@ SfxItemPresentation SwFmtLineNumber::GetPresentation
 
 SfxItemPresentation SwMirrorGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String& rText, const International* pIntl )	const
+    String& rText, const IntlWrapper* pIntl ) const
 {
     switch ( ePres )
     {
@@ -1051,7 +1059,7 @@ SfxItemPresentation SwMirrorGrf::GetPresentation(
 
 SfxItemPresentation SwRotationGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1074,7 +1082,7 @@ SfxItemPresentation SwRotationGrf::GetPresentation(
 
 SfxItemPresentation SwLuminanceGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1097,7 +1105,7 @@ SfxItemPresentation SwLuminanceGrf::GetPresentation(
 
 SfxItemPresentation SwContrastGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1120,7 +1128,7 @@ SfxItemPresentation SwContrastGrf::GetPresentation(
 
 SfxItemPresentation SwChannelGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1156,7 +1164,7 @@ SfxItemPresentation SwChannelGrf::GetPresentation(
 
 SfxItemPresentation SwGammaGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1179,7 +1187,7 @@ SfxItemPresentation SwGammaGrf::GetPresentation(
 
 SfxItemPresentation SwInvertGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     rText.Erase();
     switch( ePres )
@@ -1202,7 +1210,7 @@ SfxItemPresentation SwInvertGrf::GetPresentation(
 
 SfxItemPresentation SwTransparencyGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     switch( ePres )
     {
@@ -1225,7 +1233,7 @@ SfxItemPresentation SwTransparencyGrf::GetPresentation(
 
 SfxItemPresentation SwDrawModeGrf::GetPresentation(
     SfxItemPresentation ePres, SfxMapUnit eCoreUnit, SfxMapUnit ePresUnit,
-    String &rText, const International* pIntl) const
+    String &rText, const IntlWrapper* pIntl) const
 {
     rText.Erase();
     switch( ePres )
@@ -1257,6 +1265,9 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation(
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.4  2001/02/23 12:45:30  os
+      Complete use of DefaultNumbering component
+
       Revision 1.3  2000/11/16 21:30:40  jp
       SwFmt2Lines moved to SVX and renamed
 
diff --git a/sw/source/ui/utlui/uiitems.cxx b/sw/source/ui/utlui/uiitems.cxx
index 931cd39835..f18abb0fc7 100644
--- a/sw/source/ui/utlui/uiitems.cxx
+++ b/sw/source/ui/utlui/uiitems.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uiitems.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-04-27 12:04:46 $
+ *  last change: $Author: er $ $Date: 2001-05-13 03:33:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,7 +138,7 @@ SfxItemPresentation  SwPageFtnInfoItem::GetPresentation
     SfxMapUnit			eCoreUnit,
     SfxMapUnit			ePresUnit,
     String& 			rText,
-    const International* 	pIntl
+    const IntlWrapper*    pIntl
 )	const
 {
     switch ( ePres )