extended numbering types available

14 files changed, 217 insertions, 568 deletions

diff --git a/sw/source/ui/dialog/regionsw.cxx b/sw/source/ui/dialog/regionsw.cxx
index d0cd0b77c624..728bc3a14ccc 100644
--- a/sw/source/ui/dialog/regionsw.cxx
+++ b/sw/source/ui/dialog/regionsw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regionsw.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 15:05:32 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:07:11 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2020,7 +2020,7 @@ SwSectionFtnEndTabPage::SwSectionFtnEndTabPage( Window *pParent,
     aFtnNtAtTextEndCB   ( this, SW_RES( CB_FTN_AT_TXTEND ) ),
     aFtnNtNumCB         ( this, SW_RES( CB_FTN_NUM ) ),
     aFtnNtNumFmtCB      ( this, SW_RES( CB_FTN_NUM_FMT ) ),
-    aFtnNumViewBox      ( this, SW_RES( LB_FTN_NUMVIEW  )),
+    aFtnNumViewBox      ( this, SW_RES( LB_FTN_NUMVIEW  ), INSERT_NUM_EXTENDED_TYPES),
     aFtnOffsetLbl       ( this, SW_RES( FT_FTN_OFFSET   )),
     aFtnOffsetFld       ( this, SW_RES( FLD_FTN_OFFSET   )),
     aFtnPrefixFT        ( this, SW_RES( FT_FTN_PREFIX   )),
@@ -2077,7 +2077,7 @@ BOOL SwSectionFtnEndTabPage::FillItemSet( SfxItemSet& rSet )
     switch( aFtn.GetValue() )
     {
     case FTNEND_ATTXTEND_OWNNUMANDFMT:
-        aFtn.SetNumType( GetNumType( aFtnNumViewBox.GetSelectEntryPos() ));
+        aFtn.SetNumType( aFtnNumViewBox.GetSelectedNumberingType() );
         aFtn.SetPrefix( aFtnPrefixED.GetText() );
         aFtn.SetSuffix( aFtnSuffixED.GetText() );
         // no break;
@@ -2120,7 +2120,7 @@ void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
     CheckBox *pNtAtTextEndCB, *pNtNumCB, *pNtNumFmtCB;
     FixedText*pPrefixFT, *pSuffixFT;
     Edit *pPrefixED, *pSuffixED;
-    ListBox *pNumViewBox;
+    SwNumberingTypeListBox *pNumViewBox;
     FixedText* pOffsetTxt;
     NumericField *pOffsetFld;
 
@@ -2168,7 +2168,7 @@ void SwSectionFtnEndTabPage::ResetState( BOOL bFtn,
         // no break;
     }
 
-    pNumViewBox->SelectEntryPos( GetNumPos( rAttr.GetNumType() ));
+    pNumViewBox->SelectNumberingType( rAttr.GetNumType() );
     pOffsetFld->SetValue( rAttr.GetOffset() + 1 );
     pPrefixED->SetText( rAttr.GetPrefix() );
     pSuffixED->SetText( rAttr.GetSuffix() );
@@ -2216,7 +2216,7 @@ IMPL_LINK( SwSectionFtnEndTabPage, FootEndHdl, CheckBox *, pBox )
                     &aFtnNtNumFmtCB == pBox ;
 
     CheckBox *pNumBox, *pNumFmtBox, *pEndBox;
-    ListBox* pNumViewBox;
+    SwNumberingTypeListBox* pNumViewBox;
     FixedText* pOffsetTxt;
     NumericField *pOffsetFld;
     FixedText*pPrefixFT, *pSuffixFT;
@@ -2308,6 +2308,9 @@ void SwSectionPropertyTabDialog::PageCreated( USHORT nId, SfxTabPage &rPage )
 
 /*-------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/02/23 15:05:32  os
+    Issue #413#: use unquoted URLs
+
     Revision 1.3  2001/02/16 09:31:07  mtg
     Added XML support for Section Lists
 
diff --git a/sw/source/ui/dialog/regionsw.src b/sw/source/ui/dialog/regionsw.src
index a577f3513948..7d020b6653f7 100644
--- a/sw/source/ui/dialog/regionsw.src
+++ b/sw/source/ui/dialog/regionsw.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regionsw.src,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 07:57:53 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:10:47 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1387,17 +1387,6 @@ TabPage TP_SECTION_FTNENDNOTES
         TabStop = TRUE ;
         Group = TRUE ;
         DropDown = TRUE ;
-        CurPos = 0 ;
-        StringList =
-        {
-            "A, B, C" ;
-            "a, b, c" ;
-            "I, II, III" ;
-            "i, ii, iii" ;
-            "1, 2, 3" ;
-            "A, .., AA, .., AAA" ;
-            "a, .., aa, .., aaa" ;
-        };
     };
     FixedText FT_FTN_SUFFIX
     {
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 868f2fef0a8f..5eb95c842af1 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldmgr.cxx,v $
  *
- *  $Revision: 1.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: jp $ $Date: 2001-02-21 14:47:06 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -96,6 +96,15 @@
 #ifndef _COM_SUN_STAR_BEANS_XPROPERTYSET_HPP_
 #include <com/sun/star/beans/XPropertySet.hpp>
 #endif
+#ifndef _COM_SUN_STAR_TEXT_XDEFAULTNUMBERINGPROVIDER_HPP_
+#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
+#endif
+#ifndef _COM_SUN_STAR_TEXT_XNUMBERINGTYPEINFO_HPP_
+#include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#endif
+#ifndef _COM_SUN_STAR_STYLE_NUMBERINGTYPE_HPP_
+#include <com/sun/star/style/NumberingType.hpp>
+#endif
 #ifndef _COMPHELPER_PROCESSFACTORY_HXX_
 #include <comphelper/processfactory.hxx>
 #endif
@@ -234,6 +243,8 @@ using namespace com::sun::star::sdb;
 using namespace com::sun::star::sdbc;
 using namespace com::sun::star::sdbcx;
 using namespace com::sun::star::beans;
+using namespace com::sun::star::text;
+using namespace com::sun::star::style;
 #define C2U(cChar) rtl::OUString::createFromAscii(cChar)
 
 /*--------------------------------------------------------------------
@@ -836,6 +847,28 @@ USHORT SwFldMgr::GetFormatCount(USHORT nTypeId, BOOL bIsText, BOOL bHtmlMode) co
             case FMT_SETVAR_BEGIN:  return VF_COUNT;
             case FMT_USERVAR_BEGIN: return VF_USR_COUNT;
             case FMT_DBFLD_BEGIN:   return VF_DB_COUNT;
+            case FMT_NUM_BEGIN:
+            {
+                USHORT nCount = (USHORT)(nEnd - nStart);
+                GetNumberingInfo();
+                if(xNumberingInfo.is())
+                {
+                    Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+                    const sal_Int16* pTypes = aTypes.getConstArray();
+                    for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+                    {
+                        sal_Int16 nCurrent = pTypes[nType];
+                        //skip all values below or equal to CHARS_LOWER_LETTER_N
+                        if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+                        {
+                            nCount += aTypes.getLength() - nType;
+                            break;
+                        }
+                    }
+                }
+                return nCount;
+            }
+
         }
         return (USHORT)(nEnd - nStart);
     }
@@ -864,7 +897,27 @@ String SwFldMgr::GetFormatStr(USHORT nTypeId, ULONG nFormatId) const
     if (nTypeId == TYP_FILENAMEFLD)
         nFormatId &= ~FF_FIXED;     // Fixed-Flag ausmaskieren
 
-    aRet = SW_RESSTR((USHORT)(nStart + nFormatId));
+    if((nStart + nFormatId) < aSwFlds[nPos].nFmtEnd)
+        aRet = SW_RESSTR((USHORT)(nStart + nFormatId));
+    else if( FMT_NUM_BEGIN == nStart)
+    {
+        if(xNumberingInfo.is())
+        {
+            Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+            const sal_Int16* pTypes = aTypes.getConstArray();
+            for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+            {
+                sal_Int16 nCurrent = pTypes[nType];
+                if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+                {
+                    sal_Int32 nOffset = nFormatId - (aSwFlds[nPos].nFmtEnd - nStart);
+                    if(aTypes.getLength() > (nOffset + nType))
+                        aRet = xNumberingInfo->getNumberingIdentifier( pTypes[nOffset + nType] );
+                    break;
+                }
+            }
+        }
+    }
 
     return aRet;
 }
@@ -895,20 +948,45 @@ USHORT SwFldMgr::GetFormatId(USHORT nTypeId, ULONG nFormatId) const
     case TYP_DBSETNUMBERFLD:
     case TYP_SEQFLD:
     case TYP_GETREFPAGEFLD:
-        switch( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId )
+    {
+        USHORT nPos = GetPos( nTypeId );
+        ULONG nBegin = aSwFlds[ nPos ].nFmtBegin;
+        ULONG nEnd = aSwFlds[nPos].nFmtEnd;
+        if((nBegin + nFormatId) < nEnd)
         {
-        case FMT_NUM_ABC:               nId = SVX_NUM_CHARS_UPPER_LETTER;   break;
-        case FMT_NUM_SABC:              nId = SVX_NUM_CHARS_LOWER_LETTER;   break;
-        case FMT_NUM_ROMAN:             nId = SVX_NUM_ROMAN_UPPER;          break;
-        case FMT_NUM_SROMAN:            nId = SVX_NUM_ROMAN_LOWER;          break;
-        case FMT_NUM_ARABIC:            nId = SVX_NUM_ARABIC;               break;
-        case FMT_NUM_PAGEDESC:          nId = SVX_NUM_PAGEDESC;             break;
-        case FMT_NUM_PAGESPECIAL:       nId = SVX_NUM_CHAR_SPECIAL;         break;
-        case FMT_NUM_ABC_N:             nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
-        case FMT_NUM_SABC_N:            nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+            switch( nBegin + nFormatId )
+            {
+            case FMT_NUM_ABC:               nId = SVX_NUM_CHARS_UPPER_LETTER;   break;
+            case FMT_NUM_SABC:              nId = SVX_NUM_CHARS_LOWER_LETTER;   break;
+            case FMT_NUM_ROMAN:             nId = SVX_NUM_ROMAN_UPPER;          break;
+            case FMT_NUM_SROMAN:            nId = SVX_NUM_ROMAN_LOWER;          break;
+            case FMT_NUM_ARABIC:            nId = SVX_NUM_ARABIC;               break;
+            case FMT_NUM_PAGEDESC:          nId = SVX_NUM_PAGEDESC;             break;
+            case FMT_NUM_PAGESPECIAL:       nId = SVX_NUM_CHAR_SPECIAL;         break;
+            case FMT_NUM_ABC_N:             nId = SVX_NUM_CHARS_UPPER_LETTER_N; break;
+            case FMT_NUM_SABC_N:            nId = SVX_NUM_CHARS_LOWER_LETTER_N; break;
+            }
         }
-        break;
-
+        else if(xNumberingInfo.is())
+        {
+            Sequence<sal_Int16> aTypes = xNumberingInfo->getSupportedNumberingTypes();
+            const sal_Int16* pTypes = aTypes.getConstArray();
+            for(sal_Int32 nType = 0; nType < aTypes.getLength(); nType++)
+            {
+                sal_Int16 nCurrent = pTypes[nType];
+                //skip all values below or equal to CHARS_LOWER_LETTER_N
+                if(nCurrent > NumberingType::CHARS_LOWER_LETTER_N)
+                {
+                    sal_Int32 nOffset = nFormatId + nBegin - aSwFlds[nPos].nFmtEnd;
+                    if((nOffset + nType) < aTypes.getLength())
+                    {
+                        nId = pTypes[nOffset + nType];
+                    }
+                }
+            }
+        }
+    }
+    break;
     case TYP_DDEFLD:
         switch ( aSwFlds[ GetPos( nTypeId ) ].nFmtBegin + nFormatId )
         {
@@ -2044,5 +2122,19 @@ Reference<XNameAccess> SwFldMgr::GetDBContext()
     }
     return xDBContext;
 }
+/* -----------------------------01.03.01 16:46--------------------------------
 
-
+ ---------------------------------------------------------------------------*/
+Reference<XNumberingTypeInfo> SwFldMgr::GetNumberingInfo() const
+{
+    if(!xNumberingInfo.is())
+    {
+        Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+        Reference < XInterface > xI = xMSF->createInstance(
+            ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
+        Reference<XDefaultNumberingProvider> xDefNum(xI, UNO_QUERY);
+        DBG_ASSERT(xDefNum.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"")
+        ((SwFldMgr*)this)->xNumberingInfo = Reference<XNumberingTypeInfo>(xDefNum, UNO_QUERY);
+    }
+    return xNumberingInfo;
+}
diff --git a/sw/source/ui/inc/fldmgr.hxx b/sw/source/ui/inc/fldmgr.hxx
index a9794130d051..2d379b09ea6e 100644
--- a/sw/source/ui/inc/fldmgr.hxx
+++ b/sw/source/ui/inc/fldmgr.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldmgr.hxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:27:36 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -75,9 +75,14 @@
 #ifndef _COM_SUN_STAR_UNO_REFERENCE_H_
 #include <com/sun/star/uno/Reference.h>
 #endif
-namespace com{namespace sun{namespace star{namespace container{
-    class XNameAccess;
-}}}}
+namespace com{namespace sun{namespace star{
+    namespace container{
+        class XNameAccess;
+    }
+    namespace text{
+        class XNumberingTypeInfo;
+    }
+}}}
 
 class SwWrtShell;
 class SwField;
@@ -140,9 +145,9 @@ private:
     USHORT          GetCurrLanguage() const;
 
     com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> xDBContext;
-
     com::sun::star::uno::Reference<com::sun::star::container::XNameAccess> GetDBContext();
-
+    com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> xNumberingInfo;
+    com::sun::star::uno::Reference<com::sun::star::text::XNumberingTypeInfo> GetNumberingInfo()const;
 public:
     SwFldMgr(SwWrtShell* pSh = 0);
     ~SwFldMgr();
diff --git a/sw/source/ui/inc/linenum.hxx b/sw/source/ui/inc/linenum.hxx
index 8e7a40897d41..d218f5fd26ac 100644
--- a/sw/source/ui/inc/linenum.hxx
+++ b/sw/source/ui/inc/linenum.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linenum.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:40 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -80,6 +80,9 @@
 #ifndef _SV_FIELD_HXX //autogen
 #include <vcl/field.hxx>
 #endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
 
 #ifndef _LSTBOX_HXX //autogen
 #include <vcl/lstbox.hxx>
@@ -117,7 +120,7 @@ class SwLineNumberingPage : public SfxTabPage
     FixedText       aCharStyleFT;
     ListBox         aCharStyleLB;
     FixedText       aFormatFT;
-    ListBox         aFormatLB;
+    SwNumberingTypeListBox   aFormatLB;
     FixedText       aPosFT;
     ListBox         aPosLB;
     FixedText       aOffsetFT;
diff --git a/sw/source/ui/inc/misc.hrc b/sw/source/ui/inc/misc.hrc
index 657d6f3e2777..6414fc9f834d 100644
--- a/sw/source/ui/inc/misc.hrc
+++ b/sw/source/ui/inc/misc.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: misc.hrc,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -132,8 +132,9 @@
 #define STR_NUMRULE_UNKNOWN         (RC_MISC_BEGIN + 60)
 #define MN_REDLINE_POPUP            (RC_MISC_BEGIN + 61)
 #define STR_REMOVE_WARNING          (RC_MISC_BEGIN + 62)
+#define STRRES_NUMTYPES             (RC_MISC_BEGIN + 63)
 
-#define MISC_ACT_END                STR_REMOVE_WARNING
+#define MISC_ACT_END                STRRES_NUMTYPES
 
 #if MISC_ACT_END > RC_MISC_END
 #error Resource-Id Ueberlauf in #file, #line
diff --git a/sw/source/ui/inc/outline.hxx b/sw/source/ui/inc/outline.hxx
index 8205e1642270..241ef914d561 100644
--- a/sw/source/ui/inc/outline.hxx
+++ b/sw/source/ui/inc/outline.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outline.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -103,6 +103,9 @@
 #ifndef _NUMPREVW_HXX
 #include <numprevw.hxx>
 #endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
 
 class SwWrtShell;
 class SwTxtFmtColl;
@@ -156,7 +159,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     FixedText       aCollLbl;
     ListBox         aCollBox;
     FixedText       aNumberLbl;
-    ListBox         aNumberBox;
+    SwNumberingTypeListBox  aNumberBox;
     FixedText       aCharFmtFT;
     ListBox         aCharFmtLB;
     FixedText       aAllLevelFT;
@@ -183,7 +186,7 @@ class SwOutlineSettingsTabPage : public SfxTabPage
     DECL_LINK( ToggleComplete, NumericField * );
     DECL_LINK( CollSelect, ListBox * );
     DECL_LINK( CollSelectGetFocus, ListBox * );
-    DECL_LINK( NumberSelect, ListBox * );
+    DECL_LINK( NumberSelect, SwNumberingTypeListBox * );
     DECL_LINK( DelimModify, Edit * );
     DECL_LINK( StartModified, NumericField * );
     DECL_LINK( CharFmtHdl, ListBox * );
diff --git a/sw/source/ui/inc/regionsw.hxx b/sw/source/ui/inc/regionsw.hxx
index d533f689234b..672fa2e89314 100644
--- a/sw/source/ui/inc/regionsw.hxx
+++ b/sw/source/ui/inc/regionsw.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: regionsw.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:41 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,6 +113,9 @@
 #ifndef _FMTCLBL_HXX
 #include <fmtclbl.hxx>
 #endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
 
 class SwWrtShell;
 class EditRegionDlg;
@@ -350,7 +353,7 @@ class SwSectionFtnEndTabPage : public SfxTabPage
     CheckBox        aFtnNtNumFmtCB;
     FixedText       aFtnPrefixFT;
     Edit            aFtnPrefixED;
-    ListBox         aFtnNumViewBox;
+    SwNumberingTypeListBox   aFtnNumViewBox;
     FixedText       aFtnSuffixFT;
     Edit            aFtnSuffixED;
 
@@ -364,7 +367,7 @@ class SwSectionFtnEndTabPage : public SfxTabPage
     CheckBox        aEndNtNumFmtCB;
     FixedText       aEndPrefixFT;
     Edit            aEndPrefixED;
-    ListBox         aEndNumViewBox;
+    SwNumberingTypeListBox   aEndNumViewBox;
     FixedText       aEndSuffixFT;
     Edit            aEndSuffixED;
 
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 881096cb85ce..8e970c46eb4b 100644
--- a/sw/source/ui/misc/docfnote.cxx
+++ b/sw/source/ui/misc/docfnote.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfnote.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -129,26 +129,6 @@
 #endif
 
 
-// Numerierungsformat Umsetzung:
-// ListBox  - Format            - Enum-Wert
-// 0        - A, B, C, ...      - 0
-// 1        - a, b, c, ...      - 1
-// 2        - I, II, III, ...   - 2
-// 3        - i, ii, iii, ...   - 3
-// 4        - 1, 2, 3, ...      - 4
-// 5        - A, .., AA, ..,    - 9
-// 6        - a, .., aa, ..,    - 10
-
-inline USHORT GetNumPos( USHORT n )
-{
-    return SVX_NUM_ARABIC < n ? n - 4 : n;
-}
-
-inline SvxExtNumType GetNumType( USHORT n )
-{
-    return (SvxExtNumType)(4 < n ? n + 4 : n );
-}
-
 SwFootNoteOptionDlg::SwFootNoteOptionDlg( Window *pParent, SwWrtShell &rS ) :
     SfxTabDialog( pParent, SW_RES(DLG_DOC_FOOTNOTE) ),
     rSh( rS )
@@ -193,7 +173,7 @@ SwEndNoteOptionPage::SwEndNoteOptionPage( Window *pParent, BOOL bEN,
                                           const SfxItemSet &rSet ) :
     SfxTabPage( pParent, SW_RES(bEN ? TP_ENDNOTEOPTION : TP_FOOTNOTEOPTION), rSet ),
     aNumTypeFT      (this, ResId( FT_NUMTYPE    )),
-    aNumViewBox     (this, ResId( LB_NUMVIEW    )),
+    aNumViewBox     (this, ResId( LB_NUMVIEW    ), INSERT_NUM_EXTENDED_TYPES),
     aOffsetLbl      (this, ResId( FT_OFFSET )),
     aOffsetFld      (this, ResId( FLD_OFFSET   )),
     aNumCountFT     (this, ResId( FT_NUMCOUNT   )),
@@ -294,7 +274,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
 
         // Numerierung
         // Art
-    aNumViewBox.SelectEntryPos( GetNumPos( pInf->aFmt.GetNumberingType() ));
+    aNumViewBox.SelectNumberingType( pInf->aFmt.GetNumberingType());
     aOffsetFld.SetValue(pInf->nFtnOffset + 1);
     aPrefixED.SetText(pInf->GetPrefix());
     aSuffixED.SetText(pInf->GetSuffix());
@@ -493,7 +473,7 @@ BOOL SwEndNoteOptionPage::FillItemSet( SfxItemSet &rSet )
     SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo();
 
     pInf->nFtnOffset = aOffsetFld.GetValue() -1;
-    pInf->aFmt.SetNumberingType(GetNumType( aNumViewBox.GetSelectEntryPos() ));
+    pInf->aFmt.SetNumberingType(aNumViewBox.GetSelectedNumberingType() );
     pInf->SetPrefix(aPrefixED.GetText());
     pInf->SetSuffix(aSuffixED.GetText());
 
@@ -554,6 +534,9 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.3  2001/02/23 12:45:29  os
+    Complete use of DefaultNumbering component
+
     Revision 1.2  2001/02/09 08:01:42  os
     TabPage size changed
 
diff --git a/sw/source/ui/misc/docfnote.src b/sw/source/ui/misc/docfnote.src
index 366ec48da402..a8c066d5534c 100644
--- a/sw/source/ui/misc/docfnote.src
+++ b/sw/source/ui/misc/docfnote.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfnote.src,v $
  *
- *  $Revision: 1.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 08:01:42 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:08:37 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -203,17 +203,6 @@ TabPage TP_FOOTNOTEOPTION
         TabStop = TRUE ;
         Group = TRUE ;
         DropDown = TRUE ;
-        CurPos = 0 ;
-        StringList =
-        {
-            "A, B, C" ;
-            "a, b, c" ;
-            "I, II, III" ;
-            "i, ii, iii" ;
-            "1, 2, 3" ;
-            "A, .., AA, .., AAA" ;
-            "a, .., aa, .., aaa" ;
-        };
     };
     FixedText FT_OFFSET
     {
diff --git a/sw/source/ui/misc/impfnote.hxx b/sw/source/ui/misc/impfnote.hxx
index faf27aef3d9b..a4f264f7bcbf 100644
--- a/sw/source/ui/misc/impfnote.hxx
+++ b/sw/source/ui/misc/impfnote.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: impfnote.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 08:01:42 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:09:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,13 +79,16 @@
 #ifndef _FIELD_HXX //autogen
 #include <vcl/field.hxx>
 #endif
+#ifndef _NUMBERINGTYPELISTBOX_HXX
+#include <numberingtypelistbox.hxx>
+#endif
 
 class SwWrtShell;
 
 class SwEndNoteOptionPage : public SfxTabPage
 {
     FixedText       aNumTypeFT;
-    ListBox         aNumViewBox;
+    SwNumberingTypeListBox   aNumViewBox;
     FixedText       aOffsetLbl;
     NumericField    aOffsetFld;
     FixedText       aNumCountFT;
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 6e0ab93fe183..f89b24af60b3 100644
--- a/sw/source/ui/misc/linenum.cxx
+++ b/sw/source/ui/misc/linenum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: linenum.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:09:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -93,9 +93,9 @@
 #include <charfmt.hxx>
 #endif
 
-#ifndef _FLDMGR_HXX //autogen
-#include <fldmgr.hxx>
-#endif
+//#ifndef _FLDMGR_HXX //autogen
+//#include <fldmgr.hxx>
+//#endif
 
 #ifndef _DOC_HXX //autogen
 #include <doc.hxx>
@@ -164,7 +164,7 @@ SwLineNumberingPage::SwLineNumberingPage( Window* pParent,
     aCharStyleFT        ( this, SW_RES( FT_CHAR_STYLE )),
     aCharStyleLB        ( this, SW_RES( LB_CHAR_STYLE )),
     aFormatFT           ( this, SW_RES( FT_FORMAT )),
-    aFormatLB           ( this, SW_RES( LB_FORMAT )),
+    aFormatLB           ( this, SW_RES( LB_FORMAT ), INSERT_NUM_EXTENDED_TYPES),
     aPosFT              ( this, SW_RES( FT_POS )),
     aPosLB              ( this, SW_RES( LB_POS )),
     aOffsetFT           ( this, SW_RES( FT_OFFSET )),
@@ -232,21 +232,22 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& rSet )
     }
 
     // Format
-    SwFldMgr aMgr( pSh );
+//  SwFldMgr aMgr( pSh );
     USHORT nSelFmt = rInf.GetNumType().GetNumberingType();
-    USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
+//  USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
 
-    for( USHORT i = 0; i < nCnt; i++)
-    {
-        aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
-        USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
-        aFormatLB.SetEntryData( i, (void*)nFmtId );
-        if( nFmtId == nSelFmt )
-            aFormatLB.SelectEntryPos( i );
-    }
+//  for( USHORT i = 0; i < nCnt; i++)
+//  {
+//      aFormatLB.InsertEntry(aMgr.GetFormatStr( TYP_SEQFLD, i));
+//      USHORT nFmtId = aMgr.GetFormatId( TYP_SEQFLD, i );
+//      aFormatLB.SetEntryData( i, (void*)nFmtId );
+//      if( nFmtId == nSelFmt )
+//          aFormatLB.SelectEntryPos( i );
+//  }
+    aFormatLB.SelectNumberingType(nSelFmt);
 
-    if ( !aFormatLB.GetSelectEntryCount() )
-        aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
+//  if ( !aFormatLB.GetSelectEntryCount() )
+//      aFormatLB.SelectEntryPos(aFormatLB.GetEntryCount() - 1);
 
     // Position
     aPosLB.SelectEntryPos((USHORT)rInf.GetPos());
@@ -356,8 +357,7 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& rSet )
 
     // Format
     SvxNumberType aType;
-    aType.SetNumberingType((sal_Int16)(ULONG)aFormatLB.GetEntryData(
-                                    aFormatLB.GetSelectEntryPos() ));
+    aType.SetNumberingType(aFormatLB.GetSelectedNumberingType());
     aInf.SetNumType(aType);
 
     // Position
@@ -390,6 +390,9 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& rSet )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2001/02/23 12:45:29  os
+    Complete use of DefaultNumbering component
+
     Revision 1.1.1.1  2000/09/18 17:14:45  hr
     initial import
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 81df806843f1..1bc8693eb931 100644
--- a/sw/source/ui/misc/outline.cxx
+++ b/sw/source/ui/misc/outline.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outline.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:09:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,7 +154,7 @@
 #ifndef _UTL_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
 #endif
-#ifndef _COM_SUN_STAR_STYLE_NUMBERINGTYPE_HPP_
+/*#ifndef _COM_SUN_STAR_STYLE_NUMBERINGTYPE_HPP_
 #include <com/sun/star/style/NumberingType.hpp>
 #endif
 #ifndef _COM_SUN_STAR_TEXT_XDEFAULTNUMBERINGPROVIDER_HPP_
@@ -175,13 +175,13 @@ using namespace com::sun::star::text;
 using namespace com::sun::star::lang;
 using namespace com::sun::star::style;
 using namespace rtl;
+*/
 
 #define C2S(cChar) UniString::CreateFromAscii(cChar)
-
 /* -----------------------------31.01.01 10:23--------------------------------
 
  ---------------------------------------------------------------------------*/
-Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
+/*Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
 {
     Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
     Reference < XInterface > xI = xMSF->createInstance(
@@ -190,7 +190,7 @@ Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
     DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"")
 
     return xRet;
-}
+} */
 
 DBG_NAME(outlinehdl);
 
@@ -544,7 +544,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
     aCollLbl(this, SW_RES(FT_COLL)),
     aCollBox(this, SW_RES(LB_COLL)),
     aNumberLbl(this, SW_RES(FT_NUMBER)),
-    aNumberBox(this, SW_RES(LB_NUMBER)),
+    aNumberBox(this, SW_RES(LB_NUMBER), INSERT_NUM_TYPE_NO_NUMBERING),
     aCharFmtFT(this, SW_RES(FT_CHARFMT)),
     aCharFmtLB(this, SW_RES(LB_CHARFMT)),
     aAllLevelFT(    this, ResId(FT_ALL_LEVEL)),
@@ -576,7 +576,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
     aStartEdit.SetModifyHdl(LINK(this,  SwOutlineSettingsTabPage, StartModified));
     aCharFmtLB.SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, CharFmtHdl));
 
-    Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider();
+/*  Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider();
     Reference<XNumberingTypeInfo> xInfo(xDefNum, UNO_QUERY);
     if(xInfo.is())
     {
@@ -605,7 +605,7 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
                 }
             }
         }
-    }
+    }*/
 
 }
 /* -----------------07.07.98 14:19-------------------
@@ -649,8 +649,9 @@ void    SwOutlineSettingsTabPage::Update()
         if(bSameType)
         {
             long nData = aNumFmtArr[0]->GetNumberingType();
-            USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
-            aNumberBox.SelectEntryPos( nPos );
+            aNumberBox.SelectNumberingType(nData);
+//          USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+//          aNumberBox.SelectEntryPos( nPos );
         }
         else
             aNumberBox.SetNoSelection();
@@ -700,8 +701,9 @@ void    SwOutlineSettingsTabPage::Update()
         const SwNumFmt &rFmt = pNumRule->Get(nTmpLevel);
 
         ULONG nData = rFmt.GetNumberingType();
-        USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
-        aNumberBox.SelectEntryPos( nPos );
+        aNumberBox.SelectNumberingType(nData);
+//      USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+//      aNumberBox.SelectEntryPos( nPos );
         aPrefixED.SetText(rFmt.GetPrefix());
         aSuffixED.SetText(rFmt.GetSuffix());
         const SwCharFmt* pFmt = rFmt.GetCharFmt();
@@ -830,12 +832,12 @@ IMPL_LINK( SwOutlineSettingsTabPage, CollSelectGetFocus, ListBox *, pBox )
 /* -----------------07.07.98 14:19-------------------
  *
  * --------------------------------------------------*/
-IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, ListBox *, pBox )
+IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, SwNumberingTypeListBox *, pBox )
 {
     USHORT nStart = 0;
     USHORT nEnd = MAXLEVEL;
     USHORT nMask = 1;
-    sal_Int16 nNumberType = (sal_Int16)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
+    sal_Int16 nNumberType = pBox->GetSelectedNumberingType();//(sal_Int16)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
     for(USHORT i = 0; i < MAXLEVEL; i++)
     {
         if(nActLevel & nMask)
@@ -994,8 +996,9 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     }
 
     long nData = rNumFmt.GetNumberingType();
-    USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
-    aNumberBox.SelectEntryPos( nPos );
+    aNumberBox.SelectNumberingType(nData);
+//  USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+//  aNumberBox.SelectEntryPos( nPos );
     USHORT nOutlinePos = pSh->GetOutlinePos(MAXLEVEL);
     USHORT nTmp = 0;
     if(nOutlinePos != USHRT_MAX)
@@ -1272,181 +1275,3 @@ NumberingPreview::~NumberingPreview()
 }
 
 
-
-/*------------------------------------------------------------------------
-
-    $Log: not supported by cvs2svn $
-    Revision 1.5  2001/02/09 08:01:42  os
-    TabPage size changed
-
-    Revision 1.4  2000/12/07 18:35:30  csaba
-    79541 Branding/Configuration Change
-
-    Revision 1.3  2000/11/09 10:10:34  obo
-    Without string include
-
-    Revision 1.2  2000/11/07 12:25:18  hjs
-    use min/max from stl
-
-    Revision 1.1.1.1  2000/09/18 17:14:45  hr
-    initial import
-
-    Revision 1.105  2000/09/18 16:05:58  willem.vandorp
-    OpenOffice header added.
-
-    Revision 1.104  2000/07/26 12:03:33  jp
-    OkHdl: don't use invalid PoolIds
-
-    Revision 1.103  2000/07/25 10:40:29  jp
-    Bug #76772#,#76774#: don't remove all selected templates from the preview, LoadNameRules must set the outline type
-
-    Revision 1.102  2000/07/03 08:54:11  jp
-    must changes for VCL
-
-    Revision 1.101  2000/06/13 14:11:58  os
-    #74049# save outline numbering form to the first empty position
-
-    Revision 1.100  2000/05/23 19:22:39  jp
-    Bugfixes for Unicode
-
-    Revision 1.99  2000/04/26 14:55:46  os
-    GetName() returns const String&
-
-    Revision 1.98  2000/04/18 15:08:17  os
-    UNICODE
-
-    Revision 1.97  2000/03/14 09:32:31  os
-    #74039# outline assignment corrected
-
-    Revision 1.96  2000/03/03 15:17:02  os
-    StarView remainders removed
-
-    Revision 1.95  2000/02/11 14:56:40  hr
-    #70473# changes for unicode ( patched by automated patchtool )
-
-    Revision 1.94  1999/01/06 14:04:56  OS
-    #58643# Positionsbeispiel berichtigt
-
-
-      Rev 1.93   06 Jan 1999 15:04:56   OS
-   #58643# Positionsbeispiel berichtigt
-
-      Rev 1.92   18 Nov 1998 08:35:04   OS
-   #58263# Numerierung in den Svx - Reste
-
-      Rev 1.91   17 Nov 1998 10:57:52   OS
-   #58263# NumType durch SvxExtNumType ersetzt
-
-      Rev 1.90   10 Nov 1998 16:03:34   OS
-   #58201# HelpId fuer Form-Button
-
-      Rev 1.89   09 Nov 1998 14:03:04   AWO
-   Inlcudes hinzugefuegt
-
-      Rev 1.88   06 Nov 1998 14:10:00   OS
-   #45264# Outline-Ebenen nicht fuer index-ebenen
-
-      Rev 1.87   21 Sep 1998 15:31:30   OS
-   #56738# Zeichenvorlage fuer Kapitelnumerierung einstellbar
-
-      Rev 1.86   06 Aug 1998 21:42:08   JP
-   Bug #54796#: neue NumerierungsTypen (WW97 kompatibel)
-
-      Rev 1.85   18 Jul 1998 14:50:52   OS
-   richtige Ebenenanzahl fuer vollst. Numerierung #53233#
-
-      Rev 1.84   09 Jul 1998 14:03:06   OS
-   Kapitelnumerierung jetzt TabDialog
-
-      Rev 1.83   01 Apr 1998 15:15:22   OS
-   Beispielhintergrund zuruecksetzen #49133#
-
-      Rev 1.82   26 Feb 1998 17:07:34   OS
-   keins->keine #47632#
-
-      Rev 1.81   24 Feb 1998 15:44:48   OS
-   Ausrichtung berichtigt #47417#
-
-      Rev 1.80   08 Dec 1997 11:53:30   OS
-   benannte Numerierungen entfernt
-
-      Rev 1.79   05 Dec 1997 16:50:56   OS
-   Numerierungsumbau
-
-      Rev 1.78   05 Dec 1997 10:42:50   OS
-   Numerierungsumbau
-
-      Rev 1.77   04 Dec 1997 16:57:20   OS
-   Numerierungsumbau
-
-      Rev 1.76   24 Nov 1997 16:47:44   MA
-   includes
-
-      Rev 1.75   17 Nov 1997 10:20:58   JP
-   Umstellung Numerierung
-
-      Rev 1.74   03 Nov 1997 13:22:42   MA
-   precomp entfernt
-
-      Rev 1.73   09 Oct 1997 08:48:32   OS
-   Beispieltexte nur noch setzen, wenn sie sich veraendert wurden #44493#
-
-      Rev 1.72   08 Aug 1997 17:28:08   OM
-   Headerfile-Umstellung
-
-      Rev 1.71   31 Jul 1997 15:22:06   MH
-   chg: header
-
-      Rev 1.70   08 Jul 1997 14:09:44   OS
-   ConfigItems von der App ans Module
-
-      Rev 1.69   01 Jul 1997 09:49:52   OS
-   Erweiterung auf neun Formen
-
-      Rev 1.68   09 Jan 1997 18:49:44   OS
-   gfs. aktuelle Ebene selektieren
-
-      Rev 1.67   11 Dec 1996 10:27:02   MA
-   Warnings
-
-      Rev 1.66   11 Nov 1996 11:05:44   MA
-   ResMgr
-
-      Rev 1.65   02 Oct 1996 18:29:00   MA
-   Umstellung Enable/Disable
-
-      Rev 1.64   28 Aug 1996 14:12:18   OS
-   includes
-
-      Rev 1.63   20 Aug 1996 16:22:50   OS
-   Handler zusammengefasst, timeouthdl vor Levelumschaltung rufen
-
-      Rev 1.62   22 Jul 1996 20:54:02   JP
-   Anpassung an die neuen SwUiNumRules
-
-      Rev 1.61   19 Jul 1996 15:32:32   JP
-   Umstellung Numerierung
-
-      Rev 1.60   21 Mar 1996 10:46:00   MA
-   Umstellung SV311
-
-      Rev 1.59   19 Feb 1996 12:33:28   JP
-   MakeNumString kann den Post-/Prefix-String per Flag selbst zufuegen
-
-      Rev 1.58   06 Feb 1996 15:21:12   JP
-   Link Umstellung 305
-
-      Rev 1.57   01 Feb 1996 11:45:58   mk
-   SINIX
-
-      Rev 1.56   03 Jan 1996 11:07:56   OS
-   Format fuer Kapitelnumerierung kann jetzt gespeichert werden
-
-      Rev 1.55   24 Nov 1995 16:58:48   OM
-   PCH->PRECOMPILED
-
-      Rev 1.54   13 Nov 1995 10:51:34   OM
-   static entfernt
-
-------------------------------------------------------------------------*/
-
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index 35908e8bea53..0ec7fe90e9f3 100644
--- a/sw/source/ui/misc/outline.src
+++ b/sw/source/ui/misc/outline.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: outline.src,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
+ *  last change: $Author: os $ $Date: 2001-03-02 14:09:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -936,259 +936,6 @@ TabPage TP_OUTLINE_NUM
         Group = TRUE ;
         DropDown = TRUE ;
         CurPos = 0 ;
-        StringList =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Ohne" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ ENGLISH ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"None" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ norwegian ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Ingen" ;                       5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ italian ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Senza" ;                       5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ portuguese_brazilian ] =
-        {
-            <"A, B, C, ..." ;            0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;            1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;         2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;         3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;            4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ; 9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Nenhum" ;                  5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ portuguese ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Sem" ;                         5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ finnish ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Ei ole" ;                      5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ danish ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Uden" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ french ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Aucun(e)" ;                    5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ swedish ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Utan" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ dutch ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Geen" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ spanish ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"Ninguno" ;                     5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-        StringList [ english_us ] =
-        {
-            <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-            <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-            <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-            <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-            <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-            <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-            <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-            <"None" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-        };
-    StringList [ language_user1 ] =
-    {
-        <" " ;   0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <" " ;   1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <" " ;   2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <" " ;   3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <" " ;   4/*SVX_NUM_ARABIC              */; > ;
-        <" " ;   9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <" " ;  10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <" " ;   5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ russian ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"���" ;                         5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ greek ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"�����" ;                       5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ polish ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"Brak" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ japanese ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"�Ȃ�" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ korean ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"����" ;                        5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ chinese_simplified ] =
-    {
-        <"A, B, C, ..." ;                0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;             2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;             3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;     9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;    10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"��" ;                          5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ chinese_traditional ] =
-    {
-        <"A, B, C, ..." ;                    0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                    1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;                 2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;                 3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                    4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;         9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;        10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"�L" ;                              5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ arabic ] =
-    {
-        <"A, B, C, ..." ;                    0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"...áȡ�" ;                        1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;                 2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;                 3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                    4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;         9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;        10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"����" ;                            5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
-    StringList [ turkish ] =
-    {
-        <"A, B, C, ..." ;                    0/*SVX_NUM_CHARS_UPPER_LETTER  */; > ;
-        <"a, b, c, ..." ;                    1/*SVX_NUM_CHARS_LOWER_LETTER  */; > ;
-        <"I, II, III, ..." ;                 2/*SVX_NUM_ROMAN_UPPER         */; > ;
-        <"i, ii, iii, ..." ;                 3/*SVX_NUM_ROMAN_LOWER         */; > ;
-        <"1, 2, 3, ..." ;                    4/*SVX_NUM_ARABIC              */; > ;
-        <"A, .., AA, .., AAA, ..." ;         9/*SVX_NUM_CHARS_UPPER_LETTER_N*/; > ;
-        <"a, .., aa, .., aaa, ..." ;        10/*SVX_NUM_CHARS_LOWER_LETTER_N*/; > ;
-        <"Yok" ;                             5/*SVX_NUM_NUMBER_NONE         */; > ;
-    };
     };
     FixedText FT_CHARFMT
     {