Complete use of DefaultNumbering component

49 files changed, 949 insertions, 1381 deletions

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index a6520f80e036..211fa579cc9d 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docufld.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-18 14:05:08 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,7 +176,7 @@ enum SwJumpEditFormat
 
 class SwPageNumberFieldType : public SwFieldType
 {
-    SvxExtNumType   eNumFormat;
+    sal_Int16   nNumberingType;
     USHORT          nNum, nMax;
     BOOL            bVirtuell;
 
@@ -185,8 +185,8 @@ public:
 
     String& Expand( ULONG nFmt, short nOff, const String&, String& rRet ) const;
     void ChangeExpansion( SwDoc* pDoc, USHORT nNum, USHORT nMax,
-                            BOOL bVirtPageNum, const SvxExtNumType* pNumFmt = 0 );
-    inline SvxExtNumType GetNumFormat() const { return eNumFormat; }
+                            BOOL bVirtPageNum, const sal_Int16* pNumFmt = 0 );
+    inline sal_Int16 GetNumFormat() const { return nNumberingType; }
     virtual SwFieldType* Copy() const;
 };
 
@@ -325,15 +325,15 @@ public:
 class SwDocStatFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
-    SvxExtNumType   eNumFormat;
+    sal_Int16       nNumberingType;//com::sun::star::style::NumberingType
 
 public:
     SwDocStatFieldType(SwDoc*);
     String                  Expand(USHORT nSubType, ULONG nFmt) const;
     virtual SwFieldType*    Copy() const;
 
-    inline SvxExtNumType    GetNumFormat() const        { return eNumFormat; }
-    inline void             SetNumFormat( SvxExtNumType eFmt )  { eNumFormat = eFmt; }
+    inline sal_Int16        GetNumFormat() const        { return nNumberingType; }
+    inline void             SetNumFormat( sal_Int16 eFmt )  { nNumberingType = eFmt; }
 };
 
 /*--------------------------------------------------------------------
@@ -686,7 +686,7 @@ public:
 class SwRefPageGetFieldType : public SwFieldType
 {
     SwDoc*          pDoc;
-    SvxExtNumType   eNumFormat;
+    sal_Int16       nNumberingType;
 
     void UpdateField( SwTxtFld* pTxtFld, _SetGetExpFlds& rSetList );
 
@@ -698,8 +698,8 @@ public:
     virtual void Modify( SfxPoolItem *, SfxPoolItem * );
     USHORT MakeSetList( _SetGetExpFlds& rTmpLst );
 
-    SvxExtNumType   GetNumFormat() const            { return eNumFormat; }
-    void            SetNumFormat( SvxExtNumType eFmt )  { eNumFormat = eFmt; }
+    sal_Int16       GetNumFormat() const            { return nNumberingType; }
+    void            SetNumFormat( sal_Int16 eFmt )  { nNumberingType = eFmt; }
     SwDoc*  GetDoc() const                  { return pDoc; }
 };
 
diff --git a/sw/inc/fmtftntx.hxx b/sw/inc/fmtftntx.hxx
index 4547809ab7e7..62ec1c8886de 100644
--- a/sw/inc/fmtftntx.hxx
+++ b/sw/inc/fmtftntx.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fmtftntx.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,7 +89,7 @@ class SwFmtFtnEndAtTxtEnd : public SfxEnumItem
 {
     String      sPrefix;
     String      sSuffix;
-    SwNumType   aFmt;
+    SvxNumberType aFmt;
     USHORT      nOffset;
 
 protected:
@@ -129,10 +129,10 @@ public:
 
     SwFmtFtnEndAtTxtEnd & operator=( const SwFmtFtnEndAtTxtEnd & rAttr );
 
-    SvxExtNumType GetNumType() const        { return aFmt.eType; }
-    void SetNumType( SvxExtNumType eType )  { aFmt.eType = eType; }
+    sal_Int16 GetNumType() const        { return aFmt.GetNumberingType(); }
+    void SetNumType( sal_Int16 eType )  { aFmt.SetNumberingType(eType); }
 
-    const SwNumType& GetSwNumType() const   { return aFmt; }
+    const SvxNumberType& GetSwNumType() const   { return aFmt; }
 
     USHORT GetOffset() const                { return nOffset; }
     void SetOffset( USHORT nOff )           { nOffset = nOff; }
diff --git a/sw/inc/ftninfo.hxx b/sw/inc/ftninfo.hxx
index d82677346cac..9bda2f853896 100644
--- a/sw/inc/ftninfo.hxx
+++ b/sw/inc/ftninfo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ftninfo.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:26 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -79,7 +79,7 @@ class SwEndNoteInfo : public SwClient
 protected:
     BOOL      bEndNote;
 public:
-    SwNumType aFmt;
+    SvxNumberType aFmt;
     USHORT    nFtnOffset;
 
     void        ChgPageDesc( SwPageDesc *pDesc );
diff --git a/sw/inc/lineinfo.hxx b/sw/inc/lineinfo.hxx
index 4622bec63796..e5299223bb52 100644
--- a/sw/inc/lineinfo.hxx
+++ b/sw/inc/lineinfo.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lineinfo.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:27 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -83,7 +83,7 @@ enum LineNumberPosition
 class SwLineNumberInfo : public SwClient //purpose of derivation from SwClient:
                                          //character style for displaying the numbers.
 {
-    SwNumType           aType;              //e.g. roman linenumbers
+    SvxNumberType       aType;              //e.g. roman linenumbers
     String              aDivider;           //String for aditional interval (vert. lines user defined)
     USHORT              nPosFromLeft;       //Position for paint
     USHORT              nCountBy;           //Paint only for every n line
@@ -106,8 +106,8 @@ public:
     SwCharFmt *GetCharFmt(SwDoc &rDoc) const;
     void SetCharFmt( SwCharFmt* );
 
-    const SwNumType &GetNumType() const             { return aType; }
-    void             SetNumType( SwNumType aNew )   { aType = aNew; }
+    const SvxNumberType &GetNumType() const             { return aType; }
+    void                SetNumType( SvxNumberType aNew ){ aType = aNew; }
 
     const String &GetDivider() const    { return aDivider; }
     void SetDivider( const String &r )  { aDivider = r; }
diff --git a/sw/inc/numrule.hxx b/sw/inc/numrule.hxx
index 9e2f9689b945..23da9fa9b311 100644
--- a/sw/inc/numrule.hxx
+++ b/sw/inc/numrule.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numrule.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:32:32 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -87,11 +87,12 @@
 #ifndef _SWERROR_H
 #include <error.h>          // Fuer die inline-ASSERTs
 #endif
-
+#ifndef _SVX_NUMITEM_HXX
+#include <svx/numitem.hxx>
+#endif
 
 class Font;
 class SvxBrushItem;
-class SvxNumberFormat;
 class SvxNumRule;
 class SwCharFmt;
 class SwDoc;
@@ -101,129 +102,44 @@ class SwTxtNode;
 
 extern char __FAR_DATA sOutlineStr[];   // SWG-Filter
 
-const sal_Unicode cBulletChar   = 0xF000 + 149; // Charakter fuer Aufzaehlungen
-
 inline BYTE GetRealLevel( const BYTE nLvl )
 {
     return nLvl & (NO_NUMLEVEL - 1);
 }
+const sal_Unicode cBulletChar   = 0xF000 + 149; // Charakter fuer Aufzaehlungen
 
-class SwNumType
-{
-    void GetRomanStr( ULONG nNo, String& rStr ) const;
-    void GetCharStr( ULONG nNo, String& rStr ) const;
-    void GetCharStrN( ULONG nNo, String& rStr ) const;
-public:
-        /* Reihenfolge der Elemente des enums ist fuer die
-         * UI-Seite interesssant -- bitte nicht ohne trifftigen
-         * Grund und Nachricht an die UI-Seite aendern.
-         */
-    SvxExtNumType     eType;
-
-    SwNumType() { eType = SVX_NUM_ARABIC; }
-    SwNumType( const SwNumType& rType ) : eType( rType.eType ) {}
-
-    String GetNumStr( ULONG nNo ) const;
-};
-
-
-class SwNumFmt : public SwClient, public SwNumType
+class SwNumFmt : public SvxNumberFormat, public SwClient
 {
-    String      aPrefix;                // vorangestellter Text
-    String      aPostfix;               // nachfolgender Text
-
-    // bei eType == USER_BITMAP ist folgendes ganz interessant
-    Size        aGrfSize;
-    SvxBrushItem* pGrfBrush;
     SwFmtVertOrient* pVertOrient;
-    // bei eType == CHAR_SPECIAL ist folgendes ganz interessant
-    Font*       pBulletFont;            // Pointer auf den BulletFont
-
-    SvxAdjust   eNumAdjust;             // Ausrichtung (Links/rechts/zent.)
-    short       nFirstLineOffset;       // Abstand zwischen Linken Rand und Text
-    short       nLSpace;                // relativer linker Rand
-    USHORT      nAbsLSpace;             // absoluter linker Rand
-    USHORT      nCharTextOffset;        // Abstand zwischen Zeichen und Text
-    USHORT      nStart;                 // Startwert fuer die Nummer
-
-    BYTE        nInclUpperLevel;        // wieviele Levels
-    sal_Unicode cBullet;                // das Bullet Char
-    BOOL        bRelLSpace : 1;         // LSpace als relative Angabe (UI)
 
     void UpdateNumNodes( SwDoc* pDoc );
-    DECL_STATIC_LINK( SwNumFmt, GraphicArrived, void * );
-
 public:
     SwNumFmt();
     SwNumFmt( const SwNumFmt& );
     SwNumFmt( const SvxNumberFormat&, SwDoc* pDoc);
-    SvxNumberFormat MakeSvxFormat() const;
+
     virtual ~SwNumFmt();
 
     SwNumFmt& operator=( const SwNumFmt& );
     BOOL operator==( const SwNumFmt& ) const;
     BOOL operator!=( const SwNumFmt& r ) const { return !(*this == r); }
 
+    const Graphic* GetGraphic() const;
+
     SwCharFmt* GetCharFmt() const { return (SwCharFmt*)pRegisteredIn; }
     void SetCharFmt( SwCharFmt* );
     virtual void Modify( SfxPoolItem* pOld, SfxPoolItem* pNew );
 
-    // ist der Font* == 0, wird der Font nicht gewechselt
-    void SetBulletFont(const Font*);
-    const Font* GetBulletFont() const           { return pBulletFont; }
+    virtual void            SetCharFmtName(const String& rSet);
+    virtual const String&   GetCharFmtName()const;
 
-    sal_Unicode GetBulletChar() const           { return cBullet; }
-    void SetBulletChar( sal_Unicode c )         { cBullet = c; }
+    virtual void    SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize = 0, const SvxFrameVertOrient* pOrient = 0);
 
-//------
-// ALT
-    BOOL IsInclUpperLevel() const               { return 1 < nInclUpperLevel; }
-    void SetInclUpperLevel( BOOL b )            { nInclUpperLevel = b ? MAXLEVEL : 1; }
-// ALT
-//------
-    BYTE GetUpperLevel() const                  { return nInclUpperLevel; }
-    void SetUpperLevel( BYTE nValue )           { nInclUpperLevel = nValue; }
-
-    BOOL IsRelLSpace() const                    { return bRelLSpace; }
-    void SetRelLSpace( BOOL b )                 { bRelLSpace = b; }
-
-    SvxAdjust GetAdjust() const                 { return eNumAdjust; }
-    void SetAdjust( SvxAdjust eAdj )            { eNumAdjust = eAdj; }
-
-    short GetLSpace() const                     { return nLSpace; }
-    void SetLSpace( short n )                   { nLSpace = n; }
-
-    USHORT GetAbsLSpace() const                 { return nAbsLSpace; }
-    void SetAbsLSpace( USHORT n )               { nAbsLSpace = n; }
-
-    short GetFirstLineOffset() const            { return nFirstLineOffset; }
-    void SetFirstLineOffset( short n )          { nFirstLineOffset = n; }
-
-    USHORT GetCharTextOffset() const            { return nCharTextOffset; }
-    void SetCharTextOffset( USHORT n )          { nCharTextOffset = n; }
-
-    USHORT GetStartValue() const                { return nStart; }
-    void SetStartValue( USHORT n )              { nStart = n; }
-
-    const String& GetPrefix() const             { return aPrefix; }
-    void SetPrefix( const String& rS )          { aPrefix = rS; }
-
-    const String& GetPostfix() const            { return aPostfix; }
-    void SetPostfix( const String& rS )         { aPostfix = rS; }
-
-    const SvxBrushItem* GetGrfBrush() const     { return pGrfBrush; }
-    const SwFmtVertOrient* GetGrfOrient() const { return pVertOrient; }
-    const Size& GetGrfSize() const              { return aGrfSize; }
-    void SetGrfBrush( const SvxBrushItem* pGrfBr, const Size* pSz,
-                        const SwFmtVertOrient* pVOrient );
-    void SetGraphic( const String& rName );
-    // Graphic ggfs. reinswappen
-    const Graphic* GetGraphic() const;
-    // kann fuer das Format ein Text erzeugt werden?
-    inline BOOL IsTxtFmt() const;
+    virtual void                SetVertOrient(SvxFrameVertOrient eSet);
+    virtual SvxFrameVertOrient  GetVertOrient() const;
+    const SwFmtVertOrient*      GetGraphicOrientation() const { return pVertOrient; }
 };
 
-
 enum SwNumRuleType { OUTLINE_RULE = 0, NUM_RULE = 1, RULE_END = 2 };
 class SwNumRule
 {
@@ -236,6 +152,7 @@ class SwNumRule
     static char* pDefOutlineName;
 
     SwNumFmt* aFmts[ MAXLEVEL ];
+
     String sName;
     SwNumRuleType eRuleType;
     USHORT nPoolFmtId;      // Id-fuer "automatich" erzeugte NumRules
@@ -263,7 +180,6 @@ public:
     inline const SwNumFmt& Get( USHORT i ) const;
     void Set( USHORT i, const SwNumFmt* );
     void Set( USHORT i, const SwNumFmt& );
-
     String MakeNumString( const SwNodeNum&, BOOL bInclStrings = TRUE,
                             BOOL bOnlyArabic = FALSE ) const;
 
@@ -353,13 +269,6 @@ public:
 
 // ------------ inline Methoden ----------------------------
 
-inline BOOL SwNumFmt::IsTxtFmt() const
-{
-    return SVX_NUM_NUMBER_NONE != eType &&
-           SVX_NUM_CHAR_SPECIAL != eType &&
-           SVX_NUM_BITMAP != eType;
-}
-
 inline const SwNumFmt& SwNumRule::Get( USHORT i ) const
 {
     ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
@@ -372,7 +281,6 @@ inline const SwNumFmt* SwNumRule::GetNumFmt( USHORT i ) const
     ASSERT_ID( i < MAXLEVEL && eRuleType < RULE_END, ERR_NUMLEVEL);
     return aFmts[ i ];
 }
-
 inline const Font& SwNumRule::GetDefBulletFont()
 {
     if( !pDefBulletFont )
diff --git a/sw/inc/pagedesc.hxx b/sw/inc/pagedesc.hxx
index 70c99baa317f..1862feb4a2ad 100644
--- a/sw/inc/pagedesc.hxx
+++ b/sw/inc/pagedesc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: pagedesc.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-13 08:05:36 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:01 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -181,7 +181,7 @@ class SwPageDesc : public SwModify
     SwPageDesc& operator=( const SwPageDesc& );
 
     String      aDescName;
-    SwNumType   aNumType;
+    SvxNumberType   aNumType;
     SwFrmFmt    aMaster;
     SwFrmFmt    aLeft;
     SwDepend    aDepend;    // wg. Registerhaltigkeit
@@ -206,8 +206,8 @@ public:
     BOOL GetLandscape() const { return bLandscape; }
     void SetLandscape( BOOL bNew ) { bLandscape = bNew; }
 
-    const SwNumType &GetNumType() const { return aNumType; }
-          void       SetNumType( const SwNumType& rNew ) { aNumType = rNew; }
+    const SvxNumberType &GetNumType() const { return aNumType; }
+          void          SetNumType( const SvxNumberType& rNew ) { aNumType = rNew; }
 
     const SwPageFtnInfo &GetFtnInfo() const { return aFtnInfo; }
           SwPageFtnInfo &GetFtnInfo()       { return aFtnInfo; }
diff --git a/sw/source/core/doc/docdesc.cxx b/sw/source/core/doc/docdesc.cxx
index 6ed6116e87d2..648fd3b73bb2 100644
--- a/sw/source/core/doc/docdesc.cxx
+++ b/sw/source/core/doc/docdesc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docdesc.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:15:07 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -340,7 +340,7 @@ void SwDoc::ChgPageDesc( USHORT i, const SwPageDesc &rChged )
                        ((SwPageDesc&)rChged).GetLeft() );
 
     //NumType uebernehmen.
-    if( rChged.GetNumType().eType != pDesc->GetNumType().eType )
+    if( rChged.GetNumType().GetNumberingType() != pDesc->GetNumType().GetNumberingType() )
     {
         pDesc->SetNumType( rChged.GetNumType() );
         // JP 30.03.99: Bug 64121 - den Seitennummernfeldern bescheid sagen,
diff --git a/sw/source/core/doc/docftn.cxx b/sw/source/core/doc/docftn.cxx
index bf9d977f22fd..11d981b39144 100644
--- a/sw/source/core/doc/docftn.cxx
+++ b/sw/source/core/doc/docftn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docftn.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:15 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -156,7 +156,7 @@ BOOL SwEndNoteInfo::operator==( const SwEndNoteInfo& rInfo ) const
             aAnchorCharFmtDep.GetRegisteredIn() ==
                                 rInfo.aAnchorCharFmtDep.GetRegisteredIn() &&
             GetFtnTxtColl() == rInfo.GetFtnTxtColl() &&
-            aFmt.eType == rInfo.aFmt.eType &&
+            aFmt.GetNumberingType() == rInfo.aFmt.GetNumberingType() &&
             nFtnOffset == rInfo.nFtnOffset &&
             bEndNote == rInfo.bEndNote &&
             sPrefix == rInfo.sPrefix &&
@@ -194,7 +194,7 @@ SwEndNoteInfo::SwEndNoteInfo(SwTxtFmtColl *pFmt) :
     nFtnOffset( 0 ),
     bEndNote( TRUE )
 {
-    aFmt.eType = SVX_NUM_ROMAN_LOWER;
+    aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);
 }
 
 SwPageDesc *SwEndNoteInfo::GetPageDesc( SwDoc &rDoc ) const
@@ -316,7 +316,7 @@ SwFtnInfo::SwFtnInfo(SwTxtFmtColl *pFmt) :
     eNum( FTNNUM_DOC ),
     ePos( FTNPOS_PAGE )
 {
-    aFmt.eType = SVX_NUM_ARABIC;
+    aFmt.SetNumberingType(SVX_NUM_ARABIC);
     bEndNote = FALSE;
 }
 
@@ -342,7 +342,7 @@ void SwDoc::SetFtnInfo(const SwFtnInfo& rInfo)
                             rInfo.GetPageDesc( *this ) != rOld.GetPageDesc( *this );
         FASTBOOL bExtra   = rInfo.aQuoVadis != rOld.aQuoVadis ||
                             rInfo.aErgoSum != rOld.aErgoSum ||
-                            rInfo.aFmt.eType != rOld.aFmt.eType ||
+                            rInfo.aFmt.GetNumberingType() != rOld.aFmt.GetNumberingType() ||
                             rInfo.GetPrefix() != rOld.GetPrefix() ||
                             rInfo.GetSuffix() != rOld.GetSuffix();
         SwCharFmt *pOldChrFmt = rOld.GetCharFmt( *this ),
@@ -402,7 +402,7 @@ void SwDoc::SetEndNoteInfo(const SwEndNoteInfo& rInfo)
 
         FASTBOOL bNumChg  = rInfo.nFtnOffset != GetEndNoteInfo().nFtnOffset;
         FASTBOOL bExtra   = !bNumChg &&
-                            rInfo.aFmt.eType != GetEndNoteInfo().aFmt.eType||
+                            rInfo.aFmt.GetNumberingType() != GetEndNoteInfo().aFmt.GetNumberingType()||
                             rInfo.GetPrefix() != GetEndNoteInfo().GetPrefix() ||
                             rInfo.GetSuffix() != GetEndNoteInfo().GetSuffix();
         FASTBOOL bFtnDesc = rInfo.GetPageDesc( *this ) !=
diff --git a/sw/source/core/doc/docnum.cxx b/sw/source/core/doc/docnum.cxx
index 0bd120e82164..f24b3aeecb3c 100644
--- a/sw/source/core/doc/docnum.cxx
+++ b/sw/source/core/doc/docnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docnum.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-26 18:08:21 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,9 +176,9 @@ void SwDoc::SetOutlineNumRule( const SwNumRule& rRule )
                     rOld.GetFirstLineOffset() != rNew.GetFirstLineOffset() )
                     nChkLevel |= nMask;
             }
-            else if( SVX_NUM_NUMBER_NONE > rNew.eType && 1 < rNew.GetUpperLevel() &&
+            else if( SVX_NUM_NUMBER_NONE > rNew.GetNumberingType() && 1 < rNew.GetIncludeUpperLevels() &&
                     0 != (nChgFmtLevel & GetUpperLvlChg( n,
-                                            rNew.GetUpperLevel(), nMask )) )
+                                            rNew.GetIncludeUpperLevels(), nMask )) )
                 nChgFmtLevel |= nMask;
         }
         (*pOutlineRule) = rRule;
@@ -682,8 +682,8 @@ void lcl_ChgNumRule( SwDoc& rDoc, const SwNumRule& rRule, SwHistory* pHist,
                 rOldFmt.GetFirstLineOffset() != rNewFmt.GetFirstLineOffset() )
                 nChkLevel |= nMask;
         }
-        else if( SVX_NUM_NUMBER_NONE > rNewFmt.eType && 1 < rNewFmt.GetUpperLevel() &&
-                0 != (nChgFmtLevel & GetUpperLvlChg( n, rNewFmt.GetUpperLevel(),nMask )) )
+        else if( SVX_NUM_NUMBER_NONE > rNewFmt.GetNumberingType() && 1 < rNewFmt.GetIncludeUpperLevels() &&
+                0 != (nChgFmtLevel & GetUpperLvlChg( n, rNewFmt.GetIncludeUpperLevels(),nMask )) )
             nChgFmtLevel |= nMask;
     }
 
@@ -1748,7 +1748,7 @@ BOOL SwDoc::NumOrNoNum( const SwNodeIndex& rIdx, BOOL bDel, BOOL bOutline )
                     ((SwNumRuleItem*)pItem)->GetValue() )) )) &&
         (bDel ? 0 != ( pNum->GetLevel() & NO_NUMLEVEL )
              : 0 == ( pNum->GetLevel() & NO_NUMLEVEL ) ) &&
-        SVX_NUM_NUMBER_NONE != pRule->Get( GetRealLevel(pNum->GetLevel()) ).eType )
+        SVX_NUM_NUMBER_NONE != pRule->Get( GetRealLevel(pNum->GetLevel()) ).GetNumberingType() )
     {
         if( DoesUndo() )
         {
@@ -1971,7 +1971,7 @@ void SwDoc::UpdateNumRule( const String& rName, ULONG nUpdPos )
         SwNodeNum aNum( 0 );
 
         if( pRule->IsContinusNum() )
-            nNumVal = pRule->Get( 0 ).GetStartValue();
+            nNumVal = pRule->Get( 0 ).GetStart();
 
         SwTxtNode* pStt = aUpd.GetList().GetObject( nUpdPos );
         SwTxtNode* pPrev = nUpdPos ? aUpd.GetList().GetObject( nUpdPos-1 ) : 0;
@@ -2048,7 +2048,7 @@ void SwDoc::UpdateNumRule( const String& rName, ULONG nUpdPos )
                             (MAXLEVEL) * sizeof( aNum.GetLevelVal()[0]) );
                     if( pRule->IsContinusNum() )
                     {
-                        nNumVal = pRule->Get( 0 ).GetStartValue();
+                        nNumVal = pRule->Get( 0 ).GetStart();
                         nInitLevels |= 1;
                     }
                     else
@@ -2078,15 +2078,15 @@ void SwDoc::UpdateNumRule( const String& rName, ULONG nUpdPos )
             {
                 // beim Format mit Bitmap die Graphicen schon mal anfordern
                 const SwNumFmt* pNumFmt = pRule->GetNumFmt( GetRealLevel( nLevel ));
-                if( pNumFmt && SVX_NUM_BITMAP == pNumFmt->eType )
+                if( pNumFmt && SVX_NUM_BITMAP == pNumFmt->GetNumberingType() )
                     pNumFmt->GetGraphic();
 
                 if( pRule->IsContinusNum() )
                 {
                     if( !(nInitLevels & 1) &&
-                        !( pNumFmt && (SVX_NUM_CHAR_SPECIAL == pNumFmt->eType ||
-                                       SVX_NUM_BITMAP == pNumFmt->eType ||
-                                       SVX_NUM_NUMBER_NONE == pNumFmt->eType )))
+                        !( pNumFmt && (SVX_NUM_CHAR_SPECIAL == pNumFmt->GetNumberingType() ||
+                                       SVX_NUM_BITMAP == pNumFmt->GetNumberingType() ||
+                                       SVX_NUM_NUMBER_NONE == pNumFmt->GetNumberingType() )))
                         ++nNumVal;
                     aNum.GetLevelVal()[ nLevel ] = nNumVal;
                 }
@@ -2105,18 +2105,18 @@ void SwDoc::UpdateNumRule( const String& rName, ULONG nUpdPos )
                         {
                             nInitLevels &= ~( 1 << ii );
                             aNum.GetLevelVal()[ ii ] =
-                                        pRule->Get( ii ).GetStartValue();
+                                        pRule->Get( ii ).GetStart();
                         }
                         aNum.GetLevelVal()[ nLevel ] =
                             USHRT_MAX == aNum.GetSetValue()
-                                ? pRule->Get( nLevel ).GetStartValue()
+                                ? pRule->Get( nLevel ).GetStart()
                                 : aNum.GetSetValue();
                     }
                     else if( USHRT_MAX != aNum.GetSetValue() )
                         aNum.GetLevelVal()[ nLevel ] = aNum.GetSetValue();
                     else if( nInitLevels & ( 1 << nLevel ))
                         aNum.GetLevelVal()[ nLevel ] =
-                                        pRule->Get( nLevel ).GetStartValue();
+                                        pRule->Get( nLevel ).GetStart();
                     else
                         aNum.GetLevelVal()[ nLevel ]++;
                 }
diff --git a/sw/source/core/doc/doctxm.cxx b/sw/source/core/doc/doctxm.cxx
index 015bf1ed046e..b5a43c30c280 100644
--- a/sw/source/core/doc/doctxm.cxx
+++ b/sw/source/core/doc/doctxm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: doctxm.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: os $ $Date: 2001-02-14 10:40:40 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -2026,7 +2026,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
     USHORT nOld = rNums[0],
            nBeg = nOld,
            nCount  = 0;
-    String aNumStr( SwNumType( ((SwPageDesc*)rDescs[0])->GetNumType() ).
+    String aNumStr( SvxNumberType( ((SwPageDesc*)rDescs[0])->GetNumType() ).
                     GetNumStr( nBeg ) );
     if( pCharStyleIdx && lcl_HasMainEntry( pMainEntryNums, nBeg ))
     {
@@ -2055,7 +2055,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
 
     for(USHORT i = 1; i < rNums.Count(); ++i)
     {
-        SwNumType aType( ((SwPageDesc*)rDescs[i])->GetNumType() );
+        SvxNumberType aType( ((SwPageDesc*)rDescs[i])->GetNumType() );
         if( TOX_INDEX == SwTOXBase::GetType() )
         {   // Zusammenfassen f. ff.
             // Alle folgenden aufaddieren
@@ -2129,7 +2129,7 @@ void SwTOXBaseSection::_UpdatePageNum( SwTxtNode* pNd,
                 aNumStr.AppendAscii( sPageDeli );
 //#58127# Wenn nCount == 0, dann steht die einzige Seitenzahl schon im aNumStr!
             if(nCount)
-                aNumStr += SwNumType( ((SwPageDesc*)rDescs[i-1])->
+                aNumStr += SvxNumberType( ((SwPageDesc*)rDescs[i-1])->
                                 GetNumType() ).GetNumStr( nBeg+nCount );
         }
     }
diff --git a/sw/source/core/doc/lineinfo.cxx b/sw/source/core/doc/lineinfo.cxx
index 87219f156245..543f78fd3f4c 100644
--- a/sw/source/core/doc/lineinfo.cxx
+++ b/sw/source/core/doc/lineinfo.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: lineinfo.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:16 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -138,7 +138,7 @@ SwLineNumberInfo& SwLineNumberInfo::operator=(const SwLineNumberInfo &rCpy)
 BOOL SwLineNumberInfo::operator==( const SwLineNumberInfo& rInf ) const
 {
     return  GetRegisteredIn() == rInf.GetRegisteredIn() &&
-            aType.eType == rInf.GetNumType().eType &&
+            aType.GetNumberingType() == rInf.GetNumType().GetNumberingType() &&
             aDivider == rInf.GetDivider() &&
             nPosFromLeft == rInf.GetPosFromLeft() &&
             nCountBy == rInf.GetCountBy() &&
diff --git a/sw/source/core/doc/number.cxx b/sw/source/core/doc/number.cxx
index 5e501646e369..5205bf50dfef 100644
--- a/sw/source/core/doc/number.cxx
+++ b/sw/source/core/doc/number.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: number.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:16 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -144,197 +144,118 @@ extern const sal_Char __FAR_DATA sBulletFntName[] = "starbats";
 extern const sal_Char __FAR_DATA sBulletFntName[] = "StarBats";
 #endif
 
-
-// Methoden fuer die Klassen aus NUMRULE.HXX
-
-SwNumFmt::SwNumFmt()
-    : SwClient( 0 ),
-    pBulletFont( 0 ),
-    cBullet( cBulletChar ),
-    eNumAdjust( SVX_ADJUST_LEFT ),
-    nLSpace( 0 ),
-    nAbsLSpace( 0 ),
-    nFirstLineOffset( 0 ),
-    nCharTextOffset( 0 ),
-    nStart( 0 ),
-    pGrfBrush( 0 ), pVertOrient( 0 )
-{
-    nInclUpperLevel = MAXLEVEL;
-    bRelLSpace = FALSE;
-}
-
-
-SwNumFmt::SwNumFmt( const SwNumFmt& rNumFmt )
-    : SwClient( rNumFmt.pRegisteredIn ), SwNumType( rNumFmt ),
-    cBullet( rNumFmt.cBullet ),
-    pBulletFont( 0 ),
-    eNumAdjust( rNumFmt.eNumAdjust ),
-    nLSpace( rNumFmt.nLSpace ),
-    nAbsLSpace( rNumFmt.nAbsLSpace ),
-    nFirstLineOffset( rNumFmt.nFirstLineOffset ),
-    nCharTextOffset( rNumFmt.nCharTextOffset ),
-    nStart( rNumFmt.nStart ),
-    aPrefix( rNumFmt.aPrefix ),
-    aPostfix( rNumFmt.aPostfix ),
-    pGrfBrush( 0 ), pVertOrient( 0 )
+inline void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
 {
-    SetBulletFont(rNumFmt.GetBulletFont());
-    nInclUpperLevel = rNumFmt.nInclUpperLevel;
-    bRelLSpace = rNumFmt.bRelLSpace;
-
-    SetGrfBrush( rNumFmt.GetGrfBrush(), &rNumFmt.GetGrfSize(),
-                rNumFmt.GetGrfOrient() );
+    if( rNd.GetNum() &&
+        (~NO_NUMLEVEL & rNd.GetNum()->GetLevel() ) == nLevel )
+        rNd.NumRuleChgd();
 }
+/* -----------------------------22.02.01 13:41--------------------------------
 
-
-SwNumFmt::~SwNumFmt()
+ ---------------------------------------------------------------------------*/
+SwNumFmt::SwNumFmt() :
+    SwClient( 0 ),
+    SvxNumberFormat(SVX_NUM_ARABIC),
+    pVertOrient(0)
 {
-    delete pBulletFont;
-    delete pGrfBrush;
-    delete pVertOrient;
 }
+/* -----------------------------22.02.01 13:42--------------------------------
 
-
-void SwNumFmt::SetBulletFont(const Font* pFont)
+ ---------------------------------------------------------------------------*/
+SwNumFmt::SwNumFmt( const SwNumFmt& rFmt) :
+    SwClient( rFmt.pRegisteredIn ),
+    SvxNumberFormat(rFmt),
+    pVertOrient(0)
 {
-    if( pBulletFont )
-    {
-        if( pFont )
-            *pBulletFont = *pFont;
-        else
-            delete pBulletFont, pBulletFont = 0;
-    }
-    else if( pFont )
-        pBulletFont = new Font( *pFont );
+    SvxFrameVertOrient eOrient = rFmt.GetVertOrient();
+    SetGraphicBrush( rFmt.GetBrush(), &rFmt.GetGraphicSize(),
+                SVX_VERT_NONE == eOrient ? 0 : &eOrient);
 }
+/* -----------------------------22.02.01 13:58--------------------------------
 
-
-void SwNumFmt::SetGrfBrush( const SvxBrushItem* pGrfBr, const Size* pSz,
-                            const SwFmtVertOrient* pVOrient )
+ ---------------------------------------------------------------------------*/
+SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
+    SvxNumberFormat(rNumFmt),
+    pVertOrient(0)
 {
-    if( pGrfBr )
+    const String& rCharStyleName = rNumFmt.SvxNumberFormat::GetCharFmtName();
+    if( rCharStyleName.Len() )
     {
-        if( pGrfBrush )
-        {
-            if( !( *pGrfBrush == *pGrfBr ) )
-            {
-                delete pGrfBrush;
-                pGrfBrush = (SvxBrushItem*)pGrfBr->Clone();
-            }
-        }
-        else
-            pGrfBrush = (SvxBrushItem*)pGrfBr->Clone();
-
-        if( pVertOrient != pVOrient )
+        SwCharFmt* pCFmt = pDoc->FindCharFmtByName( rCharStyleName );
+        if( !pCFmt )
         {
-            if(pVertOrient)
-                delete pVertOrient;
-
-            pVertOrient = pVOrient ? (SwFmtVertOrient*)pVOrient->Clone() : 0;
+            USHORT nId = pDoc->GetPoolId( rCharStyleName,
+                                            GET_POOLID_CHRFMT );
+            pCFmt = nId != USHRT_MAX
+                        ? pDoc->GetCharFmtFromPool( nId )
+                        : pDoc->MakeCharFmt( rCharStyleName, 0 );
         }
-        if( pSz )
-            aGrfSize = *pSz;
-        else
-            aGrfSize.Width() = aGrfSize.Height() = 0;
-
-        pGrfBrush->SetDoneLink( STATIC_LINK( this, SwNumFmt, GraphicArrived) );
-    }
-    else
-    {
-        delete pGrfBrush, pGrfBrush = 0;
-        delete pVertOrient, pVertOrient = 0;
-        aGrfSize.Width() = aGrfSize.Height() = 0;
+        pCFmt->Add( this );
     }
+    else if( GetRegisteredIn() )
+        pRegisteredIn->Remove( this );
+
 }
+/* -----------------------------22.02.01 13:42--------------------------------
 
+ ---------------------------------------------------------------------------*/
+SwNumFmt::~SwNumFmt()
+{
+    delete pVertOrient;
+}
+/* -----------------------------23.02.01 09:28--------------------------------
 
-SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt )
+ ---------------------------------------------------------------------------*/
+SwNumFmt& SwNumFmt::operator=( const SwNumFmt& rNumFmt)
 {
-    cBullet = rNumFmt.cBullet;
-    eType = rNumFmt.eType;
-    nInclUpperLevel = rNumFmt.nInclUpperLevel;
-    bRelLSpace = rNumFmt.bRelLSpace;
-
-    eNumAdjust = rNumFmt.eNumAdjust;
-    nLSpace = rNumFmt.nLSpace;
-    nAbsLSpace = rNumFmt.nAbsLSpace;
-    nFirstLineOffset = rNumFmt.nFirstLineOffset;
-    nCharTextOffset = rNumFmt.nCharTextOffset;
-    nStart = rNumFmt.nStart;
-    aPrefix = rNumFmt.aPrefix;
-    aPostfix = rNumFmt.aPostfix;
-
-    SetBulletFont(rNumFmt.GetBulletFont());
+    SvxNumberFormat::operator=(rNumFmt);
     if( rNumFmt.GetRegisteredIn() )
         rNumFmt.pRegisteredIn->Add( this );
     else if( GetRegisteredIn() )
         pRegisteredIn->Remove( this );
-
-    SetGrfBrush( rNumFmt.GetGrfBrush(), &rNumFmt.GetGrfSize(),
-                rNumFmt.GetGrfOrient() );
-
     return *this;
 }
+/* -----------------------------23.02.01 09:28--------------------------------
 
-
-BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt ) const
+ ---------------------------------------------------------------------------*/
+BOOL SwNumFmt::operator==( const SwNumFmt& rNumFmt) const
 {
-    BOOL bRet = (
-        eType == rNumFmt.eType &&
-        nInclUpperLevel == rNumFmt.nInclUpperLevel &&
-        bRelLSpace == rNumFmt.bRelLSpace &&
-        eNumAdjust == rNumFmt.eNumAdjust &&
-        nLSpace == rNumFmt.nLSpace &&
-        nAbsLSpace == rNumFmt.nAbsLSpace &&
-        nFirstLineOffset == rNumFmt.nFirstLineOffset &&
-        nCharTextOffset == rNumFmt.nCharTextOffset &&
-        nStart == rNumFmt.nStart &&
-        aPrefix == rNumFmt.aPrefix &&
-        aPostfix == rNumFmt.aPostfix &&
-        pRegisteredIn == rNumFmt.pRegisteredIn);
-
-        if( bRet )
-        {
-            switch( eType )
-            {
-            case SVX_NUM_CHAR_SPECIAL:
-
-                if( cBullet != rNumFmt.cBullet ||
-                    ( pBulletFont
-                        ? ( !rNumFmt.GetBulletFont() ||
-                            *pBulletFont != *rNumFmt.GetBulletFont() )
-                        : 0 != rNumFmt.GetBulletFont() ) )
-                    bRet = FALSE;
-                break;
-
-            case SVX_NUM_BITMAP:
-
-                if( aGrfSize != rNumFmt.aGrfSize ||
-                    ( pGrfBrush
-                        ? ( !rNumFmt.pGrfBrush ||
-                                *pGrfBrush != *rNumFmt.pGrfBrush )
-                        : 0 != rNumFmt.pGrfBrush ) ||
-                    ( pVertOrient
+    BOOL bRet = SvxNumberFormat::operator==(rNumFmt) &&
+        pRegisteredIn == rNumFmt.pRegisteredIn;
+    if(bRet && GetNumberingType() == SVX_NUM_BITMAP)
+    {
+        if(pVertOrient
                         ? ( !rNumFmt.pVertOrient ||
                                 *pVertOrient != *rNumFmt.pVertOrient )
-                        : 0 != rNumFmt.pVertOrient ) )
-                    bRet = FALSE;
-                break;
-            }
-        }
+                        : 0 != rNumFmt.pVertOrient );
+            bRet = FALSE;
+    }
     return bRet;
 }
 
+/* -----------------------------22.02.01 13:42--------------------------------
 
-void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt )
+ ---------------------------------------------------------------------------*/
+const Graphic* SwNumFmt::GetGraphic() const
+{
+    const Graphic* pGrf = 0;
+    if( GetBrush() && GetCharFmt() )
+        pGrf = GetBrush()->GetGraphic( GetCharFmt()->GetDoc()->GetDocShell() );
+    return pGrf;
+}
+/* -----------------------------22.02.01 13:44--------------------------------
+
+ ---------------------------------------------------------------------------*/
+void SwNumFmt::SetCharFmt( SwCharFmt* pChFmt)
 {
     if( pChFmt )
         pChFmt->Add( this );
     else if( GetRegisteredIn() )
         pRegisteredIn->Remove( this );
 }
+/* -----------------------------22.02.01 13:45--------------------------------
 
-
+ ---------------------------------------------------------------------------*/
 void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
 {
     // dann suche mal in dem Doc nach dem NumRules-Object, in dem dieses
@@ -353,47 +274,55 @@ void SwNumFmt::Modify( SfxPoolItem* pOld, SfxPoolItem* pNew )
     else
         SwClient::Modify( pOld, pNew );
 }
+/* -----------------------------23.02.01 11:08--------------------------------
 
-
-void SwNumFmt::SetGraphic( const String& rName )
+ ---------------------------------------------------------------------------*/
+void SwNumFmt::SetCharFmtName(const String& rSet)
 {
-    if( pGrfBrush && *pGrfBrush->GetGraphicLink() == rName )
-        return ;
-
-    delete pGrfBrush;
-
-    pGrfBrush = new SvxBrushItem( rName, aEmptyStr, GPOS_AREA );
-    pGrfBrush->SetDoneLink( STATIC_LINK( this, SwNumFmt, GraphicArrived) );
-    if( !pVertOrient )
-        pVertOrient = new SwFmtVertOrient( 0, VERT_TOP );
-
-    aGrfSize.Width() = aGrfSize.Height() = 0;
+    SvxNumberFormat::SetCharFmtName(rSet);
 }
+/* -----------------------------22.02.01 13:47--------------------------------
 
+ ---------------------------------------------------------------------------*/
+const String&   SwNumFmt::GetCharFmtName() const
+{
+    if((SwCharFmt*)pRegisteredIn)
+        return ((SwCharFmt*)pRegisteredIn)->GetName();
+    else
+        return aEmptyStr;
+}
+/* -----------------------------22.02.01 16:05--------------------------------
 
-IMPL_STATIC_LINK( SwNumFmt, GraphicArrived, void *, EMPTYARG )
+ ---------------------------------------------------------------------------*/
+void    SwNumFmt::SetGraphicBrush( const SvxBrushItem* pBrushItem, const Size* pSize,
+    const SvxFrameVertOrient* pOrient)
 {
-    // ggfs. die GrfSize setzen:
-    if( !pThis->aGrfSize.Width() || !pThis->aGrfSize.Height() )
-    {
-        const Graphic* pGrf = pThis->pGrfBrush->GetGraphic();
-        if( pGrf )
-            pThis->aGrfSize = ::GetGraphicSizeTwip( *pGrf, 0 );
-    }
+    DELETEZ(pVertOrient);
+    if(pOrient)
+        pVertOrient = new SwFmtVertOrient( 0, (SwVertOrient) *pOrient);
+    SvxNumberFormat::SetGraphicBrush( pBrushItem, pSize, pOrient);
+}
+/* -----------------------------22.02.01 16:05--------------------------------
 
-    if( pThis->GetCharFmt() )
-        pThis->UpdateNumNodes( (SwDoc*)pThis->GetCharFmt()->GetDoc() );
+ ---------------------------------------------------------------------------*/
+void    SwNumFmt::SetVertOrient(SvxFrameVertOrient eSet)
+{
+    SvxNumberFormat::SetVertOrient(eSet);
+    DELETEZ(pVertOrient);
+    if(VERT_NONE != eSet)
+        pVertOrient = new SwFmtVertOrient( 0, (SwVertOrient) eSet);
 
-    return 0;
 }
+/* -----------------------------22.02.01 16:05--------------------------------
 
-inline void lcl_SetRuleChgd( SwTxtNode& rNd, BYTE nLevel )
+ ---------------------------------------------------------------------------*/
+SvxFrameVertOrient  SwNumFmt::GetVertOrient() const
 {
-    if( rNd.GetNum() &&
-        (~NO_NUMLEVEL & rNd.GetNum()->GetLevel() ) == nLevel )
-        rNd.NumRuleChgd();
+    return pVertOrient ? (SvxFrameVertOrient)pVertOrient->GetVertOrient() : SVX_VERT_NONE;
 }
+/* -----------------------------22.02.01 13:54--------------------------------
 
+ ---------------------------------------------------------------------------*/
 void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
 {
     BOOL bDocIsModified = pDoc->IsModified();
@@ -470,137 +399,6 @@ void SwNumFmt::UpdateNumNodes( SwDoc* pDoc )
         pDoc->ResetModified();
 }
 
-// Graphic ggfs. reinswappen
-const Graphic* SwNumFmt::GetGraphic() const
-{
-    const Graphic* pGrf = 0;
-    if( pGrfBrush && GetCharFmt() )
-        pGrf = pGrfBrush->GetGraphic( GetCharFmt()->GetDoc()->GetDocShell() );
-    return pGrf;
-}
-
-
-/*  */
-
-void SwNumType::GetRomanStr( ULONG nNo, String& rStr ) const
-{
-    nNo %= 4000;            // mehr kann nicht dargestellt werden
-//      i, ii, iii, iv, v, vi, vii, vii, viii, ix
-//                          (Dummy),1000,500,100,50,10,5,1
-    const sal_Char *cRomanArr = SVX_NUM_ROMAN_UPPER == eType
-                        ? "MDCLXVI--"   // +2 Dummy-Eintraege !!
-                        : "mdclxvi--";  // +2 Dummy-Eintraege !!
-
-    USHORT nMask = 1000;
-    while( nMask )
-    {
-        BYTE nZahl = BYTE(nNo / nMask);
-        BYTE nDiff = 1;
-        nNo %= nMask;
-
-        if( 5 < nZahl )
-        {
-            if( nZahl < 9 )
-                rStr += *(cRomanArr-1);
-            ++nDiff;
-            nZahl -= 5;
-        }
-        switch( nZahl )
-        {
-        case 3:     { rStr += *cRomanArr; }
-        case 2:     { rStr += *cRomanArr; }
-        case 1:     { rStr += *cRomanArr; }
-                    break;
-
-        case 4:     {
-                        rStr += *cRomanArr;
-                        rStr += *(cRomanArr-nDiff);
-                    }
-                    break;
-        case 5:     { rStr += *(cRomanArr-nDiff); }
-                    break;
-        }
-
-        nMask /= 10;            // zur naechsten Dekade
-        cRomanArr += 2;
-    }
-}
-
-
-void SwNumType::GetCharStr( ULONG nNo, String& rStr ) const
-{
-    ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
-
-    const ULONG coDiff = 'Z' - 'A' +1;
-    char cAdd = (SVX_NUM_CHARS_UPPER_LETTER == eType ? 'A' : 'a') - 1;
-    ULONG nCalc;
-
-    do {
-        nCalc = nNo % coDiff;
-        if( !nCalc )
-            nCalc = coDiff;
-        rStr.Insert( (sal_Unicode)(cAdd + nCalc ), 0 );
-        nNo -= nCalc;
-        if( nNo )
-            nNo /= coDiff;
-    } while( nNo );
-}
-
-void SwNumType::GetCharStrN( ULONG nNo, String& rStr ) const
-{
-    ASSERT( nNo, "0 ist eine ungueltige Nummer !!" );
-
-    const ULONG coDiff = 'Z' - 'A' +1;
-    sal_Unicode cChar = --nNo % coDiff;
-    if( SVX_NUM_CHARS_UPPER_LETTER_N == eType )
-        cChar += 'A';
-    else
-        cChar += 'a';
-
-    rStr.Fill( (nNo / coDiff) + 1, cChar );
-}
-
-
-String SwNumType::GetNumStr( ULONG nNo ) const
-{
-    String aTmpStr;
-    if( nNo )
-    {
-        switch( eType )
-        {
-        case SVX_NUM_CHARS_UPPER_LETTER:
-        case SVX_NUM_CHARS_LOWER_LETTER:
-            GetCharStr( nNo, aTmpStr );
-            break;
-
-        case SVX_NUM_CHARS_UPPER_LETTER_N:
-        case SVX_NUM_CHARS_LOWER_LETTER_N:
-            GetCharStrN( nNo, aTmpStr );
-            break;
-
-        case SVX_NUM_ROMAN_UPPER:
-        case SVX_NUM_ROMAN_LOWER:
-            GetRomanStr( nNo, aTmpStr );
-            break;
-
-        case SVX_NUM_CHAR_SPECIAL:      //JP 06.12.99: this types dont have
-        case SVX_NUM_BITMAP:            // any number, so return emptystr
-        case SVX_NUM_NUMBER_NONE:       //  Bug: 70527
-            break;
-
-//      case ARABIC:    ist jetzt default
-        default:
-            aTmpStr = String::CreateFromInt32( nNo );
-            break;
-        }
-    }
-    else
-        aTmpStr = '0';
-    return aTmpStr;
-}
-
-/*  */
-
 BOOL SwNodeNum::operator==( const SwNodeNum& rNum ) const
 {
     return nMyLevel == rNum.nMyLevel &&
@@ -629,14 +427,12 @@ SwNumRule::SwNumRule( const String& rNm, SwNumRuleType eType, BOOL bAutoFlg )
         for( int n = 0; n < MAXLEVEL; ++n )
         {
             pFmt = new SwNumFmt;
-            pFmt->SetUpperLevel( 1 );
-//          pFmt->SetRelLSpace( TRUE );
-            pFmt->SetRelLSpace( FALSE );
-            pFmt->SetStartValue( 1 );
+            pFmt->SetIncludeUpperLevels( 1 );
+            pFmt->SetStart( 1 );
             pFmt->SetLSpace( lNumIndent );
             pFmt->SetAbsLSpace( SwNumRule::GetNumIndent( n ) );
             pFmt->SetFirstLineOffset( lNumFirstLineOffset );
-            pFmt->SetPostfix( aDotStr );
+            pFmt->SetSuffix( aDotStr );
             SwNumRule::aBaseFmts[ NUM_RULE ][ n ] = pFmt;
         }
 
@@ -646,9 +442,9 @@ SwNumRule::SwNumRule( const String& rNm, SwNumRuleType eType, BOOL bAutoFlg )
             pFmt = new SwNumFmt;
 //JP 18.01.96: heute soll es mal wieder vollstaendig numeriert werden
 //JP 10.03.96: und nun mal wieder nicht
-            pFmt->eType = SVX_NUM_NUMBER_NONE;
+            pFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
 //            pFmt->eType = ARABIC;
-            pFmt->SetStartValue( 1 );
+            pFmt->SetStart( 1 );
             SwNumRule::aBaseFmts[ OUTLINE_RULE ][ n ] = pFmt;
         }
     }
@@ -815,14 +611,14 @@ String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
     if( NO_NUM > rNum.GetLevel() && !( NO_NUMLEVEL & rNum.GetLevel() ) )
     {
         const SwNumFmt& rMyNFmt = Get( rNum.GetLevel() );
-        if( SVX_NUM_NUMBER_NONE != rMyNFmt.eType )
+        if( SVX_NUM_NUMBER_NONE != rMyNFmt.GetNumberingType() )
         {
             BYTE i = rNum.GetLevel();
 
             if( !IsContinusNum() &&
-                rMyNFmt.IsInclUpperLevel() )        // nur der eigene Level ?
+                rMyNFmt.GetIncludeUpperLevels() )       // nur der eigene Level ?
             {
-                BYTE n = rMyNFmt.GetUpperLevel();
+                BYTE n = rMyNFmt.GetIncludeUpperLevels();
                 if( 1 < n )
                 {
                     if( i+1 >= n )
@@ -835,7 +631,7 @@ String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
             for( ; i <= rNum.GetLevel(); ++i )
             {
                 const SwNumFmt& rNFmt = Get( i );
-                if( SVX_NUM_NUMBER_NONE == rNFmt.eType )
+                if( SVX_NUM_NUMBER_NONE == rNFmt.GetNumberingType() )
                 {
     // Soll aus 1.1.1 --> 2. NoNum --> 1..1 oder 1.1 ??
     //                 if( i != rNum.nMyLevel )
@@ -860,11 +656,11 @@ String SwNumRule::MakeNumString( const SwNodeNum& rNum, BOOL bInclStrings,
         //JP 14.12.99: the type dont have any number, so dont append
         //              the Post-/Prefix String
         if( bInclStrings && !bOnlyArabic &&
-            SVX_NUM_CHAR_SPECIAL != rMyNFmt.eType &&
-            SVX_NUM_BITMAP != rMyNFmt.eType )
+            SVX_NUM_CHAR_SPECIAL != rMyNFmt.GetNumberingType() &&
+            SVX_NUM_BITMAP != rMyNFmt.GetNumberingType() )
         {
             aStr.Insert( rMyNFmt.GetPrefix(), 0 );
-            aStr += rMyNFmt.GetPostfix();
+            aStr += rMyNFmt.GetSuffix();
         }
     }
     return aStr;
@@ -898,80 +694,6 @@ SwNumRule& SwNumRule::CopyNumRule( SwDoc* pDoc, const SwNumRule& rNumRule )
     bInvalidRuleFlag = TRUE;
     return *this;
 }
-/* -----------------30.10.98 08:40-------------------
- *
- * --------------------------------------------------*/
-SwNumFmt::SwNumFmt(const SvxNumberFormat& rNumFmt, SwDoc* pDoc) :
-    pBulletFont( 0 ),
-    pGrfBrush( 0 ),
-    pVertOrient( 0 )
-{
-    cBullet = rNumFmt.GetBulletChar();
-    eType = rNumFmt.GetNumType();
-    nInclUpperLevel = rNumFmt.GetIncludeUpperLevels();
-    bRelLSpace = FALSE;
-
-    eNumAdjust = rNumFmt.GetNumAdjust();
-    nLSpace = rNumFmt.GetLSpace();
-    nAbsLSpace = rNumFmt.GetAbsLSpace();
-    nFirstLineOffset = rNumFmt.GetFirstLineOffset();
-    nCharTextOffset = rNumFmt.GetCharTextDistance();
-    nStart = rNumFmt.GetStart();
-    aPrefix = rNumFmt.GetPrefix();
-    aPostfix = rNumFmt.GetSuffix();
-
-    SetBulletFont(rNumFmt.GetBulletFont());
-    if( rNumFmt.GetCharFmt().Len() )
-    {
-        SwCharFmt* pCFmt = pDoc->FindCharFmtByName( rNumFmt.GetCharFmt() );
-        if( !pCFmt )
-        {
-            USHORT nId = pDoc->GetPoolId( rNumFmt.GetCharFmt(),
-                                            GET_POOLID_CHRFMT );
-            pCFmt = nId != USHRT_MAX
-                        ? pDoc->GetCharFmtFromPool( nId )
-                        : pDoc->MakeCharFmt( rNumFmt.GetCharFmt(), 0 );
-        }
-        pCFmt->Add( this );
-    }
-    else if( GetRegisteredIn() )
-        pRegisteredIn->Remove( this );
-
-    SwVertOrient eOrient = (SwVertOrient)(USHORT) rNumFmt.GetVertOrient();
-    SwFmtVertOrient aOrient(0, eOrient);
-    Size aTmpSize(rNumFmt.GetGraphicSize());
-    SetGrfBrush( rNumFmt.GetBrush(), &aTmpSize,
-                &aOrient );
-
-}
-/* -----------------30.10.98 12:36-------------------
- *
- * --------------------------------------------------*/
-SvxNumberFormat SwNumFmt::MakeSvxFormat() const
-{
-    SvxNumberFormat aRet(eType);
-    aRet.SetNumAdjust(eNumAdjust);
-    aRet.SetIncludeUpperLevels(nInclUpperLevel);
-    aRet.SetStart(nStart);
-    aRet.SetBulletChar(cBullet);
-    aRet.SetFirstLineOffset(nFirstLineOffset);
-    aRet.SetAbsLSpace(nAbsLSpace);
-    aRet.SetLSpace(nLSpace);
-    aRet.SetPrefix(aPrefix);
-    aRet.SetSuffix(aPostfix);
-    if( GetCharFmt() )
-        aRet.SetCharFmt( GetCharFmt()->GetName() );
-    aRet.SetCharTextDistance(nCharTextOffset);
-
-    SvxFrameVertOrient eOrient = SVX_VERT_NONE;
-    if(pVertOrient)
-        eOrient = (SvxFrameVertOrient)(USHORT)pVertOrient->GetVertOrient();
-    aRet.SetGraphicBrush( pGrfBrush, &aGrfSize, &eOrient);
-
-    aRet.SetBulletFont(pBulletFont);
-    return aRet;
-}
-
 /* -----------------30.10.98 08:33-------------------
  *
  * --------------------------------------------------*/
@@ -1008,8 +730,8 @@ SvxNumRule SwNumRule::MakeSvxNumRule() const
     for( USHORT n = 0; n < MAXLEVEL; ++n )
     {
         const SwNumFmt rNumFmt = Get(n);
-        SvxNumberFormat aSvxFormat = rNumFmt.MakeSvxFormat();
-        aRule.SetLevel(n, aSvxFormat, aFmts[n] != 0);
+//      SvxNumberFormat aSvxFormat = rNumFmt.MakeSvxFormat();
+        aRule.SetLevel(n, rNumFmt, aFmts[n] != 0);
     }
     return aRule;
 }
diff --git a/sw/source/core/doc/poolfmt.cxx b/sw/source/core/doc/poolfmt.cxx
index f411f91b961b..1b508c45361c 100644
--- a/sw/source/core/doc/poolfmt.cxx
+++ b/sw/source/core/doc/poolfmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: poolfmt.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:14:31 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1761,11 +1761,11 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_NUM1:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_ARABIC;
+            aFmt.SetNumberingType(SVX_NUM_ARABIC);
             aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
-            aFmt.SetPostfix( aDotStr );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
+            aFmt.SetSuffix( aDotStr );
 
             static const USHORT aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1819,15 +1819,15 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
             const USHORT* pArr = aAbsSpace;
 #endif
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_ARABIC;
+            aFmt.SetNumberingType(SVX_NUM_ARABIC);
             aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             USHORT nSpace = 0;
             for( n = 0; n < MAXLEVEL; ++n )
             {
                 aFmt.SetAbsLSpace( nSpace += pArr[ n ] );
                 aFmt.SetFirstLineOffset( - pArr[ n ] );
-                aFmt.SetStartValue( n+1 );
+                aFmt.SetStart( n+1 );
                 pNewRule->Set( n, aFmt );
             }
         }
@@ -1835,16 +1835,16 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_NUM3:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_ARABIC;
+            aFmt.SetNumberingType(SVX_NUM_ARABIC);
             aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             USHORT nOffs = GetMetricVal( CM_1 ) * 3;
             aFmt.SetFirstLineOffset( - nOffs );
 
             for( n = 0; n < MAXLEVEL; ++n )
             {
                 aFmt.SetAbsLSpace( (n+1) * nOffs );
-                aFmt.SetStartValue( n+1 );
+                aFmt.SetStart( n+1 );
                 pNewRule->Set( n, aFmt );
             }
         }
@@ -1852,10 +1852,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_NUM4:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_ROMAN_UPPER;
+            aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);
             aFmt.SetCharFmt( pNumCFmt );
-            aFmt.SetUpperLevel( 1 );
-            aFmt.SetPostfix( aDotStr );
+            aFmt.SetIncludeUpperLevels( 1 );
+            aFmt.SetSuffix( aDotStr );
 
             static const USHORT aAbsSpace[ MAXLEVEL ] =
                 {
@@ -1878,7 +1878,7 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
             aFmt.SetFirstLineOffset( - (*pArr) );
             for( n = 0; n < MAXLEVEL; ++n, ++pArr )
             {
-                aFmt.SetStartValue( n + 1 );
+                aFmt.SetStart( n + 1 );
                 aFmt.SetAbsLSpace( *pArr );
                 pNewRule->Set( n, aFmt );
             }
@@ -1909,32 +1909,32 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
             const USHORT* pArr0to2 = aAbsSpace0to2;
 #endif
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_ARABIC;
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
-            aFmt.SetPostfix( aDotStr );
+            aFmt.SetNumberingType(SVX_NUM_ARABIC);
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
+            aFmt.SetSuffix( aDotStr );
             aFmt.SetFirstLineOffset( -pArr0to2[0] );    // == 0.40 cm
             aFmt.SetAbsLSpace( pArr0to2[1] );           // == 0.40 cm
 
             aFmt.SetCharFmt( pNumCFmt );
             pNewRule->Set( 0, aFmt );
 
-            aFmt.SetUpperLevel( 2 );
-            aFmt.SetStartValue( 2 );
+            aFmt.SetIncludeUpperLevels( 2 );
+            aFmt.SetStart( 2 );
             aFmt.SetFirstLineOffset( -pArr0to2[2] );    // == 0.65 cm
             aFmt.SetAbsLSpace( pArr0to2[3] );           // == 1.10 cm
             pNewRule->Set( 1, aFmt );
 
-            aFmt.eType = SVX_NUM_CHARS_LOWER_LETTER;
-            aFmt.SetPostfix( ')');
-            aFmt.SetUpperLevel( 1 );
-            aFmt.SetStartValue( 3 );
+            aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER);
+            aFmt.SetSuffix( ')');
+            aFmt.SetIncludeUpperLevels( 1 );
+            aFmt.SetStart( 3 );
             aFmt.SetFirstLineOffset( - pArr0to2[4] );   // == 0.45cm
             aFmt.SetAbsLSpace( pArr0to2[5] );           // == 1.55 cm
             pNewRule->Set( 2, aFmt );
 
 
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
             aFmt.SetBulletFont(  &SwNumRule::GetDefBulletFont() );
             aFmt.SetBulletChar( cBulletChar );
@@ -1942,10 +1942,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
                    nOffs2 = GetMetricVal( CM_1 ) * 2;
 
             aFmt.SetFirstLineOffset( - nOffs );
-            aFmt.SetPostfix( aEmptyStr );
+            aFmt.SetSuffix( aEmptyStr );
             for( n = 3; n < MAXLEVEL; ++n )
             {
-                aFmt.SetStartValue( n+1 );
+                aFmt.SetStart( n+1 );
                 aFmt.SetAbsLSpace( nOffs2 + ((n-3) * nOffs) );
                 pNewRule->Set( n, aFmt );
             }
@@ -1955,10 +1955,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_BUL1:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             aFmt.SetBulletFont( &SwNumRule::GetDefBulletFont() );
             aFmt.SetBulletChar( cBulletChar );
 
@@ -1991,10 +1991,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_BUL2:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             aFmt.SetBulletFont(  &SwNumRule::GetDefBulletFont() );
             aFmt.SetBulletChar( 0xF000 + 150 );
 
@@ -2027,10 +2027,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_BUL3:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             aFmt.SetBulletFont(  &SwNumRule::GetDefBulletFont() );
             USHORT nOffs = GetMetricVal( CM_01 ) * 4;
             aFmt.SetFirstLineOffset( - nOffs );
@@ -2046,10 +2046,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_BUL4:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             aFmt.SetBulletFont(  &SwNumRule::GetDefBulletFont() );
 
             static const USHORT aAbsSpace[ MAXLEVEL ] =
@@ -2087,10 +2087,10 @@ SwNumRule* SwDoc::GetNumRuleFromPool( USHORT nId, String* pDesc,
     case RES_POOLNUMRULE_BUL5:
         {
             SwNumFmt aFmt;
-            aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aFmt.SetCharFmt( pBullCFmt );
-            aFmt.SetStartValue( 1 );
-            aFmt.SetUpperLevel( 1 );
+            aFmt.SetStart( 1 );
+            aFmt.SetIncludeUpperLevels( 1 );
             aFmt.SetBulletChar( 0xF000 + 79 );
             aFmt.SetBulletFont(  &SwNumRule::GetDefBulletFont() );
 
diff --git a/sw/source/core/docnode/ndnum.cxx b/sw/source/core/docnode/ndnum.cxx
index 2721b9a60ca4..77fff59dd978 100644
--- a/sw/source/core/docnode/ndnum.cxx
+++ b/sw/source/core/docnode/ndnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ndnum.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:17 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -254,11 +254,11 @@ BOOL _OutlinePara::UpdateOutline( SwTxtNode& rTxtNd )
                 memset( aNum.GetLevelVal() + (aNum.GetLevel()+1), 0,
                         (MAXLEVEL - ( aNum.GetLevel()+1 )) *
                             sizeof( aNum.GetLevelVal()[0]));
-            nSetValue = pOutlRule->Get( nLevel ).GetStartValue();
+            nSetValue = pOutlRule->Get( nLevel ).GetStart();
         }
         else if( bInitNum )
         {
-            nSetValue= pOutlRule->Get( nLevel ).GetStartValue();
+            nSetValue= pOutlRule->Get( nLevel ).GetStart();
             bInitNum = FALSE;
         }
         else
diff --git a/sw/source/core/edit/autofmt.cxx b/sw/source/core/edit/autofmt.cxx
index 2d0f1cf76b43..20119812cfb9 100644
--- a/sw/source/core/edit/autofmt.cxx
+++ b/sw/source/core/edit/autofmt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: autofmt.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: er $ $Date: 2000-10-29 17:13:34 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1598,8 +1598,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
                         SwNumFmt aFmt( aRule.Get( n ) );
                         aFmt.SetBulletFont( pBullFnt );
                         aFmt.SetBulletChar( cBullChar );
-                        aFmt.eType = SVX_NUM_CHAR_SPECIAL;
-                        aFmt.SetRelLSpace( FALSE );
+                        aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
                         aFmt.SetFirstLineOffset( lBullFirstLineOffset );
                         aFmt.SetAbsLSpace( nAbsPos );
                         aRule.Set( n, aFmt );
@@ -1653,17 +1652,17 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
                 if( !nDigitLevel )
                 {
                     SwNumFmt aFmt( aRule.Get( nLvl ) );
-                    aFmt.SetStartValue( aPreFix.GetToken( 1,
+                    aFmt.SetStart( aPreFix.GetToken( 1,
                                             (sal_Unicode)1 ).ToInt32());
                     aFmt.SetPrefix( aPreFix.GetToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetPostfix( aPostFix.GetToken( 0, (sal_Unicode)1 ));
-                    aFmt.SetInclUpperLevel( FALSE );
+                    aFmt.SetSuffix( aPostFix.GetToken( 0, (sal_Unicode)1 ));
+                    aFmt.SetIncludeUpperLevels( 0 );
 
                     if( !aFmt.GetCharFmt() )
                         aFmt.SetCharFmt( pCFmt );
 
                     if( aNumTypes.Len() )
-                        aFmt.eType = (SvxExtNumType)(aNumTypes.GetChar( 0 ) - '0');
+                        aFmt.SetNumberingType(aNumTypes.GetChar( 0 ) - '0');
 
                     aRule.Set( nLvl, aFmt );
                 }
@@ -1674,16 +1673,15 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
                     {
                         SwNumFmt aFmt( aRule.Get( n ) );
 
-                        aFmt.SetStartValue( aPreFix.GetToken( n+1,
+                        aFmt.SetStart( aPreFix.GetToken( n+1,
                                                     (sal_Unicode)1 ).ToInt32() );
                         if( !n )
                             aFmt.SetPrefix( aPreFix.GetToken( n, (sal_Unicode)1 ));
-                        aFmt.SetPostfix( aPostFix.GetToken( n, (sal_Unicode)1 ));
-                        aFmt.SetInclUpperLevel( TRUE );
+                        aFmt.SetSuffix( aPostFix.GetToken( n, (sal_Unicode)1 ));
+                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
                         if( n < aNumTypes.Len() )
-                            aFmt.eType = (SvxExtNumType)(aNumTypes.GetChar( n ) - '0');
+                            aFmt.SetNumberingType((aNumTypes.GetChar( n ) - '0'));
 
-                        aFmt.SetRelLSpace( FALSE );
                         aFmt.SetAbsLSpace( USHORT( nSpaceSteps * n )
                                             + lNumIndent );
 
@@ -1698,8 +1696,7 @@ void SwAutoFormat::BuildEnum( USHORT nLvl, USHORT nDigitLevel )
                     for( ; n < MAXLEVEL; ++n )
                     {
                         SwNumFmt aFmt( aRule.Get( n ) );
-                        aFmt.SetInclUpperLevel( TRUE );
-                        aFmt.SetRelLSpace( FALSE );
+                        aFmt.SetIncludeUpperLevels( MAXLEVEL );
                         if( bDefStep )
                             aFmt.SetAbsLSpace( USHORT( (nLeftTxtPos +
                                         SwNumRule::GetNumIndent( n - nLvl ))));
diff --git a/sw/source/core/fields/chpfld.cxx b/sw/source/core/fields/chpfld.cxx
index 6acb68785477..34d3ba068b6b 100644
--- a/sw/source/core/fields/chpfld.cxx
+++ b/sw/source/core/fields/chpfld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: chpfld.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-19 00:08:19 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -183,7 +183,7 @@ void SwChapterField::ChangeExpansion( const SwFrm* pFrm,
                     if( nPrevLvl < nLevel )
                         nLevel = nPrevLvl;
                     else if( SVX_NUM_NUMBER_NONE != pDoc->GetOutlineNumRule()
-                            ->Get( nLevel ).eType )
+                            ->Get( nLevel ).GetNumberingType() )
                     {
                         pTxtNd = pONd;
                         break;
@@ -205,7 +205,7 @@ void SwChapterField::ChangeExpansion( const SwFrm* pFrm,
         if( NO_NUM > rNum.GetLevel() && !( NO_NUMLEVEL & rNum.GetLevel() ) )
         {
             const SwNumFmt& rNFmt = pDoc->GetOutlineNumRule()->Get( rNum.GetLevel() );
-            sPost = rNFmt.GetPostfix();
+            sPost = rNFmt.GetSuffix();
             sPre = rNFmt.GetPrefix();
         }
         else
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index f6fef50b11a1..effb3ba47a01 100644
--- a/sw/source/core/fields/docufld.cxx
+++ b/sw/source/core/fields/docufld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docufld.cxx,v $
  *
- *  $Revision: 1.12 $
+ *  $Revision: 1.13 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:40:23 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -238,7 +238,7 @@ using namespace ::rtl;
 
 SwPageNumberFieldType::SwPageNumberFieldType()
     : SwFieldType( RES_PAGENUMBERFLD ),
-    eNumFormat( SVX_NUM_ARABIC ),
+    nNumberingType( SVX_NUM_ARABIC ),
     nNum( 0 ),
     nMax( USHRT_MAX ),
     bVirtuell( sal_False )
@@ -248,7 +248,7 @@ SwPageNumberFieldType::SwPageNumberFieldType()
 String& SwPageNumberFieldType::Expand( sal_uInt32 nFmt, short nOff,
                                 const String& rUserStr, String& rRet ) const
 {
-    sal_uInt32 nTmpFmt = (SVX_NUM_PAGEDESC == nFmt) ? (sal_uInt32)eNumFormat : nFmt;
+    sal_uInt32 nTmpFmt = (SVX_NUM_PAGEDESC == nFmt) ? (sal_uInt32)nNumberingType : nFmt;
     long nTmp = nNum + nOff;
 
     if( 0 >= nTmp || SVX_NUM_NUMBER_NONE == nTmpFmt || (!bVirtuell && nTmp > nMax) )
@@ -266,7 +266,7 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 
     pTmp->nNum       = nNum;
     pTmp->nMax       = nMax;
-    pTmp->eNumFormat = eNumFormat;
+    pTmp->nNumberingType = nNumberingType;
     pTmp->bVirtuell  = bVirtuell;
 
     return pTmp;
@@ -278,12 +278,12 @@ SwFieldType* SwPageNumberFieldType::Copy() const
 
 void SwPageNumberFieldType::ChangeExpansion( SwDoc* pDoc, sal_uInt16 nPage,
                                             sal_uInt16 nNumPages, sal_Bool bVirt,
-                                            const SvxExtNumType* pNumFmt )
+                                            const sal_Int16* pNumFmt )
 {
     nNum = nPage;
     nMax = nNumPages;
     if( pNumFmt )
-        eNumFormat = *pNumFmt;
+        nNumberingType = *pNumFmt;
 
     bVirtuell = sal_False;
     if( bVirt )
@@ -871,7 +871,7 @@ BOOL SwTemplNameField::PutValue( const uno::Any& rAny, const String& rProperty )
  --------------------------------------------------------------------*/
 
 SwDocStatFieldType::SwDocStatFieldType(SwDoc* pDocument)
-    : SwFieldType( RES_DOCSTATFLD ), eNumFormat( SVX_NUM_ARABIC )
+    : SwFieldType( RES_DOCSTATFLD ), nNumberingType( SVX_NUM_ARABIC )
 {
     pDoc = pDocument;
 }
@@ -893,7 +893,7 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
                 ((SwDocStat &)rDStat).nPage = pDoc->GetRootFrm()->GetPageNum();
             nVal = rDStat.nPage;
             if( SVX_NUM_PAGEDESC == nFmt )
-                nFmt = (sal_uInt32)eNumFormat;
+                nFmt = (sal_uInt32)nNumberingType;
             break;
         default:
             ASSERT( sal_False, "SwDocStatFieldType::Expand: unbekannter SubType" );
@@ -950,7 +950,7 @@ void SwDocStatField::ChangeExpansion( const SwFrm* pFrm )
 {
     if( DS_PAGE == nSubType && SVX_NUM_PAGEDESC == GetFormat() )
         ((SwDocStatFieldType*)GetTyp())->SetNumFormat(
-                pFrm->FindPageFrm()->GetPageDesc()->GetNumType().eType );
+                pFrm->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType() );
 }
 
 /*-----------------05.03.98 11:38-------------------
@@ -2107,7 +2107,7 @@ BOOL SwRefPageSetField::PutValue( const uno::Any& rAny, const String& rProperty
  --------------------------------------------------------------------*/
 
 SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
-    : SwFieldType( RES_REFPAGEGETFLD ), eNumFormat( SVX_NUM_ARABIC ), pDoc( pDc )
+    : SwFieldType( RES_REFPAGEGETFLD ), nNumberingType( SVX_NUM_ARABIC ), pDoc( pDc )
 {
 }
 /* ---------------------------------------------------------------------------
@@ -2116,7 +2116,7 @@ SwRefPageGetFieldType::SwRefPageGetFieldType( SwDoc* pDc )
 SwFieldType* SwRefPageGetFieldType::Copy() const
 {
     SwRefPageGetFieldType* pNew = new SwRefPageGetFieldType( pDoc );
-    pNew->eNumFormat = eNumFormat;
+    pNew->nNumberingType = nNumberingType;
     return pNew;
 }
 /* ---------------------------------------------------------------------------
@@ -2233,7 +2233,7 @@ void SwRefPageGetFieldType::UpdateField( SwTxtFld* pTxtFld,
                 sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
                         ? ( !pPgFrm
                                 ? SVX_NUM_ARABIC
-                                : pPgFrm->GetPageDesc()->GetNumType().eType )
+                                : pPgFrm->GetPageDesc()->GetNumType().GetNumberingType() )
                         : pGetFld->GetFormat();
                 short nPageNum = Max(0, pSetFld->GetOffset() + (short)nDiff);
                 pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
@@ -2326,7 +2326,7 @@ void SwRefPageGetField::ChangeExpansion( const SwFrm* pFrm,
 
         SwRefPageGetField* pGetFld = (SwRefPageGetField*)pFld->GetFld().GetFld();
         sal_uInt32 nTmpFmt = SVX_NUM_PAGEDESC == pGetFld->GetFormat()
-                            ? pPgFrm->GetPageDesc()->GetNumType().eType
+                            ? pPgFrm->GetPageDesc()->GetNumType().GetNumberingType()
                             : pGetFld->GetFormat();
         short nPageNum = Max(0, pSetFld->GetOffset() + (short)nDiff );
         pGetFld->SetText( FormatNumber( nPageNum, nTmpFmt ) );
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 998847e484d2..ae53437434b7 100644
--- a/sw/source/core/fields/fldbas.cxx
+++ b/sw/source/core/fields/fldbas.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldbas.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-02-02 11:47:24 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:19 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -660,11 +660,11 @@ SwField* SwFieldList::GetLastField() const
 
 String FormatNumber(USHORT nNum, ULONG nFormat)
 {
-    SwNumType aNumber;
+    SvxNumberType aNumber;
 
     ASSERT(nFormat != SVX_NUM_NUMBER_NONE, "Falsches Nummern-Format" );
 
-    aNumber.eType = (SvxExtNumType)nFormat;
+    aNumber.SetNumberingType((sal_Int16)nFormat);
     return aNumber.GetNumStr(nNum);
 }
 
diff --git a/sw/source/core/frmedt/fews.cxx b/sw/source/core/frmedt/fews.cxx
index 8e498f08c1cf..2db05cfb7a9e 100644
--- a/sw/source/core/frmedt/fews.cxx
+++ b/sw/source/core/frmedt/fews.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fews.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: jp $ $Date: 2000-10-25 12:02:28 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:20 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -301,7 +301,7 @@ BOOL SwFEShell::GetPageNumber( long nYPos, BOOL bAtCrsrPos, USHORT& rPhyNum, USH
     {
         rPhyNum  = ((const SwPageFrm*)pPage)->GetPhyPageNum();
         rVirtNum = ((const SwPageFrm*)pPage)->GetVirtPageNum();
-        const SwNumType& rNum = ((const SwPageFrm*)pPage)->GetPageDesc()->GetNumType();
+        const SvxNumberType& rNum = ((const SwPageFrm*)pPage)->GetPageDesc()->GetNumType();
         rDisplay = rNum.GetNumStr( rVirtNum );
     }
 
diff --git a/sw/source/core/layout/atrfrm.cxx b/sw/source/core/layout/atrfrm.cxx
index c1c92c7b9abb..657dbd200f05 100644
--- a/sw/source/core/layout/atrfrm.cxx
+++ b/sw/source/core/layout/atrfrm.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: atrfrm.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mib $ $Date: 2001-01-15 11:27:20 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:21 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1933,7 +1933,7 @@ int SwFmtFtnEndAtTxtEnd::operator==( const SfxPoolItem& rItem ) const
 {
     const SwFmtFtnEndAtTxtEnd& rAttr = (SwFmtFtnEndAtTxtEnd&)rItem;
     return SfxEnumItem::operator==( rAttr ) &&
-            aFmt.eType == rAttr.aFmt.eType &&
+            aFmt.GetNumberingType() == rAttr.aFmt.GetNumberingType() &&
             nOffset == rAttr.nOffset &&
             sPrefix == rAttr.sPrefix &&
             sSuffix == rAttr.sSuffix;
@@ -1962,7 +1962,7 @@ BOOL SwFmtFtnEndAtTxtEnd::QueryValue( uno::Any& rVal, BYTE nMemberId ) const
             rVal.setValue(&bVal, ::getBooleanCppuType());
         }
         break;
-        case MID_NUM_TYPE    : rVal <<= (sal_Int16) aFmt.eType; break;
+        case MID_NUM_TYPE    : rVal <<= aFmt.GetNumberingType(); break;
         case MID_PREFIX      : rVal <<= OUString(sPrefix); break;
         case MID_SUFFIX      : rVal <<= OUString(sSuffix); break;
         default: return FALSE;
@@ -2020,7 +2020,7 @@ BOOL SwFmtFtnEndAtTxtEnd::PutValue( const uno::Any& rVal, BYTE nMemberId )
                 (nVal <= SVX_NUM_ARABIC ||
                     SVX_NUM_CHARS_UPPER_LETTER_N == nVal ||
                         SVX_NUM_CHARS_LOWER_LETTER_N == nVal ))
-                aFmt.eType = (SvxExtNumType)nVal;
+                aFmt.SetNumberingType(nVal);
             else
                 bRet = FALSE;
         }
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index f0bbae93cbc1..173f525110cc 100644
--- a/sw/source/core/text/txtfld.cxx
+++ b/sw/source/core/text/txtfld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtfld.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-18 14:07:46 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -200,12 +200,12 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
 
                 MSHORT nVirtNum = pFrame->GetVirtPageNum(),
                        nNumPages = pDoc->GetRootFrm()->GetPageNum();
-                const SvxExtNumType* pNumFmt = SVX_NUM_PAGEDESC == pFld->GetFormat()
-                    ? &pFrame->FindPageFrm()->GetPageDesc()->GetNumType().eType
-                    : 0;
+                sal_Int16 nNumFmt = -1;
+                if(SVX_NUM_PAGEDESC == pFld->GetFormat())
+                    nNumFmt = pFrame->FindPageFrm()->GetPageDesc()->GetNumType().GetNumberingType();
 
                 pPageNr->ChangeExpansion( pDoc, nVirtNum, nNumPages,
-                                            bVirt, pNumFmt );
+                                            bVirt, nNumFmt > -1 ? &nNumFmt : 0);
             }
             pRet = new SwFldPortion( pFld->GetCntnt( bName ) );
             break;
@@ -396,14 +396,14 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
     if( pNumRule && pNum && MAXLEVEL > pNum->GetLevel() )
     {
         CONST SwNumFmt &rNumFmt = pNumRule->Get( pNum->GetLevel() );
-        const sal_Bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetAdjust();
-        const sal_Bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetAdjust();
-        const KSHORT nMinDist = rNumFmt.GetCharTextOffset();
+        const sal_Bool bLeft = SVX_ADJUST_LEFT == rNumFmt.GetNumAdjust();
+        const sal_Bool bCenter = SVX_ADJUST_CENTER == rNumFmt.GetNumAdjust();
+        const KSHORT nMinDist = rNumFmt.GetCharTextDistance();
 
-        if( SVX_NUM_BITMAP == rNumFmt.eType )
+        if( SVX_NUM_BITMAP == rNumFmt.GetNumberingType() )
         {
-            pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),rNumFmt.GetGrfBrush(),
-                rNumFmt.GetGrfOrient(), rNumFmt.GetGrfSize(),
+            pRet = new SwGrfNumPortion( (SwFrm*)GetTxtFrm(),rNumFmt.GetBrush(),
+                rNumFmt.GetGraphicOrientation(), rNumFmt.GetGraphicSize(),
                 bLeft, bCenter, nMinDist );
             long nTmpA = rInf.GetLast()->GetAscent();
             long nTmpD = rInf.GetLast()->Height() - nTmpA;
@@ -418,7 +418,7 @@ SwNumberPortion *SwTxtFormatter::NewNumberPortion( SwTxtFormatInfo &rInf ) const
             SwFont *pNumFnt = 0;
             const SwAttrSet* pFmt = rNumFmt.GetCharFmt() ?
                 &rNumFmt.GetCharFmt()->GetAttrSet() : NULL;
-            if( SVX_NUM_CHAR_SPECIAL == rNumFmt.eType )
+            if( SVX_NUM_CHAR_SPECIAL == rNumFmt.GetNumberingType() )
             {
                 const Font *pFmtFnt = rNumFmt.GetBulletFont();
                 pNumFnt = new SwFont( &rInf.GetCharAttr() );
diff --git a/sw/source/core/text/txtftn.cxx b/sw/source/core/text/txtftn.cxx
index 839056c2bba9..35a0a8ee5b7c 100644
--- a/sw/source/core/text/txtftn.cxx
+++ b/sw/source/core/text/txtftn.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtftn.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ama $ $Date: 2001-02-20 09:51:44 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1004,7 +1004,7 @@ XubString lcl_GetPageNumber( const SwPageFrm* pPage )
 {
     ASSERT( pPage, "GetPageNumber: Homeless TxtFrm" );
     MSHORT nVirtNum = pPage->GetVirtPageNum();
-    const SwNumType& rNum = pPage->GetPageDesc()->GetNumType();
+    const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
     return rNum.GetNumStr( nVirtNum );
 }
 
diff --git a/sw/source/core/tox/txmsrt.cxx b/sw/source/core/tox/txmsrt.cxx
index 5b338e38e3fd..1e9101d0f7aa 100644
--- a/sw/source/core/tox/txmsrt.cxx
+++ b/sw/source/core/tox/txmsrt.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txmsrt.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-02-14 15:19:23 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -667,7 +667,7 @@ String SwTOXPara::GetURL() const
                     for( int n = 0; n <= pNum->GetLevel(); ++n )
                     {
                         int nNum = pNum->GetLevelVal()[ n ];
-                        nNum -= ( rRule.Get( n ).GetStartValue() - 1 );
+                        nNum -= ( rRule.Get( n ).GetStart() - 1 );
                         ( aTxt += String::CreateFromInt32( nNum )) += '.';
                     }
                 }
diff --git a/sw/source/core/unocore/unosett.cxx b/sw/source/core/unocore/unosett.cxx
index 013d19c4ed72..0eb494bf2bed 100644
--- a/sw/source/core/unocore/unosett.cxx
+++ b/sw/source/core/unocore/unosett.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: unosett.cxx,v $
  *
- *  $Revision: 1.17 $
+ *  $Revision: 1.18 $
  *
- *  last change: $Author: os $ $Date: 2000-12-14 12:41:20 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:23 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -495,7 +495,7 @@ void SwXFootnoteProperties::setPropertyValue(const OUString& rPropertyName, cons
                         (nTmp <= SVX_NUM_ARABIC ||
                             nTmp == SVX_NUM_CHARS_UPPER_LETTER_N||
                                 nTmp == SVX_NUM_CHARS_LOWER_LETTER_N))
-                        aFtnInfo.aFmt.eType = (SvxExtNumType)nTmp;
+                        aFtnInfo.aFmt.SetNumberingType(nTmp);
                     else
                         throw lang::IllegalArgumentException();
                 }
@@ -611,7 +611,7 @@ uno::Any SwXFootnoteProperties::getPropertyValue(const OUString& rPropertyName)
                 break;
                 case  WID_NUMBERING_TYPE :
                 {
-                    aRet <<= (sal_Int16)rFtnInfo.aFmt.eType;
+                    aRet <<= rFtnInfo.aFmt.GetNumberingType();
                 }
                 break;
                 case  WID_START_AT:
@@ -827,7 +827,7 @@ void SwXEndnoteProperties::setPropertyValue(const OUString& rPropertyName, const
                 {
                     INT16 nTmp;
                     aValue >>= nTmp;
-                    aEndInfo.aFmt.eType = (SvxExtNumType)nTmp;
+                    aEndInfo.aFmt.SetNumberingType(nTmp);
                 }
                 break;
                 case  WID_START_AT:
@@ -893,7 +893,7 @@ uno::Any SwXEndnoteProperties::getPropertyValue(const OUString& rPropertyName)
                     aRet <<= OUString(rEndInfo.GetSuffix());
                 break;
                 case  WID_NUMBERING_TYPE :
-                    aRet <<= (sal_Int16)rEndInfo.aFmt.eType;
+                    aRet <<= rEndInfo.aFmt.GetNumberingType();
                 break;
                 case  WID_START_AT:
                     aRet <<= (sal_Int16)rEndInfo.nFtnOffset;
@@ -1070,10 +1070,10 @@ void SwXLineNumberingProperties::setPropertyValue(
                 break;
                 case WID_NUMBERING_TYPE  :
                 {
-                    SwNumType aNumType(aInfo.GetNumType());
+                    SvxNumberType aNumType(aInfo.GetNumType());
                     INT16 nTmp;
                     aValue >>= nTmp;
-                    aNumType.eType = (SvxExtNumType)nTmp;
+                    aNumType.SetNumberingType(nTmp);
                     aInfo.SetNumType(aNumType);
                 }
                 break;
@@ -1181,7 +1181,7 @@ Any SwXLineNumberingProperties::getPropertyValue(const OUString& rPropertyName)
                                                       SFX_STYLE_FAMILY_CHAR ));
                 break;
                 case WID_NUMBERING_TYPE  :
-                    aRet <<= (sal_Int16)rInfo.GetNumType().eType;
+                    aRet <<= rInfo.GetNumType().GetNumberingType();
                 break;
                 case WID_NUMBER_POSITION :
                 {
@@ -1555,13 +1555,13 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
     //fill all properties into the array
 
     //adjust
-    SvxAdjust eAdj = rFmt.GetAdjust();
+    SvxAdjust eAdj = rFmt.GetNumAdjust();
     sal_Int16 nINT16 = aSvxToUnoAdjust[(sal_uInt16)eAdj];
     PropValData* pData = new PropValData((void*)&nINT16, "Adjust", ::getCppuType((const sal_Int16*)0) );
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
     //parentnumbering
-    nINT16 = rFmt.GetUpperLevel();
+    nINT16 = rFmt.GetIncludeUpperLevels();
     pData = new PropValData((void*)&nINT16, "ParentNumbering", ::getCppuType((const sal_Int16*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
@@ -1571,7 +1571,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
     //suffix
-    aUString = rFmt.GetPostfix();
+    aUString = rFmt.GetSuffix();
     pData = new PropValData((void*)&aUString, "Suffix", ::getCppuType((const OUString*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
@@ -1591,7 +1591,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
     //startvalue
-    nINT16 = rFmt.GetStartValue();
+    nINT16 = rFmt.GetStart();
     pData = new PropValData((void*)&nINT16, "StartWith", ::getCppuType((const sal_Int16*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
@@ -1601,7 +1601,7 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
     //chartextoffset
-    nINT32 = TWIP_TO_MM100(rFmt.GetCharTextOffset());
+    nINT32 = TWIP_TO_MM100(rFmt.GetCharTextDistance());
     pData = new PropValData((void*)&nINT32, UNO_NAME_SYMBOL_TEXT_DISTANCE, ::getCppuType((const sal_Int32*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
@@ -1610,15 +1610,14 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
     pData = new PropValData((void*)&nINT32, UNO_NAME_FIRST_LINE_OFFSET, ::getCppuType((const sal_Int32*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
-    //TODO: Enum fuer NumberingType erweitern
     //
-    nINT16 = rFmt.eType;
+    nINT16 = rFmt.GetNumberingType();
     pData = new PropValData((void*)&nINT16, "NumberingType", ::getCppuType((const sal_Int16*)0));
     aPropertyValues.Insert(pData, aPropertyValues.Count());
 
     if(!bChapterNum)
     {
-        if(SVX_NUM_CHAR_SPECIAL == rFmt.eType)
+        if(SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType())
         {
             //BulletId
             nINT16 = rFmt.GetBulletChar();
@@ -1649,10 +1648,10 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
                 aPropertyValues.Insert(pData, aPropertyValues.Count());
             }
         }
-        if(SVX_NUM_BITMAP == rFmt.eType)
+        if(SVX_NUM_BITMAP == rFmt.GetNumberingType())
         {
             //GraphicURL
-            const SvxBrushItem* pBrush = rFmt.GetGrfBrush();
+            const SvxBrushItem* pBrush = rFmt.GetBrush();
             if(pBrush)
             {
                 Any aAny;
@@ -1675,13 +1674,13 @@ uno::Sequence<beans::PropertyValue> SwXNumberingRules::getNumberingRuleByIndex(
                                 ::getCppuType((const uno::Reference<awt::XBitmap>*)0));
                 aPropertyValues.Insert(pData, aPropertyValues.Count());
             }
-             Size aSize = rFmt.GetGrfSize();
+             Size aSize = rFmt.GetGraphicSize();
             aSize.Width() = TWIP_TO_MM100( aSize.Width() );
             aSize.Height() = TWIP_TO_MM100( aSize.Height() );
             pData = new PropValData((void*)&aSize, UNO_NAME_GRAPHIC_SIZE, ::getCppuType((const awt::Size*)0));
             aPropertyValues.Insert(pData, aPropertyValues.Count());
 
-            const SwFmtVertOrient* pOrient = rFmt.GetGrfOrient();
+            const SwFmtVertOrient* pOrient = rFmt.GetGraphicOrientation();
             if(pOrient)
             {
                 pData = new PropValData((void*)0, UNO_NAME_VERT_ORIENT, ::getCppuType((const sal_Int16*)0));
@@ -1822,7 +1821,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                         nValue <= HoriOrientation::LEFT &&
                             USHRT_MAX != aUnoToSvxAdjust[nValue])
                     {
-                        aFmt.SetAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]);
+                        aFmt.SetNumAdjust((SvxAdjust)aUnoToSvxAdjust[nValue]);
                     }
                     else
                         bWrongArg = sal_True;
@@ -1833,7 +1832,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                     sal_Int16 nSet;
                     pData->aVal >>= nSet;
                     if(nSet >= 0 && MAXLEVEL >= nSet)
-                        aFmt.SetUpperLevel(nSet);
+                        aFmt.SetIncludeUpperLevels(nSet);
                 }
                 break;
                 case 2: //"Prefix",
@@ -1847,7 +1846,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                 {
                     OUString uTmp;
                     pData->aVal >>= uTmp;
-                    aFmt.SetPostfix(uTmp);
+                    aFmt.SetSuffix(uTmp);
                 }
                 break;
                 case 4: //"CharStyleName",
@@ -1903,7 +1902,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                 {
                     INT16 nVal;
                     pData->aVal >>= nVal;
-                    aFmt.SetStartValue(nVal);
+                    aFmt.SetStart(nVal);
                 }
                 break;
                 case 6: //UNO_NAME_LEFT_MARGIN,
@@ -1921,7 +1920,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                     sal_Int32 nValue;
                     pData->aVal >>= nValue;
                     if(nValue >= 0)
-                        aFmt.SetCharTextOffset((sal_uInt16) MM100_TO_TWIP(nValue));
+                        aFmt.SetCharTextDistance((sal_uInt16) MM100_TO_TWIP(nValue));
                     else
                         bWrongArg = sal_True;
                 }
@@ -1946,7 +1945,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                     sal_Int16 nSet;
                     pData->aVal >>= nSet;
                     if(nSet <= (sal_Int16)SVX_NUM_CHARS_LOWER_LETTER_N)
-                        aFmt.eType = (SvxExtNumType)nSet;
+                        aFmt.SetNumberingType(nSet);
                     else
                         bWrongArg = sal_True;
                 }
@@ -2000,7 +1999,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                     pData->aVal >>= sBrushURL;
                     if(!pSetBrush)
                     {
-                        const SvxBrushItem* pOrigBrush = aFmt.GetGrfBrush();
+                        const SvxBrushItem* pOrigBrush = aFmt.GetBrush();
                         if(pOrigBrush)
                         {
                             pSetBrush = new SvxBrushItem(*pOrigBrush);
@@ -2018,7 +2017,7 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                     {
                         if(!pSetBrush)
                         {
-                            const SvxBrushItem* pOrigBrush = aFmt.GetGrfBrush();
+                            const SvxBrushItem* pOrigBrush = aFmt.GetBrush();
                             if(pOrigBrush)
                             {
                                 pSetBrush = new SvxBrushItem(*pOrigBrush);
@@ -2055,8 +2054,8 @@ void SwXNumberingRules::setNumberingRuleByIndex(
                 {
                     if(!pSetVOrient)
                     {
-                        if(aFmt.GetGrfOrient())
-                            pSetVOrient = (SwFmtVertOrient*)aFmt.GetGrfOrient()->Clone();
+                        if(aFmt.GetGraphicOrientation())
+                            pSetVOrient = (SwFmtVertOrient*)aFmt.GetGraphicOrientation()->Clone();
                         else
                             pSetVOrient = new SwFmtVertOrient;
                     }
@@ -2089,24 +2088,26 @@ void SwXNumberingRules::setNumberingRuleByIndex(
         }
         if(!bExcept && !bWrongArg && (pSetBrush || pSetSize || pSetVOrient))
         {
-            if(!pSetBrush && aFmt.GetGrfBrush())
-                pSetBrush = new SvxBrushItem(*aFmt.GetGrfBrush());
+            if(!pSetBrush && aFmt.GetBrush())
+                pSetBrush = new SvxBrushItem(*aFmt.GetBrush());
 
             if(pSetBrush)
             {
-                if(!pSetVOrient && aFmt.GetGrfOrient())
-                    pSetVOrient = new SwFmtVertOrient(*aFmt.GetGrfOrient());
+                if(!pSetVOrient && aFmt.GetGraphicOrientation())
+                    pSetVOrient = new SwFmtVertOrient(*aFmt.GetGraphicOrientation());
 
                 if(!pSetSize)
                 {
-                    pSetSize = new Size(aFmt.GetGrfSize());
+                    pSetSize = new Size(aFmt.GetGraphicSize());
                     if(!pSetSize->Width() || !pSetSize->Height())
                     {
                         const Graphic* pGraphic = pSetBrush->GetGraphic();
                         *pSetSize = ::GetGraphicSizeTwip(*pGraphic, 0);
                     }
                 }
-                aFmt.SetGrfBrush( pSetBrush, pSetSize, pSetVOrient );
+                SvxFrameVertOrient eOrient = pSetVOrient ?
+                    (SvxFrameVertOrient)pSetVOrient->GetVertOrient() : SVX_VERT_NONE;
+                aFmt.SetGraphicBrush( pSetBrush, pSetSize, SVX_VERT_NONE == eOrient ? 0 : &eOrient );
             }
         }
         delete pSetBrush;
diff --git a/sw/source/core/view/viewsh.cxx b/sw/source/core/view/viewsh.cxx
index 9c91e68ef005..43c6ea3924d7 100644
--- a/sw/source/core/view/viewsh.cxx
+++ b/sw/source/core/view/viewsh.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: viewsh.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-17 09:25:09 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -897,7 +897,7 @@ void ViewShell::SizeChgNotify(const Size &rSize)
             if ( pCnt && 0 != (pPage = pCnt->FindPageFrm()) )
             {
                 USHORT nVirtNum = pPage->GetVirtPageNum();
-                 const SwNumType& rNum = pPage->GetPageDesc()->GetNumType();
+                 const SvxNumberType& rNum = pPage->GetPageDesc()->GetNumType();
                 String sDisplay = rNum.GetNumStr( nVirtNum );
                 PageNumNotify( this, pCnt->GetPhyPageNum(), nVirtNum, sDisplay );
             }
@@ -2098,6 +2098,9 @@ BOOL ViewShell::IsNewLayout() const
 /************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.2  2000/10/17 09:25:09  os
+      #79537# CareChildWin/GetCareWin need current shell as parameter
+
       Revision 1.1.1.1  2000/09/19 00:08:29  hr
       initial import
 
diff --git a/sw/source/filter/html/htmlatr.cxx b/sw/source/filter/html/htmlatr.cxx
index 93e724e3dc69..06b01767026d 100644
--- a/sw/source/filter/html/htmlatr.cxx
+++ b/sw/source/filter/html/htmlatr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlatr.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:41:15 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1068,7 +1068,7 @@ void OutHTML_SwFmt( Writer& rWrt, const SwFmt& rFmt,
 
         OutHTML_BulletImage( rWrt, sHTML_image, 0,
                              rHWrt.aBulletGrfs[nBulletGrfLvl],
-                             rNumFmt.GetGrfSize(), rNumFmt.GetGrfOrient() );
+                             rNumFmt.GetGraphicSize(), rNumFmt.GetGraphicOrientation() );
     }
 
     rHWrt.GetNumInfo() = aNumInfo;
@@ -3096,11 +3096,14 @@ SwAttrFnTab aHTMLAttrFnTab = {
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlatr.cxx,v 1.5 2000-11-20 09:41:15 jp Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/html/htmlatr.cxx,v 1.6 2001-02-23 12:45:24 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2000/11/20 09:41:15  jp
+      new para attributes - expand para range
+
       Revision 1.4  2000/11/13 20:32:39  jp
       remove unused headerfile
 
diff --git a/sw/source/filter/html/htmlnum.cxx b/sw/source/filter/html/htmlnum.cxx
index 7771bff5ffee..658b6a18057b 100644
--- a/sw/source/filter/html/htmlnum.cxx
+++ b/sw/source/filter/html/htmlnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: htmlnum.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: mib $ $Date: 2000-12-12 13:11:13 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:24 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -192,7 +192,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
         sal_uInt16 nChrFmtPoolId = 0;
         if( HTML_ORDERLIST_ON == nToken )
         {
-            aNumFmt.eType = SVX_NUM_ARABIC;
+            aNumFmt.SetNumberingType(SVX_NUM_ARABIC);
             nChrFmtPoolId = RES_POOLCHR_NUM_LEVEL;
         }
         else
@@ -202,7 +202,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
             // eingestellt, was in Netscape nicht der Fall ist. Bisher hat
             // das noch niemanden gestoert.
             aNumFmt.SetBulletFont( &rInfo.GetNumRule()->GetDefBulletFont() );
-            aNumFmt.eType = SVX_NUM_CHAR_SPECIAL;
+            aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
             aNumFmt.SetBulletChar( cBulletChar );       // das Bulletzeichen !!
             nChrFmtPoolId = RES_POOLCHR_BUL_LEVEL;
         }
@@ -225,7 +225,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
         aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(nChrFmtPoolId) );
         bChangeNumFmt = sal_True;
     }
-    else if( 1 != aNumFmt.GetStartValue() )
+    else if( 1 != aNumFmt.GetStart() )
     {
         // Wenn die Ebene schon mal benutzt wurde, muss der Start-Wert
         // ggf. hart am Absatz gesetzt werden.
@@ -234,7 +234,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
 
     // und es ggf. durch die Optionen veraendern
     String aId, aStyle, aClass, aBulletSrc;
-    SwVertOrient eVertOri = VERT_NONE;
+    SvxFrameVertOrient eVertOri = SVX_VERT_NONE;
     sal_uInt16 nWidth=USHRT_MAX, nHeight=USHRT_MAX;
     const HTMLOptions *pOptions = GetOptions();
     for( sal_uInt16 i = pOptions->Count(); i; )
@@ -254,10 +254,10 @@ void SwHTMLParser::NewNumBulList( int nToken )
                     bChangeNumFmt = sal_True;
                     switch( pOption->GetString().GetChar(0) )
                     {
-                    case 'A':   aNumFmt.eType = SVX_NUM_CHARS_UPPER_LETTER; break;
-                    case 'a':   aNumFmt.eType = SVX_NUM_CHARS_LOWER_LETTER; break;
-                    case 'I':   aNumFmt.eType = SVX_NUM_ROMAN_UPPER;        break;
-                    case 'i':   aNumFmt.eType = SVX_NUM_ROMAN_LOWER;        break;
+                    case 'A':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER); break;
+                    case 'a':   aNumFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER); break;
+                    case 'I':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER);        break;
+                    case 'i':   aNumFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER);        break;
                     default:    bChangeNumFmt = sal_False;
                     }
                     break;
@@ -275,7 +275,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
                 sal_uInt16 nStart = (sal_uInt16)pOption->GetNumber();
                 if( bNewNumFmt )
                 {
-                    aNumFmt.SetStartValue( nStart );
+                    aNumFmt.SetStart( nStart );
                     bChangeNumFmt = sal_True;
                 }
                 else
@@ -306,7 +306,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
             break;
         case HTML_O_ALIGN:
             eVertOri =
-                (SwVertOrient)pOption->GetEnum( aHTMLImgVAlignTable,
+                (SvxFrameVertOrient)pOption->GetEnum( aHTMLImgVAlignTable,
                                                 eVertOri );
             break;
         }
@@ -315,7 +315,7 @@ void SwHTMLParser::NewNumBulList( int nToken )
     if( aBulletSrc.Len() )
     {
         // Eine Bullet-Liste mit Grafiken
-        aNumFmt.eType = SVX_NUM_BITMAP;
+        aNumFmt.SetNumberingType(SVX_NUM_BITMAP);
 
         // Die Grafik als Brush anlegen
         SvxBrushItem aBrushItem;
@@ -334,10 +334,8 @@ void SwHTMLParser::NewNumBulList( int nToken )
 
         // Die Ausrichtung auch nur beachten, wenn eine Ausrichtung
         // angegeben wurde
-        SwFmtVertOrient aVertOri( 0, eVertOri );
-        SwFmtVertOrient *pVertOri = VERT_NONE!=eVertOri ? &aVertOri : 0;
-
-        aNumFmt.SetGrfBrush( &aBrushItem, pTwipSz, pVertOri );
+        aNumFmt.SetGraphicBrush( &aBrushItem, pTwipSz,
+                            SVX_VERT_NONE!=eVertOri ? &eVertOri : 0);
 
         // Und noch die Grafik merken, um sie in den Absaetzen nicht
         // einzufuegen
@@ -468,9 +466,9 @@ void SwHTMLParser::EndNumBulList( int nToken )
                 else if( pRefNumFmt )
                 {
                     SwNumFmt aNumFmt( rInfo.GetNumRule()->Get(i) );
-                    aNumFmt.eType = pRefNumFmt->eType != SVX_NUM_BITMAP
-                                        ? pRefNumFmt->eType : SVX_NUM_CHAR_SPECIAL;
-                    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.eType )
+                    aNumFmt.SetNumberingType(pRefNumFmt->GetNumberingType() != SVX_NUM_BITMAP
+                                        ? pRefNumFmt->GetNumberingType() : SVX_NUM_CHAR_SPECIAL);
+                    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
                     {
                         aNumFmt.SetBulletFont(
                                 &rInfo.GetNumRule()->GetDefBulletFont() );
@@ -576,7 +574,7 @@ void SwHTMLParser::NewNumBulListItem( int nToken )
         SwNumRule aNumRule( aNumRuleName );
         SwNumFmt aNumFmt( aNumRule.Get( 0 ) );
         aNumFmt.SetBulletFont( &SwNumRule::GetDefBulletFont() );
-        aNumFmt.eType = SVX_NUM_CHAR_SPECIAL;
+        aNumFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
         aNumFmt.SetBulletChar( cBulletChar );   // das Bulletzeichen !!
         aNumFmt.SetCharFmt( pCSS1Parser->GetCharFmtFromPool(RES_POOLCHR_BUL_LEVEL) );
         aNumFmt.SetLSpace( (sal_uInt16)(-HTML_NUMBUL_INDENT) );
@@ -799,8 +797,8 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
         if( rWrt.aNumRuleNames.Seek_Entry( &aName ) )
         {
             // The rule has been applied before
-            SvxExtNumType eType = rInfo.GetNumRule()
-                ->Get( rInfo.GetDepth()-1 ).eType;
+            sal_Int16 eType = rInfo.GetNumRule()
+                ->Get( rInfo.GetDepth()-1 ).GetNumberingType();
             if( SVX_NUM_CHAR_SPECIAL != eType && SVX_NUM_BITMAP != eType )
             {
                 // If its a numbering rule, the current number should be
@@ -869,7 +867,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
         rWrt.aBulletGrfs[i].Erase();
         ByteString sOut( '<' );
         const SwNumFmt& rNumFmt = rInfo.GetNumRule()->Get( i );
-        SvxExtNumType eType = rNumFmt.eType;
+        sal_Int16 eType = rNumFmt.GetNumberingType();
         if( SVX_NUM_CHAR_SPECIAL == eType )
         {
             // Aufzaehlungs-Liste: <OL>
@@ -902,10 +900,10 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
 
             OutHTML_BulletImage( rWrt,
                                     0,
-                                    rNumFmt.GetGrfBrush(),
+                                    rNumFmt.GetBrush(),
                                     rWrt.aBulletGrfs[i],
-                                    rNumFmt.GetGrfSize(),
-                                    rNumFmt.GetGrfOrient() );
+                                    rNumFmt.GetGraphicSize(),
+                                    rNumFmt.GetGraphicOrientation() );
         }
         else
         {
@@ -924,7 +922,7 @@ Writer& OutHTML_NumBulListStart( SwHTMLWriter& rWrt,
             if( cType )
                 (((sOut += ' ') += sHTML_O_type) += '=') += cType;
 
-            sal_uInt16 nStartVal = rNumFmt.GetStartValue();
+            sal_uInt16 nStartVal = rNumFmt.GetStart();
             if( bStartValue && 1 == nStartVal && i == rInfo.GetDepth()-1 )
                 nStartVal = rWrt.pCurPam->GetNode()->GetTxtNode()->GetNum()
                                               ->GetLevelVal()[i];
@@ -976,7 +974,7 @@ Writer& OutHTML_NumBulListEnd( SwHTMLWriter& rWrt,
             rWrt.OutNewLine(); // </OL>/</UL> in eine neue Zeile
 
         // es wird also eine Liste angefangen oder beendet:
-        SvxExtNumType eType = rInfo.GetNumRule()->Get( i-1 ).eType;
+        sal_Int16 eType = rInfo.GetNumRule()->Get( i-1 ).GetNumberingType();
         const sal_Char *pStr;
         if( SVX_NUM_CHAR_SPECIAL == eType || SVX_NUM_BITMAP == eType)
             pStr = sHTML_unorderlist;
diff --git a/sw/source/filter/rtf/rtfnum.cxx b/sw/source/filter/rtf/rtfnum.cxx
index 5b5b42f75d43..baea64d983d3 100644
--- a/sw/source/filter/rtf/rtfnum.cxx
+++ b/sw/source/filter/rtf/rtfnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: rtfnum.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:56 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -259,7 +259,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
 
         case RTF_LEVELNFC:
             {
-                SvxExtNumType eType = SVX_NUM_ARABIC;
+                sal_Int16 eType = SVX_NUM_ARABIC;
                 switch( nTokenValue )
                 {
                 case 1:     eType = SVX_NUM_ROMAN_UPPER;            break;
@@ -270,7 +270,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
                 case 23:    eType = SVX_NUM_CHAR_SPECIAL;           break;
                 }
                 if( pCurNumFmt )
-                    pCurNumFmt->eType = eType;
+                    pCurNumFmt->SetNumberingType(eType);
             }
             break;
 
@@ -283,13 +283,13 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
                 case 2:     eAdj = SVX_ADJUST_RIGHT;    break;
                 }
                 if( pCurNumFmt )
-                    pCurNumFmt->SetAdjust( eAdj );
+                    pCurNumFmt->SetNumAdjust( eAdj );
             }
             break;
 
         case RTF_LEVELSTARTAT:
             if( pCurNumFmt && -1 != nTokenValue )
-                pCurNumFmt->SetStartValue( USHORT( nTokenValue ));
+                pCurNumFmt->SetStart( USHORT( nTokenValue ));
             break;
 
         case RTF_LEVELTEXT:
@@ -342,7 +342,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
                 ReadAttr( nToken, &GetNumChrFmt( *pDoc, rRule, nNumLvl ) );
 
                 // dann aus der Vorlage den Font holen
-                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->eType )
+                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->GetNumberingType() )
                     pCurNumFmt->SetBulletFont( FindFontOfItem(
                                 pCurNumFmt->GetCharFmt()->GetFont() ) );
             }
@@ -354,7 +354,7 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
     {
         // dann erzeuge mal die Pre/Postfix-Strings
         if( sLvlText.Len() &&
-            SVX_NUM_CHAR_SPECIAL == pCurNumFmt->eType )
+            SVX_NUM_CHAR_SPECIAL == pCurNumFmt->GetNumberingType() )
         {
             pCurNumFmt->SetBulletChar( sLvlText.GetChar( 0 ) );
             // dann aus der Vorlage den Font holen
@@ -368,15 +368,15 @@ void SwRTFParser::ReadListLevel( SwNumRule& rRule, BYTE nNumLvl )
             // der Ebenen in sLvlText
             pCurNumFmt->SetPrefix(
                 sLvlText.Copy( 0, USHORT( sLvlNumber.GetChar( 0 ))-1 ));
-            pCurNumFmt->SetPostfix( sLvlText.Copy(
+            pCurNumFmt->SetSuffix( sLvlText.Copy(
                     USHORT( sLvlNumber.GetChar( sLvlNumber.Len()-1 )) ));
             // wieviele Levels stehen im String?
-            pCurNumFmt->SetUpperLevel( (BYTE)sLvlNumber.Len() );
+            pCurNumFmt->SetIncludeUpperLevels( (BYTE)sLvlNumber.Len() );
         }
         else if( !sLvlText.Len() )
         {
-            pCurNumFmt->eType = SVX_NUM_NUMBER_NONE;
-            pCurNumFmt->SetPostfix( aEmptyStr );
+            pCurNumFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
+            pCurNumFmt->SetSuffix( aEmptyStr );
         }
     }
 
@@ -853,10 +853,10 @@ void SwRTFParser::ReadNumSecLevel( int nToken )
         pCurRule->Set( nLevel, pCurRule->Get( nLevel ));
     SwNumFmt* pCurNumFmt = (SwNumFmt*)pCurRule->GetNumFmt( nLevel );
     if( RTF_PNLVLBLT == nToken )
-        pCurNumFmt->eType = SVX_NUM_CHAR_SPECIAL;
-    pCurNumFmt->SetPostfix( aEmptyStr );
+        pCurNumFmt->SetNumberingType(SVX_NUM_CHAR_SPECIAL);
+    pCurNumFmt->SetSuffix( aEmptyStr );
     pCurNumFmt->SetPrefix( aEmptyStr );
-    pCurNumFmt->eType = SVX_NUM_NUMBER_NONE;
+    pCurNumFmt->SetNumberingType(SVX_NUM_NUMBER_NONE);
 
     if( bStyleTabValid && RTF_PNSECLVL != nToken )
     {
@@ -908,11 +908,11 @@ void SwRTFParser::ReadNumSecLevel( int nToken )
         case RTF_PNCARD:
         case RTF_PNORD:
         case RTF_PNORDT:
-        case RTF_PNDEC:     pCurNumFmt->eType = SVX_NUM_ARABIC;                 break;
-        case RTF_PNUCLTR:   pCurNumFmt->eType = SVX_NUM_CHARS_UPPER_LETTER_N;   break;
-        case RTF_PNUCRM:    pCurNumFmt->eType = SVX_NUM_ROMAN_UPPER;            break;
-        case RTF_PNLCLTR:   pCurNumFmt->eType = SVX_NUM_CHARS_LOWER_LETTER_N;   break;
-        case RTF_PNLCRM:    pCurNumFmt->eType = SVX_NUM_ROMAN_LOWER;            break;
+        case RTF_PNDEC:     pCurNumFmt->SetNumberingType(SVX_NUM_ARABIC);               break;
+        case RTF_PNUCLTR:   pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); break;
+        case RTF_PNUCRM:    pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_UPPER);          break;
+        case RTF_PNLCLTR:   pCurNumFmt->SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); break;
+        case RTF_PNLCRM:    pCurNumFmt->SetNumberingType(SVX_NUM_ROMAN_LOWER);          break;
 
         case RTF_PNF:
             {
@@ -921,7 +921,7 @@ void SwRTFParser::ReadNumSecLevel( int nToken )
                             SvxFontItem( rSVFont.GetFamily(),
                                 rSVFont.GetName(), rSVFont.GetStyleName(),
                                 rSVFont.GetPitch(), rSVFont.GetCharSet() ));
-                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->eType )
+                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->GetNumberingType() )
                     pCurNumFmt->SetBulletFont( &rSVFont );
             }
             break;
@@ -1007,25 +1007,25 @@ NUMATTR_SETUNDERLINE:
             pCurNumFmt->SetAbsLSpace( (nLevel + 1 ) * USHORT( nTokenValue ));
             break;
         case RTF_PNSP:
-            pCurNumFmt->SetCharTextOffset( USHORT( nTokenValue ));
+            pCurNumFmt->SetCharTextDistance( USHORT( nTokenValue ));
             break;
 
         case RTF_PNPREV:
             if( nLevel )
             {
                 BYTE nPrev = 2, nLast = nLevel;
-                while( nLast && 1 < pCurRule->Get( --nLast ).GetUpperLevel() )
+                while( nLast && 1 < pCurRule->Get( --nLast ).GetIncludeUpperLevels() )
                     ++nPrev;
-                pCurNumFmt->SetUpperLevel( nPrev );
+                pCurNumFmt->SetIncludeUpperLevels( nPrev );
             }
             break;
 
-        case RTF_PNQC:  pCurNumFmt->SetAdjust( SVX_ADJUST_CENTER );     break;
-        case RTF_PNQL:  pCurNumFmt->SetAdjust( SVX_ADJUST_LEFT );       break;
-        case RTF_PNQR:  pCurNumFmt->SetAdjust( SVX_ADJUST_RIGHT );      break;
+        case RTF_PNQC:  pCurNumFmt->SetNumAdjust( SVX_ADJUST_CENTER );  break;
+        case RTF_PNQL:  pCurNumFmt->SetNumAdjust( SVX_ADJUST_LEFT );        break;
+        case RTF_PNQR:  pCurNumFmt->SetNumAdjust( SVX_ADJUST_RIGHT );       break;
 
         case RTF_PNSTART:
-            pCurNumFmt->SetStartValue( USHORT( nTokenValue ));
+            pCurNumFmt->SetStart( USHORT( nTokenValue ));
             break;
 
         case RTF_PNNUMONCE:
@@ -1037,7 +1037,7 @@ NUMATTR_SETUNDERLINE:
             {
                 String sTmp;
                 GetTextToEndGroup( sTmp );
-                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->eType )
+                if( SVX_NUM_CHAR_SPECIAL == pCurNumFmt->GetNumberingType() )
                 {
                     pCurNumFmt->SetBulletChar( sTmp.GetChar( 0 ) );
                     if( pCurNumFmt->GetCharFmt() )
@@ -1045,7 +1045,7 @@ NUMATTR_SETUNDERLINE:
                                     pCurNumFmt->GetCharFmt()->GetFont() ) );
                     sTmp.Erase();
                 }
-                pCurNumFmt->SetPostfix( sTmp );
+                pCurNumFmt->SetSuffix( sTmp );
             }
             break;
 
@@ -1061,19 +1061,19 @@ NUMATTR_SETUNDERLINE:
     // falls vollstaendige Numerierung an ist und das Zeichen davor ein
     // Punkt ist, dann will RTF den Punkt als Trenner zwischen den Ebenen
     // haben - das haben wir aber schon als default
-    if( 1 < pCurNumFmt->GetUpperLevel() &&
+    if( 1 < pCurNumFmt->GetIncludeUpperLevels() &&
         1 == pCurNumFmt->GetPrefix().Len() &&
         '.' == pCurNumFmt->GetPrefix().GetChar( 0 ) &&
-        SVX_NUM_CHAR_SPECIAL != pCurNumFmt->eType )
+        SVX_NUM_CHAR_SPECIAL != pCurNumFmt->GetNumberingType() )
         pCurNumFmt->SetPrefix( aEmptyStr );
 
     // falls das ein nicht numerierter Absatz mit ein Prefix-Text mit
     // einem Zeichen ist, dann setze den als Bulletzeichen
-    if( pCurNumFmt->GetCharFmt() && SVX_NUM_NUMBER_NONE == pCurNumFmt->eType &&
+    if( pCurNumFmt->GetCharFmt() && SVX_NUM_NUMBER_NONE == pCurNumFmt->GetNumberingType() &&
         3 == nListNo && 1 == pCurNumFmt->GetPrefix().Len() )
     {
         SwCharFmt* pChFmt = pCurNumFmt->GetCharFmt();
-        pCurNumFmt->eType = SVX_NUM_CHAR_SPECIAL;
+        pCurNumFmt->SetNumberingType(SVX_NUM_CHAR_SPECIAL);
         pCurNumFmt->SetBulletFont( FindFontOfItem( pChFmt->GetFont() ) );
 
         pCurNumFmt->SetBulletChar( pCurNumFmt->GetPrefix().GetChar( 0 ) );
@@ -1131,7 +1131,7 @@ void SwRTFWriter::OutRTFListTab()
         ++nEnd;
 
         for( BYTE nLvl = 0; nLvl < nEnd; ++nLvl )
-            if( SVX_NUM_NUMBER_NONE != pRule->Get( nLvl ).eType )
+            if( SVX_NUM_NUMBER_NONE != pRule->Get( nLvl ).GetNumberingType() )
                 break;
 
         if( nLvl == nEnd )      // alle Level no number -> dont write it
@@ -1158,7 +1158,7 @@ void SwRTFWriter::OutRTFListTab()
             Strm() << '{' << sRTF_LISTLEVEL << sRTF_LEVELNFC;
 
             USHORT nVal = 0;
-            switch( rFmt.eType )
+            switch( rFmt.GetNumberingType() )
             {
             case SVX_NUM_ROMAN_UPPER:           nVal = 1;   break;
             case SVX_NUM_ROMAN_LOWER:           nVal = 2;   break;
@@ -1172,25 +1172,25 @@ void SwRTFWriter::OutRTFListTab()
             }
             OutLong( nVal ) << sRTF_LEVELJC;
 
-            switch( rFmt.GetAdjust() )
+            switch( rFmt.GetNumAdjust() )
             {
             case SVX_ADJUST_CENTER:     nVal = 1;   break;
             case SVX_ADJUST_RIGHT:      nVal = 2;   break;
             default:                    nVal = 0;   break;
             }
             OutLong( nVal ) << sRTF_LEVELSTARTAT;
-            OutLong( rFmt.GetStartValue() )
+            OutLong( rFmt.GetStart() )
                 << sRTF_LEVELFOLLOW << "2{" << sRTF_LEVELTEXT << ' ';
 
             BOOL bWriteBulletFont = FALSE;
             memset( aNumLvlPos, 0, MAXLEVEL );
-            if( SVX_NUM_CHAR_SPECIAL == rFmt.eType ||
-                SVX_NUM_BITMAP == rFmt.eType )
+            if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() ||
+                SVX_NUM_BITMAP == rFmt.GetNumberingType() )
             {
                 Strm() << "\\'01\\'"; OutHex( rFmt.GetBulletChar() );
                 bWriteBulletFont = TRUE;
             }
-            else if( SVX_NUM_NUMBER_NONE != rFmt.eType )
+            else if( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() )
             {
                 memset( aNumLvlPos, 0, MAXLEVEL );
                 BYTE* pLvlPos = aNumLvlPos;
@@ -1212,7 +1212,7 @@ void SwRTFWriter::OutRTFListTab()
 
                 Strm() << "\\'";
                 OutHex( sNumStr.Len() + rFmt.GetPrefix().Len() +
-                                        rFmt.GetPostfix().Len() );
+                                        rFmt.GetSuffix().Len() );
 
                 if( rFmt.GetPrefix().Len() )
                     RTFOutFuncs::Out_String( Strm(), rFmt.GetPrefix(),
@@ -1228,8 +1228,8 @@ void SwRTFWriter::OutRTFListTab()
                     else
                         Strm() << (sal_Char)sNumStr.GetChar( x );
 
-                if( rFmt.GetPostfix().Len() )
-                    RTFOutFuncs::Out_String( Strm(), rFmt.GetPostfix(),
+                if( rFmt.GetSuffix().Len() )
+                    RTFOutFuncs::Out_String( Strm(), rFmt.GetSuffix(),
                                             DEF_ENCODING, bWriteHelpFmt );
             }
 
@@ -1337,7 +1337,7 @@ void SwRTFWriter::OutListNum( const SwTxtNode& rNd )
         if( bValidNum )
         {
             String sTxt;
-            if( SVX_NUM_CHAR_SPECIAL == pFmt->eType || SVX_NUM_BITMAP == pFmt->eType )
+            if( SVX_NUM_CHAR_SPECIAL == pFmt->GetNumberingType() || SVX_NUM_BITMAP == pFmt->GetNumberingType() )
                 sTxt = pFmt->GetBulletChar();
             else
                 sTxt = pRule->MakeNumString( *pNdNum );
@@ -1370,99 +1370,4 @@ void SwRTFWriter::OutListNum( const SwTxtNode& rNd )
     }
 }
 
-/*************************************************************************
-
-      Source Code Control System - Header
-
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/rtfnum.cxx,v 1.1.1.1 2000-09-18 17:14:56 hr Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.27  2000/09/18 16:04:51  willem.vandorp
-      OpenOffice header added.
-
-      Revision 1.26  2000/08/04 10:48:09  jp
-      Soft-/HardHyphens & HardBlanks changed from attribute to unicode character; use rtfout functions
-
-      Revision 1.25  2000/05/26 07:22:44  os
-      old SW Basic API Slots removed
-
-      Revision 1.24  2000/05/24 07:57:04  jp
-      Bugfixes for Unicode
-
-      Revision 1.23  2000/05/09 17:22:53  jp
-      Changes for Unicode
-
-      Revision 1.22  2000/03/14 17:25:25  jp
-      Bug #73968#: read and set outline/num-levels
-
-      Revision 1.21  2000/03/14 09:22:24  jp
-      Bug #73941#: remove unused numrules, share override rules
-
-      Revision 1.20  2000/03/10 17:54:09  jp
-      Bug #73965#: ReadListLevel - set no number
-
-      Revision 1.19  2000/03/10 15:56:52  jp
-      Bug #74100#: read W2000 rtf-format
-
-      Revision 1.18  2000/02/24 18:33:17  jp
-      Bug #73098#: read & write list entries without number
-
-      Revision 1.17  2000/02/17 13:46:55  jp
-      Bug #73098#: Import / Export problems
-
-      Revision 1.16  2000/02/11 14:38:01  hr
-      #70473# changes for unicode ( patched by automated patchtool )
-
-      Revision 1.15  2000/01/25 20:13:02  jp
-      Bug #72146#: read UniCode character
-
-      Revision 1.14  1999/08/03 17:47:38  JP
-      Bug #67975#: changes for import of Bulltets from interleave/WP7/Aplixware
-
-
-      Rev 1.13   03 Aug 1999 19:47:38   JP
-   Bug #67975#: changes for import of Bulltets from interleave/WP7/Aplixware
-
-      Rev 1.12   12 Jul 1999 17:35:24   JP
-   read and write outlinelevel/-numrules
-
-      Rev 1.11   30 Mar 1999 14:41:48   JP
-   Task #63049#: Numerierung mit rel. Einzuegen
-
-      Rev 1.10   29 Mar 1999 10:00:32   JP
-   Bug #63990#: NumRules immer mit negativen Erstzeileneinzug
-
-      Rev 1.9   18 Mar 1999 09:51:44   JP
-   Task #63049#: Numerierung mit rel. Einzuegen
-
-      Rev 1.8   16 Mar 1999 23:19:34   JP
-   Task #63049#: Einzuege bei NumRules relativ
-
-      Rev 1.7   05 Mar 1999 14:27:56   JP
-   Bug #57749#: spaltige Bereiche einlesen - jeder Bereich hat eigene NumRules
-
-      Rev 1.6   03 Mar 1999 15:17:22   JP
-   Bug #57749#: spaltige Bereiche einlesen
-
-      Rev 1.5   17 Nov 1998 10:45:30   OS
-   #58263# NumType durch SvxExtNumType ersetzt
-
-      Rev 1.4   21 Sep 1998 17:15:12   JP
-   RTF_LEVELNFC: 255 ist auch ein Bullet
-
-      Rev 1.3   06 Aug 1998 21:43:30   JP
-   Bug #54796#: neue NumerierungsTypen (WW97 kompatibel)
-
-      Rev 1.2   04 Jun 1998 19:28:06   JP
-   Bug #50887#: Font bei Grafik-NumFormaten ist 0, also default Font schreiben
-
-      Rev 1.1   27 May 1998 22:26:14   JP
-   Bug #50585#: ListOverrideTabelle korrekt einlesen
-
-      Rev 1.0   20 Apr 1998 17:44:00   JP
-   neu: Numerierung lesen/schreiben
-
-*************************************************************************/
 
diff --git a/sw/source/filter/rtf/swparrtf.cxx b/sw/source/filter/rtf/swparrtf.cxx
index b3c3a3dee5c3..911565dd4335 100644
--- a/sw/source/filter/rtf/swparrtf.cxx
+++ b/sw/source/filter/rtf/swparrtf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swparrtf.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-01-26 15:42:30 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1183,30 +1183,30 @@ void SwRTFParser::ReadDocControls( int nToken )
             break;
 
         case RTF_FTNNAR:
-            aFtnInfo.aFmt.eType = SVX_NUM_ARABIC; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_ARABIC); bFtnInfoChgd = TRUE; break;
         case RTF_FTNNALC:
-            aFtnInfo.aFmt.eType = SVX_NUM_CHARS_LOWER_LETTER_N; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); bFtnInfoChgd = TRUE; break;
         case RTF_FTNNAUC:
-            aFtnInfo.aFmt.eType = SVX_NUM_CHARS_UPPER_LETTER_N; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); bFtnInfoChgd = TRUE; break;
         case RTF_FTNNRLC:
-            aFtnInfo.aFmt.eType = SVX_NUM_ROMAN_LOWER; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); bFtnInfoChgd = TRUE; break;
         case RTF_FTNNRUC:
-            aFtnInfo.aFmt.eType = SVX_NUM_ROMAN_UPPER; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); bFtnInfoChgd = TRUE; break;
         case RTF_FTNNCHI:
-            aFtnInfo.aFmt.eType = SVX_NUM_CHAR_SPECIAL; bFtnInfoChgd = TRUE; break;
+            aFtnInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); bFtnInfoChgd = TRUE; break;
 
         case RTF_AFTNNAR:
-            aEndInfo.aFmt.eType = SVX_NUM_ARABIC; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_ARABIC); bEndInfoChgd = TRUE; break;
         case RTF_AFTNNALC:
-            aEndInfo.aFmt.eType = SVX_NUM_CHARS_LOWER_LETTER_N; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N); bEndInfoChgd = TRUE; break;
         case RTF_AFTNNAUC:
-            aEndInfo.aFmt.eType = SVX_NUM_CHARS_UPPER_LETTER_N; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N); bEndInfoChgd = TRUE; break;
         case RTF_AFTNNRLC:
-            aEndInfo.aFmt.eType = SVX_NUM_ROMAN_LOWER; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_LOWER); bEndInfoChgd = TRUE; break;
         case RTF_AFTNNRUC:
-            aEndInfo.aFmt.eType = SVX_NUM_ROMAN_UPPER; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_ROMAN_UPPER); bEndInfoChgd = TRUE; break;
         case RTF_AFTNNCHI:
-            aEndInfo.aFmt.eType = SVX_NUM_CHAR_SPECIAL; bEndInfoChgd = TRUE; break;
+            aEndInfo.aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL); bEndInfoChgd = TRUE; break;
 
 
         case '{':
@@ -1374,7 +1374,7 @@ BOOL lcl_CompareRTFPageDesc( const SwPageDesc& rOld, const SwPageDesc& rAkt )
 {
     BOOL bRet = /*rAkt.ReadUseOn() == rOld.ReadUseOn() && Bug 63599 */
                 rAkt.GetLandscape() == rOld.GetLandscape() &&
-                rAkt.GetNumType().eType == rOld.GetNumType().eType;
+                rAkt.GetNumType().GetNumberingType() == rOld.GetNumType().GetNumberingType();
 
     if( bRet )
     {
@@ -1570,7 +1570,7 @@ void SwRTFParser::ReadSectControls( int nToken )
     SvUShorts aColumns;
 
     USHORT nPgStart = USHRT_MAX;
-    SwNumType aNumType;
+    SvxNumberType aNumType;
 
     do {
         BOOL bIsSectToken = FALSE;
@@ -1605,7 +1605,7 @@ void SwRTFParser::ReadSectControls( int nToken )
                 nPgStart = USHRT_MAX;
                 nCols = USHRT_MAX;
                 nColSpace = USHRT_MAX;
-                aNumType.eType = SVX_NUM_ARABIC;
+                aNumType.SetNumberingType(SVX_NUM_ARABIC);
                 bHeaderUL = bHeaderLR = bFooterUL = bFooterLR = TRUE;
                 eBreak = SVX_BREAK_PAGE_BEFORE;
                 nNewNumSectDef = USHRT_MAX;
@@ -1700,23 +1700,23 @@ void SwRTFParser::ReadSectControls( int nToken )
             break;
 
         case RTF_PGNDEC:
-            aNumType.eType = SVX_NUM_ARABIC;
+            aNumType.SetNumberingType(SVX_NUM_ARABIC);
             bPgDescChgd = TRUE;
             break;
         case RTF_PGNUCRM:
-            aNumType.eType = SVX_NUM_ROMAN_UPPER;
+            aNumType.SetNumberingType(SVX_NUM_ROMAN_UPPER);
             bPgDescChgd = TRUE;
             break;
         case RTF_PGNLCRM:
-            aNumType.eType = SVX_NUM_ROMAN_LOWER;
+            aNumType.SetNumberingType(SVX_NUM_ROMAN_LOWER);
             bPgDescChgd = TRUE;
             break;
         case RTF_PGNUCLTR:
-            aNumType.eType = SVX_NUM_CHARS_UPPER_LETTER_N;
+            aNumType.SetNumberingType(SVX_NUM_CHARS_UPPER_LETTER_N);
             bPgDescChgd = TRUE;
             break;
         case RTF_PGNLCLTR:
-            aNumType.eType = SVX_NUM_CHARS_LOWER_LETTER_N;
+            aNumType.SetNumberingType(SVX_NUM_CHARS_LOWER_LETTER_N);
             bPgDescChgd = TRUE;
             break;
 
@@ -3751,68 +3751,3 @@ static void DumpEnde()
 #endif
 
 
-/*************************************************************************
-
-      Source Code Control System - Header
-
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/rtf/swparrtf.cxx,v 1.3 2001-01-26 15:42:30 jp Exp $
-
-      Source Code Control System - Update
-
-      $Log: not supported by cvs2svn $
-      Revision 1.2  2000/11/06 09:30:33  jp
-      must changes: tempfile
-
-      Revision 1.1.1.1  2000/09/18 17:14:56  hr
-      initial import
-
-      Revision 1.159  2000/09/18 16:04:51  willem.vandorp
-      OpenOffice header added.
-
-      Revision 1.158  2000/08/07 15:13:02  jp
-      Bug #77342#: use String::CreateFromInt32
-
-      Revision 1.157  2000/08/04 10:48:19  jp
-      Soft-/HardHyphens & HardBlanks changed from attribute to unicode character; use rtfout functions
-
-      Revision 1.156  2000/07/20 13:16:26  jp
-      change old txtatr-character to the two new characters
-
-      Revision 1.155  2000/06/13 09:42:01  os
-      using UCB
-
-      Revision 1.154  2000/05/26 07:22:44  os
-      old SW Basic API Slots removed
-
-      Revision 1.153  2000/05/09 17:23:01  jp
-      Changes for Unicode
-
-      Revision 1.152  2000/03/21 16:30:56  jp
-      Bug #74351# ReadSectControls: reset column from the first pagedesc too
-
-      Revision 1.151  2000/03/14 17:25:21  jp
-      Bug #73968#: read and set outline/num-levels
-
-      Revision 1.150  2000/03/14 09:22:29  jp
-      Bug #73941#: remove unused numrules, share override rules
-
-      Revision 1.149  2000/02/24 18:31:42  jp
-      Bug #73480#: ReadSectControls - dont set columns at PageDesc and Region
-
-      Revision 1.148  2000/02/11 17:36:06  jp
-      Bug #72146#: read UniCode character
-
-      Revision 1.147  2000/02/11 14:38:06  hr
-      #70473# changes for unicode ( patched by automated patchtool )
-
-      Revision 1.146  2000/01/25 20:13:27  jp
-      Bug #72146#: read UniCode character
-
-      Revision 1.145  2000/01/07 12:26:54  jp
-      Task #71411#: read/write NoBalancedColumns
-
-      Revision 1.144  1999/12/13 13:15:42  jp
-      Bug #70916#: ROW - skip to the end of the current line and then move the cursor one node forward
-
-*************************************************************************/
-
diff --git a/sw/source/filter/rtf/wrtrtf.cxx b/sw/source/filter/rtf/wrtrtf.cxx
index b609ddc7e4c2..ed4412e4aae8 100644
--- a/sw/source/filter/rtf/wrtrtf.cxx
+++ b/sw/source/filter/rtf/wrtrtf.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtrtf.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:45:23 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:25 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -579,7 +579,7 @@ void SwRTFWriter::MakeHeader()
         }
         Strm() << pOut;
 
-        switch( rFtnInfo.aFmt.eType )
+        switch( rFtnInfo.aFmt.GetNumberingType() )
         {
         case SVX_NUM_CHARS_LOWER_LETTER:
         case SVX_NUM_CHARS_LOWER_LETTER_N:  pOut = sRTF_FTNNALC;    break;
@@ -600,7 +600,7 @@ void SwRTFWriter::MakeHeader()
                << sRTF_AFTNSTART;
         OutLong( rEndNoteInfo.nFtnOffset + 1 );
 
-        switch( rEndNoteInfo.aFmt.eType )
+        switch( rEndNoteInfo.aFmt.GetNumberingType() )
         {
         case SVX_NUM_CHARS_LOWER_LETTER:
         case SVX_NUM_CHARS_LOWER_LETTER_N:  pOut = sRTF_AFTNNALC;   break;
diff --git a/sw/source/filter/ww8/wrtw8num.cxx b/sw/source/filter/ww8/wrtw8num.cxx
index f07bc98fb311..33b6315019da 100644
--- a/sw/source/filter/ww8/wrtw8num.cxx
+++ b/sw/source/filter/ww8/wrtw8num.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtw8num.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:58 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -176,10 +176,10 @@ void SwWW8Writer::OutListTab()
             BYTE aNumLvlPos[ nWW8MaxListLevel ] = { 0,0,0,0,0,0,0,0,0 };
 
             const SwNumFmt& rFmt = rRule.Get( nLvl );
-            SwWW8Writer::WriteLong( *pTableStrm, rFmt.GetStartValue() );
-            *pTableStrm << SwWW8Writer::GetNumId( rFmt.eType );
+            SwWW8Writer::WriteLong( *pTableStrm, rFmt.GetStart() );
+            *pTableStrm << SwWW8Writer::GetNumId( rFmt.GetNumberingType() );
 
-            switch( rFmt.GetAdjust() )
+            switch( rFmt.GetNumAdjust() )
             {
             case SVX_ADJUST_CENTER: nFlags = 1; break;
             case SVX_ADJUST_RIGHT:  nFlags = 2; break;
@@ -191,8 +191,8 @@ void SwWW8Writer::OutListTab()
             String sNumStr;
             BOOL bWriteBullet = FALSE;
             rtl_TextEncoding eChrSet = RTL_TEXTENCODING_SYMBOL;
-            if( SVX_NUM_CHAR_SPECIAL == rFmt.eType ||
-                SVX_NUM_BITMAP == rFmt.eType )
+            if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() ||
+                SVX_NUM_BITMAP == rFmt.GetNumberingType() )
             {
                 sNumStr = rFmt.GetBulletChar();
                 bWriteBullet = TRUE;
@@ -203,7 +203,7 @@ void SwWW8Writer::OutListTab()
 
                 eChrSet = pFont->GetCharSet();
             }
-            else if( SVX_NUM_NUMBER_NONE != rFmt.eType )
+            else if( SVX_NUM_NUMBER_NONE != rFmt.GetNumberingType() )
             {
                 BYTE* pLvlPos = aNumLvlPos;
                 aNdNum.SetLevel( nLvl );
@@ -224,8 +224,7 @@ void SwWW8Writer::OutListTab()
 
                 if( rFmt.GetPrefix().Len() )
                     sNumStr.Insert( rFmt.GetPrefix(), 0 );
-                if( rFmt.GetPostfix().Len() )
-                    sNumStr += rFmt.GetPostfix();
+                sNumStr += rFmt.GetSuffix();
             }
 
             // write the rgbxchNums[9]
@@ -397,7 +396,7 @@ void SwWW8Writer::BuildAnlvBulletBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
     BYTE nb = 0;                                // Zahlentyp
     ByteToSVBT8( 11, rAnlv.nfc );
 
-    switch( rFmt.GetAdjust() )
+    switch( rFmt.GetNumAdjust() )
     {
     case SVX_ADJUST_RIGHT:      nb = 2; break;
     case SVX_ADJUST_CENTER:     nb = 1; break;
@@ -423,7 +422,7 @@ void SwWW8Writer::BuildAnlvBulletBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
         ByteToSVBT8( 1, rAnlv.cbTextBefore );
     }
     ShortToSVBT16( -rFmt.GetFirstLineOffset(), rAnlv.dxaIndent );
-    ShortToSVBT16( rFmt.GetCharTextOffset(), rAnlv.dxaSpace );
+    ShortToSVBT16( rFmt.GetCharTextDistance(), rAnlv.dxaSpace );
 }
 
 static void SwWw8_InsertAnlText( const String& rStr, BYTE*& rpCh,
@@ -448,10 +447,10 @@ void SwWW8Writer::BuildAnlvBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
                                 USHORT& rCharLen, const SwNumRule& rRul,
                                 const SwNumFmt& rFmt, BYTE nSwLevel )
 {
-    ByteToSVBT8( SwWW8Writer::GetNumId( rFmt.eType ), rAnlv.nfc );
+    ByteToSVBT8( SwWW8Writer::GetNumId( rFmt.GetNumberingType() ), rAnlv.nfc );
 
     BYTE nb = 0;
-    switch( rFmt.GetAdjust() )
+    switch( rFmt.GetNumAdjust() )
     {
     case SVX_ADJUST_RIGHT: nb = 2; break;
     case SVX_ADJUST_CENTER: nb = 1; break;
@@ -459,7 +458,7 @@ void SwWW8Writer::BuildAnlvBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
     case SVX_ADJUST_BLOCKLINE: nb = 3; break;
     }
 
-    BOOL bInclUpper = rFmt.IsInclUpperLevel();
+    BOOL bInclUpper = rFmt.GetIncludeUpperLevels() > 0;
     if( bInclUpper )
         nb |= 0x4;          // include previous levels
 
@@ -471,12 +470,12 @@ void SwWW8Writer::BuildAnlvBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
     {
         if( (nSwLevel >= 1 )
             && (nSwLevel<= nWW8MaxListLevel )
-            && (rFmt.eType != SVX_NUM_NUMBER_NONE ) )   // UEberhaupt Nummerierung ?
+            && (rFmt.GetNumberingType() != SVX_NUM_NUMBER_NONE ) )  // UEberhaupt Nummerierung ?
         {                                               // -> suche, ob noch Zahlen davor
-            BYTE nUpper = rFmt.GetUpperLevel();
+            BYTE nUpper = rFmt.GetIncludeUpperLevels();
             if( (nUpper >= 0 )
                 && (nUpper <= nWW8MaxListLevel )
-                && (rRul.Get(nUpper).eType != SVX_NUM_NUMBER_NONE ) )   // Nummerierung drueber ?
+                && (rRul.Get(nUpper).GetNumberingType() != SVX_NUM_NUMBER_NONE ) )  // Nummerierung drueber ?
             {
                                                     // dann Punkt einfuegen
                 SwWw8_InsertAnlText( aDotStr, rpCh, rCharLen,
@@ -489,13 +488,13 @@ void SwWW8Writer::BuildAnlvBase( WW8_ANLV& rAnlv, BYTE*& rpCh,
     {
         SwWw8_InsertAnlText( rFmt.GetPrefix(), rpCh, rCharLen,
                              rAnlv.cbTextBefore );
-        SwWw8_InsertAnlText( rFmt.GetPostfix(), rpCh, rCharLen,
+        SwWw8_InsertAnlText( rFmt.GetSuffix(), rpCh, rCharLen,
                              rAnlv.cbTextAfter );
     }
 
-    ShortToSVBT16( rFmt.GetStartValue(), rAnlv.iStartAt );
+    ShortToSVBT16( rFmt.GetStart(), rAnlv.iStartAt );
     ShortToSVBT16( -rFmt.GetFirstLineOffset(), rAnlv.dxaIndent );
-    ShortToSVBT16( rFmt.GetCharTextOffset(), rAnlv.dxaSpace );
+    ShortToSVBT16( rFmt.GetCharTextDistance(), rAnlv.dxaSpace );
 }
 
 void SwWW8Writer::Out_NumRuleAnld( const SwNumRule& rRul, const SwNumFmt& rFmt,
@@ -553,12 +552,12 @@ BOOL SwWW8Writer::Out_SwNum( const SwTxtNode* pNd )
 #endif
 
 #ifdef DEBUG
-    BYTE nIncl = pRul->Get(1).GetUpperLevel();
+    BYTE nIncl = pRul->Get(1).GetIncludeUpperLevels();
 #endif
 
-    if( pFmt->eType == SVX_NUM_NUMBER_NONE
-        || pFmt->eType == SVX_NUM_CHAR_SPECIAL
-        || pFmt->eType == SVX_NUM_BITMAP )
+    if( pFmt->GetNumberingType() == SVX_NUM_NUMBER_NONE
+        || pFmt->GetNumberingType() == SVX_NUM_CHAR_SPECIAL
+        || pFmt->GetNumberingType() == SVX_NUM_BITMAP )
     {
                             // Aufzaehlung
         Out_WwNumLvl( (bNoNum) ? 12 : 11 );
@@ -566,7 +565,7 @@ BOOL SwWW8Writer::Out_SwNum( const SwTxtNode* pNd )
         bRet = FALSE;
     }
     else if( pRul->IsContinusNum()
-              || ( pRul->Get(1).GetUpperLevel() <= 1 ) )
+              || ( pRul->Get(1).GetIncludeUpperLevels() <= 1 ) )
     {
                             // Nummerierung
         Out_WwNumLvl( (bNoNum) ? 12 : 10 );
@@ -587,11 +586,14 @@ BOOL SwWW8Writer::Out_SwNum( const SwTxtNode* pNd )
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8num.cxx,v 1.1.1.1 2000-09-18 17:14:58 hr Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8num.cxx,v 1.2 2001-02-23 12:45:26 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:58  hr
+      initial import
+
       Revision 1.9  2000/09/18 16:04:58  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/filter/ww8/wrtw8sty.cxx b/sw/source/filter/ww8/wrtw8sty.cxx
index f5bd24576b7e..f3a570e62d71 100644
--- a/sw/source/filter/ww8/wrtw8sty.cxx
+++ b/sw/source/filter/ww8/wrtw8sty.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtw8sty.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-21 12:55:21 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -960,14 +960,14 @@ void WW8_WrPlcSepx::WriteFtnEndTxt( SwWW8Writer& rWrt, ULONG nCpStt )
     case FTNNUM_CHAPTER:    rDop.rncFtn  = 1; break;
     default: rDop.rncFtn  = 0; break;
     }                                   // rncFtn
-    rDop.nfcFtnRef = SwWW8Writer::GetNumId( rInfo.aFmt.eType );
+    rDop.nfcFtnRef = SwWW8Writer::GetNumId( rInfo.aFmt.GetNumberingType() );
     rDop.nFtn = rInfo.nFtnOffset + 1;
     rDop.fpc = rWrt.bFtnAtTxtEnd ? 2 : 1;
 
     // Endnote Info
     rDop.rncEdn = 0;                        // rncEdn: Don't Restart
     const SwEndNoteInfo& rEndInfo = rWrt.pDoc->GetEndNoteInfo();
-    rDop.nfcEdnRef = SwWW8Writer::GetNumId( rEndInfo.aFmt.eType );
+    rDop.nfcEdnRef = SwWW8Writer::GetNumId( rEndInfo.aFmt.GetNumberingType() );
     rDop.nEdn = rEndInfo.nFtnOffset + 1;
     rDop.epc = rWrt.bEndAtTxtEnd ? 3 : 0;
 }
@@ -1309,7 +1309,7 @@ void WW8_WrPlcSepx::WriteKFTxt( SwWW8Writer& rWrt )
             // dann noch die restlichen Einstellungen aus dem PageDesc
 
             // sprmSNfcPgn
-            BYTE nb = SwWW8Writer::GetNumId( pPd->GetNumType().eType );
+            BYTE nb = SwWW8Writer::GetNumId( pPd->GetNumType().GetNumberingType() );
             if( rWrt.bWrtWW8 )
                 SwWW8Writer::InsUInt16( *pO, 0x300E );
             else
@@ -1881,11 +1881,14 @@ const SvULongs* WW8_WrPlcSubDoc::GetShapeIdArr() const
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8sty.cxx,v 1.3 2000-11-21 12:55:21 jp Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/wrtw8sty.cxx,v 1.4 2001-02-23 12:45:26 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.3  2000/11/21 12:55:21  jp
+      Bug #80385#: Set1StyleDefaults - write also all dynamic attributes
+
       Revision 1.2  2000/10/10 16:54:06  cmc
       MSOffice 97/2000 Controls {Im|Ex}port
 
diff --git a/sw/source/filter/ww8/ww8par2.cxx b/sw/source/filter/ww8/ww8par2.cxx
index e3d98835d511..77d8b7bbefb5 100644
--- a/sw/source/filter/ww8/ww8par2.cxx
+++ b/sw/source/filter/ww8/ww8par2.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par2.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-12-01 11:22:52 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -302,28 +302,28 @@ static void SetBaseAnlv( SwNumFmt* pNum, WW8_ANLV* pAV )
 //          eigentlich folgende 2, aber Writer-UI bietet es nicht an
 //      SVX_ADJUST_CENTER, SVX_ADJUST_BLOCKLINE };
 
-    pNum->eType = ( SVBT8ToByte( pAV->nfc ) < 8 ) ?
-                    eNumA[SVBT8ToByte( pAV->nfc ) ] : SVX_NUM_NUMBER_NONE;
+    pNum->SetNumberingType(( SVBT8ToByte( pAV->nfc ) < 8 ) ?
+                    eNumA[SVBT8ToByte( pAV->nfc ) ] : SVX_NUM_NUMBER_NONE);
 //  pNum->bInclUpperLevel = pAV->fPrev;
-    pNum->SetInclUpperLevel( ( SVBT8ToByte( pAV->aBits1 ) & 0x4 ) >> 2 );
-    pNum->SetStartValue( (USHORT)SVBT16ToShort( pAV->iStartAt ) );
+    pNum->SetIncludeUpperLevels( ( SVBT8ToByte( pAV->aBits1 ) & 0x4 ) >> 2 );
+    pNum->SetStart( (USHORT)SVBT16ToShort( pAV->iStartAt ) );
 //  pNum->eNumAdjust = eAdjA[pAV->jc];
-    pNum->SetAdjust( eAdjA[SVBT8ToByte( pAV->aBits1 ) & 0x3] );
+    pNum->SetNumAdjust( eAdjA[SVBT8ToByte( pAV->aBits1 ) & 0x3] );
 
-    pNum->SetCharTextOffset( (USHORT)SVBT16ToShort( pAV->dxaSpace ) );
+    pNum->SetCharTextDistance( (USHORT)SVBT16ToShort( pAV->dxaSpace ) );
     INT16 nIndent = Abs((INT16)SVBT16ToShort( pAV->dxaIndent ));
     if( SVBT8ToByte( pAV->aBits1 ) & 0x08 ){    // fHang
         pNum->SetFirstLineOffset( -nIndent );
         pNum->SetLSpace( nIndent );
         pNum->SetAbsLSpace( nIndent );
     }else{
-        pNum->SetCharTextOffset( nIndent );     // Breite der Nummer fehlt
+        pNum->SetCharTextDistance( nIndent );       // Breite der Nummer fehlt
     }
     if( SVBT8ToByte( pAV->nfc ) == 5 || SVBT8ToByte( pAV->nfc ) == 7 )
     {
-        String sP( pNum->GetPostfix() );
+        String sP( pNum->GetSuffix() );
         sP.Insert( '.', 0 );
-        pNum->SetPostfix( sP ); // Ordinalzahlen
+        pNum->SetSuffix( sP );  // Ordinalzahlen
     }
 }
 
@@ -341,8 +341,8 @@ void SwWW8ImplReader::SetAnlvStrings( SwNumFmt* pNum, WW8_ANLV* pAV, BYTE* pTxt,
 
     if( bOutline )
     {                             // Gliederung
-        if( !pNum->IsInclUpperLevel()           // es sind  <= 1 Nummern anzuzeigen
-            || pNum->eType == SVX_NUM_NUMBER_NONE ){    // oder dieser Level hat keine
+        if( !pNum->GetIncludeUpperLevels()          // es sind  <= 1 Nummern anzuzeigen
+            || pNum->GetNumberingType() == SVX_NUM_NUMBER_NONE ){   // oder dieser Level hat keine
                                                 // eigenen Ziffern
             bInsert = TRUE;                     // -> dann uebernehme Zeichen
 
@@ -376,7 +376,7 @@ void SwWW8ImplReader::SetAnlvStrings( SwNumFmt* pNum, WW8_ANLV* pAV, BYTE* pTxt,
                 aFont.SetFamily( eFamily );
 //              aFont.SetPitch( ePitch );       // darf nach JP nicht
                 aFont.SetCharSet( eCharSet );
-                pNum->eType = SVX_NUM_CHAR_SPECIAL;
+                pNum->SetNumberingType(SVX_NUM_CHAR_SPECIAL);
 //              if( pAV->ico )      // geht in UI und SWG-Writer/Reader nicht
 //                  aFont.SetColor( Color( GetCol( pAV->ico ) ) );
                 pNum->SetBulletFont( &aFont );
@@ -398,10 +398,10 @@ void SwWW8ImplReader::SetAnlvStrings( SwNumFmt* pNum, WW8_ANLV* pAV, BYTE* pTxt,
         }
         if( SVBT8ToByte( pAV->cbTextAfter ) )
         {
-            String sP( pNum->GetPostfix() );
+            String sP( pNum->GetSuffix() );
             sP.Insert( sTxt.Copy( SVBT8ToByte( pAV->cbTextBefore ),
                                   SVBT8ToByte( pAV->cbTextAfter  ) ) );
-            pNum->SetPostfix( sP );
+            pNum->SetSuffix( sP );
         }
 // Die Zeichen vor und hinter mehreren Ziffern koennen leider nicht uebernommen
 // werden, da sie der Writer ganz anders behandelt und das Ergebnis i.A.
@@ -3003,11 +3003,14 @@ void SwWW8ImplReader::ReadDocInfo()
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par2.cxx,v 1.3 2000-12-01 11:22:52 jp Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par2.cxx,v 1.4 2001-02-23 12:45:26 os Exp $
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.3  2000/12/01 11:22:52  jp
+      Task #81077#: im-/export of CJK documents
+
       Revision 1.2  2000/10/25 14:10:36  khz
       Now supporting negative horizontal indentation of paragrahps and tables
 
diff --git a/sw/source/filter/ww8/ww8par3.cxx b/sw/source/filter/ww8/ww8par3.cxx
index 1f72acc69dfd..2ca88b326540 100644
--- a/sw/source/filter/ww8/ww8par3.cxx
+++ b/sw/source/filter/ww8/ww8par3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par3.cxx,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: cmc $ $Date: 2001-02-06 11:10:53 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -855,9 +855,9 @@ sal_Bool WW8ListManager::ReadLVL( sal_uInt8 nLevel,
     // 6. entsprechendes NumFmt konfigurieren
     //
     if( bSetStartNo )
-        rNumFmt.SetStartValue( nStartNo );
-    rNumFmt.eType = eType;
-    rNumFmt.SetAdjust( eAdj );
+        rNumFmt.SetStart( nStartNo );
+    rNumFmt.SetNumberingType(eType);
+    rNumFmt.SetNumAdjust( eAdj );
 
     if( SVX_NUM_CHAR_SPECIAL == eType )
     {
@@ -872,8 +872,8 @@ sal_Bool WW8ListManager::ReadLVL( sal_uInt8 nLevel,
         // erinnern: Garnix ist default Prefix
             rNumFmt.SetPrefix( aPrefix );
         // erinnern: Punkt ist default  Postfix
-        rNumFmt.SetPostfix( aPostfix );
-        rNumFmt.SetUpperLevel( nUpperLevel );
+        rNumFmt.SetSuffix( aPostfix );
+        rNumFmt.SetIncludeUpperLevels( nUpperLevel );
     }
 
     rNumFmt.SetAbsLSpace( aLVL.nDxaLeft );
@@ -969,7 +969,7 @@ void WW8ListManager::AdjustLVL( sal_uInt8       nLevel,
     //
     // ggfs. Bullet Font an das NumFormat haengen
     //
-    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.eType )
+    if( SVX_NUM_CHAR_SPECIAL == aNumFmt.GetNumberingType() )
     {
         SwCharFmt* pFmt = aNumFmt.GetCharFmt();
         Font aFont;
@@ -1323,7 +1323,7 @@ WW8ListManager::WW8ListManager(SvStream& rSt_, SwWW8ImplReader& rReader_)
                         }
                         else
                         if( aLFOLVL.bStartAt )
-                            aNumFmt.SetStartValue( (sal_uInt16)aLFOLVL.nStartAt );
+                            aNumFmt.SetStart( (sal_uInt16)aLFOLVL.nStartAt );
                         //
                         // 2.2.2.3 das NumFmt in die NumRule aufnehmen
                         //
@@ -2136,12 +2136,15 @@ BOOL SwMSConvertControls::InsertControl(
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par3.cxx,v 1.5 2001-02-06 11:10:53 cmc Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par3.cxx,v 1.6 2001-02-23 12:45:26 os Exp $
 
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.5  2001/02/06 11:10:53  cmc
+      ##173##, #80858#, #82192# deeply flawed upgrade to String from pointer to character array fixed
+
       Revision 1.4  2001/01/30 09:27:25  cmc
       #80205# Keeping comments closely linked to bugids
 
diff --git a/sw/source/filter/ww8/ww8par6.cxx b/sw/source/filter/ww8/ww8par6.cxx
index b2692ac14e1f..f95d097467ef 100644
--- a/sw/source/filter/ww8/ww8par6.cxx
+++ b/sw/source/filter/ww8/ww8par6.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: ww8par6.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: cmc $ $Date: 2001-02-20 10:34:57 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:26 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1057,7 +1057,7 @@ void SwWW8ImplReader::CreateSep(const long nTxtPos)
             aInfo.SetCountBlankLines(  TRUE );
             aInfo.SetCountInFlys(      FALSE );
             aInfo.SetPos( LINENUMBER_POS_LEFT );
-            SwNumType aNumType; // this sets SVX_NUM_ARABIC per default
+            SvxNumberType aNumType; // this sets SVX_NUM_ARABIC per default
             aInfo.SetNumType( aNumType );
 
 
@@ -1401,7 +1401,7 @@ void SwWW8ImplReader::CreateSep(const long nTxtPos)
             SVX_NUM_ARABIC, SVX_NUM_ROMAN_UPPER, SVX_NUM_ROMAN_LOWER,
             SVX_NUM_CHARS_UPPER_LETTER_N, SVX_NUM_CHARS_LOWER_LETTER_N };
 
-        SwNumType aType; aType.eType = aNumTyp[ nNfcPgn ];
+        SvxNumberType aType; aType.SetNumberingType(aNumTyp[ nNfcPgn ]);
         pPageDesc->SetNumType( aType );
     }
 
@@ -4929,12 +4929,15 @@ short SwWW8ImplReader::ImportSprm( BYTE* pPos, short nSprmsLen, USHORT nId )
 
       Source Code Control System - Header
 
-      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par6.cxx,v 1.13 2001-02-20 10:34:57 cmc Exp $
+      $Header: /zpool/svn/migration/cvs_rep_09_09_08/code/sw/source/filter/ww8/ww8par6.cxx,v 1.14 2001-02-23 12:45:26 os Exp $
 
 
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.13  2001/02/20 10:34:57  cmc
+      #83546# Don't create a tab stop description without any tab stops
+
       Revision 1.12  2001/02/15 20:08:10  jp
       im-/export the Rotate-/ScaleWidth-Character attribut
 
diff --git a/sw/source/ui/app/appenv.cxx b/sw/source/ui/app/appenv.cxx
index 4597c8fd6d3e..0600a36a5a76 100644
--- a/sw/source/ui/app/appenv.cxx
+++ b/sw/source/ui/app/appenv.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: appenv.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:27:32 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -464,8 +464,8 @@ static USHORT nTitleNo = 0;
                                             nPageW + lLeft, nPageH + lUpper));
 
         // Einstellen der Numerierungsart der Seite
-        SwNumType aType;
-        aType.eType = SVX_NUM_NUMBER_NONE;
+        SvxNumberType aType;
+        aType.SetNumberingType(SVX_NUM_NUMBER_NONE);
         pDesc->SetNumType(aType);
 
         // Folgevorlage
diff --git a/sw/source/ui/app/applab.cxx b/sw/source/ui/app/applab.cxx
index be75778c42c4..cb2238daad24 100644
--- a/sw/source/ui/app/applab.cxx
+++ b/sw/source/ui/app/applab.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: applab.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: os $ $Date: 2001-02-21 12:27:32 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -403,8 +403,8 @@ static sal_uInt16 nBCTitleNo = 0;
                                         rItem.lUpper + rItem.nRows * rItem.lVDist));
 
             // Numerierungsart
-            SwNumType aType;
-            aType.eType = SVX_NUM_NUMBER_NONE;
+            SvxNumberType aType;
+            aType.SetNumberingType(SVX_NUM_NUMBER_NONE);
             aDesc.SetNumType( aType );
 
             // Folgevorlage
diff --git a/sw/source/ui/chrdlg/numpara.cxx b/sw/source/ui/chrdlg/numpara.cxx
index b58efe96b478..cfe6481f992f 100644
--- a/sw/source/ui/chrdlg/numpara.cxx
+++ b/sw/source/ui/chrdlg/numpara.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: numpara.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:32 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -331,6 +331,9 @@ IMPL_LINK( SwParagraphNumTabPage, StyleHdl_Impl, ListBox*, pBox )
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:32  hr
+      initial import
+
       Revision 1.9  2000/09/18 16:05:14  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/config/uinums.cxx b/sw/source/ui/config/uinums.cxx
index b6abb139b5b7..5e53a212140e 100644
--- a/sw/source/ui/config/uinums.cxx
+++ b/sw/source/ui/config/uinums.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uinums.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: mib $ $Date: 2001-02-06 15:45:20 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -490,7 +490,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
         BOOL bFlag;
         String sStr;
 
-        rStream >> nUS;             aFmt.eType = SvxExtNumType( nUS );
+        rStream >> nUS;             aFmt.SetNumberingType((sal_Int16)nUS );
         if( VERSION_53A > nVersion )
         {
             rStream >> cChar;       aFmt.SetBulletChar( cChar );
@@ -500,35 +500,34 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
             rStream >> nUS;         aFmt.SetBulletChar( nUS );
         }
 
-        rStream >> bFlag;           aFmt.SetInclUpperLevel( bFlag );
+        rStream >> bFlag;           aFmt.SetIncludeUpperLevels( bFlag );
 
         if( VERSION_30B == nVersion )
         {
             long nL;
-            rStream >> cChar;       aFmt.SetStartValue( (USHORT)cChar );
+            rStream >> cChar;       aFmt.SetStart( (USHORT)cChar );
 
             rStream.ReadByteString(sStr, eEncoding);
             aFmt.SetPrefix( sStr );
             rStream.ReadByteString(sStr, eEncoding);
-            aFmt.SetPostfix( sStr );
-            rStream >> nUS;         aFmt.SetAdjust( SvxAdjust( nUS ) );
+            aFmt.SetSuffix( sStr );
+            rStream >> nUS;         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream >> nL;          aFmt.SetLSpace( lNumIndent );
             rStream >> nL;          aFmt.SetFirstLineOffset( (short)nL );
-            aFmt.SetRelLSpace( TRUE );
         }
         else                // alter StartWert war ein Byte
         {
-            rStream >> nUS;         aFmt.SetStartValue( nUS );
+            rStream >> nUS;         aFmt.SetStart( nUS );
             rStream.ReadByteString(sStr, eEncoding);
             aFmt.SetPrefix( sStr );
             rStream.ReadByteString(sStr, eEncoding);
-            aFmt.SetPostfix( sStr );
-            rStream >> nUS;         aFmt.SetAdjust( SvxAdjust( nUS ) );
+            aFmt.SetSuffix( sStr );
+            rStream >> nUS;         aFmt.SetNumAdjust( SvxAdjust( nUS ) );
             rStream >> nUS;         aFmt.SetAbsLSpace( nUS );
             rStream >> nShort;      aFmt.SetFirstLineOffset( nShort );
-            rStream >> nUS;         aFmt.SetCharTextOffset( nUS );
+            rStream >> nUS;         aFmt.SetCharTextDistance( nUS );
             rStream >> nShort;      aFmt.SetLSpace( nShort );
-            rStream >> bFlag;       aFmt.SetRelLSpace( bFlag );
+            rStream >> bFlag;
         }
 
         USHORT  nFamily;
@@ -574,7 +573,7 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
         }
     }
 
-    if( VERSION_40A == nVersion && SVX_NUM_BITMAP == aFmt.eType )
+    if( VERSION_40A == nVersion && SVX_NUM_BITMAP == aFmt.GetNumberingType() )
     {
         BYTE cF;
         Size aSz;
@@ -601,7 +600,10 @@ SwNumRulesWithName::_SwNumFmtGlobal::_SwNumFmtGlobal( SvStream& rStream,
                 pVOrient = (SwFmtVertOrient*)GetDfltAttr( RES_VERT_ORIENT )
                                         ->Create( rStream, nVer );
             }
-            aFmt.SetGrfBrush( pBrush, &aSz, pVOrient );
+            SvxFrameVertOrient eOrient = SVX_VERT_NONE;
+            if(pVOrient)
+                eOrient = (SvxFrameVertOrient)pVOrient->GetVertOrient();
+            aFmt.SetGraphicBrush( pBrush, &aSz, pVOrient ? &eOrient : 0 );
         }
     }
 }
@@ -638,18 +640,18 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
             nPitch = (USHORT)pFnt->GetPitch();
         }
 
-        rStream << USHORT(aFmt.eType)
+        rStream << USHORT(aFmt.GetNumberingType())
                 << aFmt.GetBulletChar()
-                << aFmt.IsInclUpperLevel()
-                << aFmt.GetStartValue();
+                << (aFmt.GetIncludeUpperLevels() > 0)
+                << aFmt.GetStart();
         rStream.WriteByteString( aFmt.GetPrefix(), eEncoding );
-        rStream.WriteByteString( aFmt.GetPostfix(), eEncoding );
-        rStream << USHORT( aFmt.GetAdjust() )
+        rStream.WriteByteString( aFmt.GetSuffix(), eEncoding );
+        rStream << USHORT( aFmt.GetNumAdjust() )
                 << aFmt.GetAbsLSpace()
                 << aFmt.GetFirstLineOffset()
-                << aFmt.GetCharTextOffset()
+                << aFmt.GetCharTextDistance()
                 << aFmt.GetLSpace()
-                << aFmt.IsRelLSpace();
+                << FALSE;//aFmt.IsRelLSpace();
         rStream.WriteByteString( aName, eEncoding );
         rStream << nFamily
                 << nCharSet
@@ -674,25 +676,25 @@ void SwNumRulesWithName::_SwNumFmtGlobal::Store( SvStream& rStream )
 
     // Erweiterungen fuer Version 40A
 
-    if( SVX_NUM_BITMAP == aFmt.eType )
+    if( SVX_NUM_BITMAP == aFmt.GetNumberingType() )
     {
-        rStream << (INT32)aFmt.GetGrfSize().Width()
-                << (INT32)aFmt.GetGrfSize().Height();
-        BYTE cFlg = ( 0 != aFmt.GetGrfBrush() ? 1 : 0 ) +
-                    ( 0 != aFmt.GetGrfOrient() ? 2 : 0 );
+        rStream << (INT32)aFmt.GetGraphicSize().Width()
+                << (INT32)aFmt.GetGraphicSize().Height();
+        BYTE cFlg = ( 0 != aFmt.GetBrush() ? 1 : 0 ) +
+                    ( 0 != aFmt.GetGraphicOrientation() ? 2 : 0 );
         rStream << cFlg;
 
-        if( aFmt.GetGrfBrush() )
+        if( aFmt.GetBrush() )
         {
-            USHORT nVersion = aFmt.GetGrfBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
+            USHORT nVersion = aFmt.GetBrush()->GetVersion( SOFFICE_FILEFORMAT_50 );
             rStream << nVersion;
-            aFmt.GetGrfBrush()->Store( rStream, nVersion );
+            aFmt.GetBrush()->Store( rStream, nVersion );
         }
-        if( aFmt.GetGrfOrient() )
+        if( aFmt.GetGraphicOrientation() )
         {
-            USHORT nVersion = aFmt.GetGrfOrient()->GetVersion( SOFFICE_FILEFORMAT_50 );
+            USHORT nVersion = aFmt.GetGraphicOrientation()->GetVersion( SOFFICE_FILEFORMAT_50 );
             rStream << nVersion;
-            aFmt.GetGrfOrient()->Store( rStream, nVersion );
+            aFmt.GetGraphicOrientation()->Store( rStream, nVersion );
         }
     }
 }
diff --git a/sw/source/ui/misc/docfnote.cxx b/sw/source/ui/misc/docfnote.cxx
index 620f3b11a000..881096cb85ce 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.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 08:01:42 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -294,7 +294,7 @@ void SwEndNoteOptionPage::Reset( const SfxItemSet& )
 
         // Numerierung
         // Art
-    aNumViewBox.SelectEntryPos( GetNumPos( pInf->aFmt.eType ));
+    aNumViewBox.SelectEntryPos( GetNumPos( pInf->aFmt.GetNumberingType() ));
     aOffsetFld.SetValue(pInf->nFtnOffset + 1);
     aPrefixED.SetText(pInf->GetPrefix());
     aSuffixED.SetText(pInf->GetSuffix());
@@ -493,7 +493,7 @@ BOOL SwEndNoteOptionPage::FillItemSet( SfxItemSet &rSet )
     SwEndNoteInfo *pInf = bEndNote ? new SwEndNoteInfo() : new SwFtnInfo();
 
     pInf->nFtnOffset = aOffsetFld.GetValue() -1;
-    pInf->aFmt.eType = GetNumType( aNumViewBox.GetSelectEntryPos() );
+    pInf->aFmt.SetNumberingType(GetNumType( aNumViewBox.GetSelectEntryPos() ));
     pInf->SetPrefix(aPrefixED.GetText());
     pInf->SetSuffix(aSuffixED.GetText());
 
@@ -554,6 +554,9 @@ SfxTabPage *SwFootNoteOptionPage::Create(Window *pParent, const SfxItemSet &rSet
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.2  2001/02/09 08:01:42  os
+    TabPage size changed
+
     Revision 1.1.1.1  2000/09/18 17:14:44  hr
     initial import
 
diff --git a/sw/source/ui/misc/linenum.cxx b/sw/source/ui/misc/linenum.cxx
index 4513deaae704..6e0ab93fe183 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.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -233,7 +233,7 @@ void __EXPORT SwLineNumberingPage::Reset( const SfxItemSet& rSet )
 
     // Format
     SwFldMgr aMgr( pSh );
-    USHORT nSelFmt = rInf.GetNumType().eType;
+    USHORT nSelFmt = rInf.GetNumType().GetNumberingType();
     USHORT nCnt = aMgr.GetFormatCount( TYP_SEQFLD, FALSE );
 
     for( USHORT i = 0; i < nCnt; i++)
@@ -355,9 +355,9 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& rSet )
         aInf.SetCharFmt(pCharFmt);
 
     // Format
-    SwNumType aType;
-    aType.eType = (SvxExtNumType)(USHORT)(ULONG)aFormatLB.GetEntryData(
-                                    aFormatLB.GetSelectEntryPos() );
+    SvxNumberType aType;
+    aType.SetNumberingType((sal_Int16)(ULONG)aFormatLB.GetEntryData(
+                                    aFormatLB.GetSelectEntryPos() ));
     aInf.SetNumType(aType);
 
     // Position
@@ -390,6 +390,9 @@ BOOL __EXPORT SwLineNumberingPage::FillItemSet( SfxItemSet& rSet )
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:45  hr
+    initial import
+
     Revision 1.11  2000/09/18 16:05:57  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/misc/num.cxx b/sw/source/ui/misc/num.cxx
index 4c8c209a7130..881f5e72d70a 100644
--- a/sw/source/ui/misc/num.cxx
+++ b/sw/source/ui/misc/num.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: num.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:45 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -295,7 +295,7 @@ void SwNumPositionTabPage::InitControls()
             if(USHRT_MAX == nLvl)
             {
                 nLvl = i;
-                pFirstOrient = aNumFmtArr[nLvl]->GetGrfOrient();
+                pFirstOrient = aNumFmtArr[nLvl]->GetGraphicOrientation();
 //              nFirstLSpace = nLvl > 0 ?
 //                  aNumFmtArr[nLvl]->GetAbsLSpace() - aNumFmtArr[nLvl - 1]->GetAbsLSpace():
 //                      aNumFmtArr[nLvl]->GetAbsLSpace();
@@ -327,9 +327,9 @@ void SwNumPositionTabPage::InitControls()
 //                  bSameDistBorder &= aNumFmtArr[i]->GetAbsLSpace() == aNumFmtArr[nLvl]->GetAbsLSpace();
                 }
 
-                bSameDist       &= aNumFmtArr[i]->GetCharTextOffset() == aNumFmtArr[nLvl]->GetCharTextOffset();
+                bSameDist       &= aNumFmtArr[i]->GetCharTextDistance() == aNumFmtArr[nLvl]->GetCharTextDistance();
                 bSameIndent     &= aNumFmtArr[i]->GetFirstLineOffset() == aNumFmtArr[nLvl]->GetFirstLineOffset();
-                bSameAdjust     &= aNumFmtArr[i]->GetAdjust() == aNumFmtArr[nLvl]->GetAdjust();
+                bSameAdjust     &= aNumFmtArr[i]->GetNumAdjust() == aNumFmtArr[nLvl]->GetNumAdjust();
 
             }
         }
@@ -362,7 +362,7 @@ void SwNumPositionTabPage::InitControls()
         bSetDistEmpty = TRUE;
 
     if(bSameDist)
-        aDistNumMF   .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextOffset()), FUNIT_TWIP);
+        aDistNumMF   .SetValue(aDistNumMF.Normalize(aNumFmtArr[nLvl]->GetCharTextDistance()), FUNIT_TWIP);
     else
         aDistNumMF.SetText(aEmptyStr);
     if(bSameIndent)
@@ -373,9 +373,9 @@ void SwNumPositionTabPage::InitControls()
     if(bSameAdjust)
     {
         USHORT nPos = 1; // zentriert
-        if(aNumFmtArr[nLvl]->GetAdjust() == SVX_ADJUST_LEFT)
+        if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_LEFT)
             nPos = 0;
-        else if(aNumFmtArr[nLvl]->GetAdjust() == SVX_ADJUST_RIGHT)
+        else if(aNumFmtArr[nLvl]->GetNumAdjust() == SVX_ADJUST_RIGHT)
             nPos = 2;
         aAlignLB.SelectEntryPos(nPos);
     }
@@ -603,7 +603,7 @@ IMPL_LINK( SwNumPositionTabPage, EditModifyHdl, Edit *, pEdit )
                 eAdjust = SVX_ADJUST_LEFT;
             else if(nPos == 2)
                 eAdjust = SVX_ADJUST_RIGHT;
-            aNumFmt.SetAdjust( eAdjust );
+            aNumFmt.SetNumAdjust( eAdjust );
             pActNum->Set(i, aNumFmt);
         }
         nMask <<= 1;
@@ -697,7 +697,7 @@ IMPL_LINK( SwNumPositionTabPage, DistanceHdl, MetricField *, pFld )
             }
             else if(pFld == &aDistNumMF)
             {
-                aNumFmt.SetCharTextOffset( (short)nValue );
+                aNumFmt.SetCharTextDistance( (short)nValue );
             }
             else if(pFld == &aIndentMF)
             {
@@ -779,7 +779,7 @@ IMPL_LINK( SwNumPositionTabPage, StandardHdl, PushButton *, EMPTYARG )
                 );
             SwNumFmt aTempFmt(aTmpNumRule.Get( i ));
             aNumFmt.SetAbsLSpace( aTempFmt.GetAbsLSpace());
-            aNumFmt.SetCharTextOffset( aTempFmt.GetCharTextOffset() );
+            aNumFmt.SetCharTextDistance( aTempFmt.GetCharTextDistance() );
             aNumFmt.SetFirstLineOffset( aTempFmt.GetFirstLineOffset() );
 
             pActNum->Set( i, aNumFmt );
@@ -906,6 +906,9 @@ IMPL_LINK(SwSvxNumBulletTabDialog, RemoveNumberingHdl, PushButton*, EMPTYARG)
       Source Code Control System - Update
 
       $Log: not supported by cvs2svn $
+      Revision 1.1.1.1  2000/09/18 17:14:45  hr
+      initial import
+
       Revision 1.198  2000/09/18 16:05:58  willem.vandorp
       OpenOffice header added.
 
diff --git a/sw/source/ui/misc/outline.cxx b/sw/source/ui/misc/outline.cxx
index 5b3e4bfaa615..81df806843f1 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.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 08:01:42 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -154,15 +154,45 @@
 #ifndef _UTL_CONFIGMGR_HXX_
 #include <unotools/configmgr.hxx>
 #endif
+#ifndef _COM_SUN_STAR_STYLE_NUMBERINGTYPE_HPP_
+#include <com/sun/star/style/NumberingType.hpp>
+#endif
+#ifndef _COM_SUN_STAR_TEXT_XDEFAULTNUMBERINGPROVIDER_HPP_
+#include <com/sun/star/text/XDefaultNumberingProvider.hpp>
+#endif
+#ifndef _COM_SUN_STAR_LANG_XMULTISERVICEFACTORY_HPP_
+#include <com/sun/star/lang/XMultiServiceFactory.hpp>
+#endif
+#ifndef _COMPHELPER_PROCESSFACTORY_HXX_
+#include <comphelper/processfactory.hxx>
+#endif
+#ifndef _COM_SUN_STAR_TEXT_XNUMBERINGTYPEINFO_HPP_
+#include <com/sun/star/text/XNumberingTypeInfo.hpp>
+#endif
 
+using namespace com::sun::star::uno;
+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)
 
-DBG_NAME(outlinehdl);
+/* -----------------------------31.01.01 10:23--------------------------------
+
+ ---------------------------------------------------------------------------*/
+Reference<XDefaultNumberingProvider> lcl_GetNumberingProvider()
+{
+    Reference< XMultiServiceFactory > xMSF = ::comphelper::getProcessServiceFactory();
+    Reference < XInterface > xI = xMSF->createInstance(
+        ::rtl::OUString::createFromAscii( "com.sun.star.text.DefaultNumberingProvider" ) );
+    Reference<XDefaultNumberingProvider> xRet(xI, UNO_QUERY);
+    DBG_ASSERT(xRet.is(), "service missing: \"com.sun.star.text.DefaultNumberingProvider\"")
+
+    return xRet;
+}
 
-// ReplaceTabStr implementiert in doc/docedt.cxx
-//extern void ReplaceTabsStr( String& rStr, const String& rSrch,
-//                              const String& rRepl );
+DBG_NAME(outlinehdl);
 
 USHORT lcl_AdjustToPos(SvxAdjust eAdjust)
 {
@@ -174,28 +204,6 @@ USHORT lcl_AdjustToPos(SvxAdjust eAdjust)
     }
     return nRet;
 }
-
-// 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
-// 7        - Ohne              - 5
-
-inline USHORT GetNumPos( USHORT n )
-{
-    return SVX_NUM_NUMBER_NONE == n ? 7 : SVX_NUM_ARABIC < n ? n - 4 : n;
-}
-
-inline SvxExtNumType GetNumType( USHORT n )
-{
-    return (SvxExtNumType)(7 == n ? SVX_NUM_NUMBER_NONE : SVX_NUM_ARABIC < n ? n + 4 : n);
-}
-
 /*---------------------------------------------------------------------
 
 ---------------------------------------------------------------------*/
@@ -567,6 +575,38 @@ SwOutlineSettingsTabPage::SwOutlineSettingsTabPage(Window* pParent, const SfxIte
     aSuffixED.SetModifyHdl(LINK(this,   SwOutlineSettingsTabPage, DelimModify));
     aStartEdit.SetModifyHdl(LINK(this,  SwOutlineSettingsTabPage, StartModified));
     aCharFmtLB.SetSelectHdl(LINK(this,  SwOutlineSettingsTabPage, CharFmtHdl));
+
+    Reference<XDefaultNumberingProvider> xDefNum = lcl_GetNumberingProvider();
+    Reference<XNumberingTypeInfo> xInfo(xDefNum, UNO_QUERY);
+    if(xInfo.is())
+    {
+        Sequence<sal_Int16> aTypes = xInfo->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_Bool bInsert = sal_True;
+                for(USHORT nEntry = 0; nEntry < aNumberBox.GetEntryCount(); nEntry++)
+                {
+                    USHORT nEntryData = (USHORT)(ULONG)aNumberBox.GetEntryData(nEntry);
+                    if(nEntryData == (USHORT) nCurrent)
+                    {
+                        bInsert = sal_False;
+                        break;
+                    }
+                }
+                if(bInsert)
+                {
+                    OUString aIdent = xInfo->getNumberingIdentifier( nCurrent );
+                    USHORT nPos = aNumberBox.InsertEntry(aIdent);
+                    aNumberBox.SetEntryData(nPos,(void*)(ULONG)nCurrent);
+                }
+            }
+        }
+    }
+
 }
 /* -----------------07.07.98 14:19-------------------
  *
@@ -596,22 +636,26 @@ void    SwOutlineSettingsTabPage::Update()
                 pFirstFmt = aNumFmtArr[i]->GetCharFmt();
             else
             {
-                bSameType   &= aNumFmtArr[i]->eType == aNumFmtArr[0]->eType;
-                bSameStart  &= aNumFmtArr[i]->GetStartValue() == aNumFmtArr[0]->GetStartValue();
+                bSameType   &= aNumFmtArr[i]->GetNumberingType() == aNumFmtArr[0]->GetNumberingType();
+                bSameStart  &= aNumFmtArr[i]->GetStart() == aNumFmtArr[0]->GetStart();
                 bSamePrefix &= aNumFmtArr[i]->GetPrefix() == aNumFmtArr[0]->GetPrefix();
-                bSameSuffix &= aNumFmtArr[i]->GetPostfix() == aNumFmtArr[0]->GetPostfix();
-                bSameComplete &= aNumFmtArr[i]->GetUpperLevel() == aNumFmtArr[0]->GetUpperLevel();
+                bSameSuffix &= aNumFmtArr[i]->GetSuffix() == aNumFmtArr[0]->GetSuffix();
+                bSameComplete &= aNumFmtArr[i]->GetIncludeUpperLevels() == aNumFmtArr[0]->GetIncludeUpperLevels();
                 const SwCharFmt* pFmt = aNumFmtArr[i]->GetCharFmt();
                 bSameCharFmt &=     !pFirstFmt && !pFmt
                                     || pFirstFmt && pFmt && pFmt->GetName() == pFirstFmt->GetName();
             }
         }
         if(bSameType)
-            aNumberBox.SelectEntryPos( GetNumPos( aNumFmtArr[0]->eType ));
+        {
+            long nData = aNumFmtArr[0]->GetNumberingType();
+            USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+            aNumberBox.SelectEntryPos( nPos );
+        }
         else
             aNumberBox.SetNoSelection();
         if(bSameStart)
-            aStartEdit.SetValue(aNumFmtArr[0]->GetStartValue());
+            aStartEdit.SetValue(aNumFmtArr[0]->GetStart());
         else
             aStartEdit.SetText(aEmptyStr);
         if(bSamePrefix)
@@ -619,7 +663,7 @@ void    SwOutlineSettingsTabPage::Update()
         else
             aPrefixED.SetText(aEmptyStr);
         if(bSameSuffix)
-            aSuffixED.SetText(aNumFmtArr[0]->GetPostfix());
+            aSuffixED.SetText(aNumFmtArr[0]->GetSuffix());
         else
             aSuffixED.SetText(aEmptyStr);
 
@@ -638,7 +682,7 @@ void    SwOutlineSettingsTabPage::Update()
         aAllLevelNF.SetMax(MAXLEVEL);
         if(bSameComplete)
         {
-            aAllLevelNF.SetValue(aNumFmtArr[0]->GetUpperLevel());
+            aAllLevelNF.SetValue(aNumFmtArr[0]->GetIncludeUpperLevels());
         }
         else
         {
@@ -654,9 +698,12 @@ void    SwOutlineSettingsTabPage::Update()
         else
             aCollBox.SelectEntry(aNoFmtName);
         const SwNumFmt &rFmt = pNumRule->Get(nTmpLevel);
-        aNumberBox.SelectEntryPos( GetNumPos( rFmt.eType ));
+
+        ULONG nData = rFmt.GetNumberingType();
+        USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+        aNumberBox.SelectEntryPos( nPos );
         aPrefixED.SetText(rFmt.GetPrefix());
-        aSuffixED.SetText(rFmt.GetPostfix());
+        aSuffixED.SetText(rFmt.GetSuffix());
         const SwCharFmt* pFmt = rFmt.GetCharFmt();
         if(pFmt)
             aCharFmtLB.SelectEntry(pFmt->GetName());
@@ -668,7 +715,7 @@ void    SwOutlineSettingsTabPage::Update()
             aAllLevelFT.Enable(TRUE);
             aAllLevelNF.Enable(TRUE);
             aAllLevelNF.SetMax(nTmpLevel + 1);
-            aAllLevelNF.SetValue(rFmt.GetUpperLevel());
+            aAllLevelNF.SetValue(rFmt.GetIncludeUpperLevels());
         }
         else
         {
@@ -677,7 +724,7 @@ void    SwOutlineSettingsTabPage::Update()
             aAllLevelFT.Enable(FALSE);
         }
 
-        aStartEdit.SetValue( rFmt.GetStartValue() );
+        aStartEdit.SetValue( rFmt.GetStart() );
     }
     SetModified();
 }
@@ -718,7 +765,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, ToggleComplete, NumericField *, pFld )
         if(nActLevel & nMask)
         {
             SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetUpperLevel((BYTE) std::min(pFld->GetValue(), (long)(i + 1)) );
+            aNumFmt.SetIncludeUpperLevels((BYTE) std::min(pFld->GetValue(), (long)(i + 1)) );
             pNumRule->Set(i, aNumFmt);
         }
         nMask <<= 1;
@@ -788,12 +835,13 @@ IMPL_LINK( SwOutlineSettingsTabPage, NumberSelect, ListBox *, pBox )
     USHORT nStart = 0;
     USHORT nEnd = MAXLEVEL;
     USHORT nMask = 1;
+    sal_Int16 nNumberType = (sal_Int16)(ULONG)pBox->GetEntryData(pBox->GetSelectEntryPos());
     for(USHORT i = 0; i < MAXLEVEL; i++)
     {
         if(nActLevel & nMask)
         {
             SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.eType = GetNumType( pBox->GetSelectEntryPos() );
+            aNumFmt.SetNumberingType(nNumberType);
             pNumRule->Set(i, aNumFmt);
         }
         nMask <<= 1;
@@ -815,7 +863,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, DelimModify, Edit *, pEdt )
         {
             SwNumFmt aNumFmt(pNumRule->Get(i));
             aNumFmt.SetPrefix( aPrefixED.GetText() );
-            aNumFmt.SetPostfix( aSuffixED.GetText() );
+            aNumFmt.SetSuffix( aSuffixED.GetText() );
             pNumRule->Set(i, aNumFmt);
         }
         nMask <<= 1;
@@ -836,7 +884,7 @@ IMPL_LINK( SwOutlineSettingsTabPage, StartModified, NumericField *, pFld )
         if(nActLevel & nMask)
         {
             SwNumFmt aNumFmt(pNumRule->Get(i));
-            aNumFmt.SetStartValue( (USHORT)pFld->GetValue() );
+            aNumFmt.SetStart( (USHORT)pFld->GetValue() );
             pNumRule->Set(i, aNumFmt);
         }
         nMask <<= 1;
@@ -917,7 +965,7 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
     // Startwert setzen - nActLevel muss hier 1 sein
     USHORT nTmpLevel = lcl_BitToLevel(nActLevel);
     const SwNumFmt& rNumFmt = pNumRule->Get( nTmpLevel );
-    aStartEdit.SetValue( rNumFmt.GetStartValue() );
+    aStartEdit.SetValue( rNumFmt.GetStart() );
 
     // Poolformate fuer Ueberschriften anlegen
     String sStr;
@@ -945,7 +993,9 @@ void SwOutlineSettingsTabPage::SetWrtShell(SwWrtShell* pShell)
         }
     }
 
-    aNumberBox.SelectEntryPos( GetNumPos( rNumFmt.eType ));
+    long nData = rNumFmt.GetNumberingType();
+    USHORT nPos = aNumberBox.GetEntryPos((void*)nData);
+    aNumberBox.SelectEntryPos( nPos );
     USHORT nOutlinePos = pSh->GetOutlinePos(MAXLEVEL);
     USHORT nTmp = 0;
     if(nOutlinePos != USHRT_MAX)
@@ -1032,14 +1082,14 @@ USHORT lcl_DrawBullet(VirtualDevice* pVDev,
 USHORT lcl_DrawGraphic(VirtualDevice* pVDev, const SwNumFmt &rFmt, USHORT nXStart,
                         USHORT nYStart, USHORT nDivision)
 {
-    const SvxBrushItem* pBrushItem = rFmt.GetGrfBrush();
+    const SvxBrushItem* pBrushItem = rFmt.GetBrush();
     USHORT nRet = 0;
     if(pBrushItem)
     {
         const Graphic* pGrf = pBrushItem->GetGraphic();
         if(pGrf)
         {
-            Size aGSize( rFmt.GetGrfSize() );
+            Size aGSize( rFmt.GetGraphicSize());
             aGSize.Width() /= nDivision;
             nRet = (USHORT)aGSize.Width();
             aGSize.Height() /= nDivision;
@@ -1096,7 +1146,7 @@ void    NumberingPreview::Paint( const Rectangle& rRect )
         aStdFont.SetSize(Size( 0, nFontHeight ));
 
         SwNodeNum aNum( (BYTE)0 );
-        USHORT nPreNum = pActNum->Get(0).GetStartValue();
+        USHORT nPreNum = pActNum->Get(0).GetStart();
 
         if(bPosition)
         {
@@ -1112,9 +1162,9 @@ void    NumberingPreview::Paint( const Rectangle& rRect )
             for( BYTE nLevel = nStart; nLevel < nEnd; ++nLevel )
             {
                 const SwNumFmt &rFmt = pActNum->Get(nLevel);
-                aNum.GetLevelVal()[ nLevel ] = rFmt.GetStartValue();
+                aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
                 USHORT nXStart = rFmt.GetAbsLSpace() / nWidthRelation;
-                USHORT nTextOffset = rFmt.GetCharTextOffset() / nWidthRelation;
+                USHORT nTextOffset = rFmt.GetCharTextDistance() / nWidthRelation;
                 USHORT nNumberXPos = nXStart;
                 USHORT nFirstLineOffset = (-rFmt.GetFirstLineOffset()) / nWidthRelation;
 
@@ -1124,13 +1174,13 @@ void    NumberingPreview::Paint( const Rectangle& rRect )
                     nNumberXPos = 0;
 
                 USHORT nBulletWidth = 0;
-                if( SVX_NUM_BITMAP == rFmt.eType )
+                if( SVX_NUM_BITMAP == rFmt.GetNumberingType() )
                 {
                     nBulletWidth = lcl_DrawGraphic(pVDev, rFmt,
                                         nNumberXPos,
                                             nYStart, nWidthRelation);
                 }
-                else if( SVX_NUM_CHAR_SPECIAL == rFmt.eType )
+                else if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() )
                 {
                     nBulletWidth =  lcl_DrawBullet(pVDev, rFmt, nNumberXPos, nYStart, aStdFont.GetSize());
                 }
@@ -1164,15 +1214,15 @@ void    NumberingPreview::Paint( const Rectangle& rRect )
                             ++nLevel, nYStart += nYStep )
             {
                 const SwNumFmt &rFmt = pActNum->Get(nLevel);
-                aNum.GetLevelVal()[ nLevel ] = rFmt.GetStartValue();
+                aNum.GetLevelVal()[ nLevel ] = rFmt.GetStart();
                 USHORT nXStart = (rFmt.GetAbsLSpace() / nWidthRelation) / 2 + 2;
                 USHORT nTextOffset = 2 * nXStep;
-                if( SVX_NUM_BITMAP == rFmt.eType )
+                if( SVX_NUM_BITMAP == rFmt.GetNumberingType() )
                 {
                     lcl_DrawGraphic(pVDev, rFmt, nXStart, nYStart, nWidthRelation);
                     nTextOffset = nLineHeight + nXStep;
                 }
-                else if( SVX_NUM_CHAR_SPECIAL == rFmt.eType )
+                else if( SVX_NUM_CHAR_SPECIAL == rFmt.GetNumberingType() )
                 {
 //                  aNum.GetLevelVal()[ nLevel ] = 0;
                     nTextOffset =  lcl_DrawBullet(pVDev, rFmt, nXStart, nYStart, aStdFont.GetSize());
@@ -1226,6 +1276,9 @@ 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
 
diff --git a/sw/source/ui/misc/outline.src b/sw/source/ui/misc/outline.src
index 3d80e6753a38..35908e8bea53 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.9 $
+ *  $Revision: 1.10 $
  *
- *  last change: $Author: os $ $Date: 2001-02-09 08:01:42 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -938,256 +938,256 @@ TabPage TP_OUTLINE_NUM
         CurPos = 0 ;
         StringList =
         {
-            "A, B, C, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Ohne" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "None" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Ingen" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Senza" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Nenhum" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Sem" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Ei ole" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Uden" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Aucun(e)" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Utan" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Geen" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "Ninguno" ;
+            <"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, ..." ;
-            "a, b, c, ..." ;
-            "I, II, III, ..." ;
-            "i, ii, iii, ..." ;
-            "1, 2, 3, ..." ;
-            "A, .., AA, .., AAA, ..." ;
-            "a, .., aa, .., aaa, ..." ;
-            "None" ;
+            <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "���" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "�����" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "Brak" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "�Ȃ�" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "����" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "��" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "�L" ;
+        <"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, ..." ;
-        "...áȡ�" ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "����" ;
+        <"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, ..." ;
-        "a, b, c, ..." ;
-        "I, II, III, ..." ;
-        "i, ii, iii, ..." ;
-        "1, 2, 3, ..." ;
-        "A, .., AA, .., AAA, ..." ;
-        "a, .., aa, .., aaa, ..." ;
-        "Yok" ;
+        <"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
diff --git a/sw/source/ui/shells/txtnum.cxx b/sw/source/ui/shells/txtnum.cxx
index 7c22e289ab7b..1441b0098675 100644
--- a/sw/source/ui/shells/txtnum.cxx
+++ b/sw/source/ui/shells/txtnum.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: txtnum.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:47 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -126,14 +126,14 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
             for(USHORT i = 0; i < aRule.GetLevelCount(); i++)
             {
                 SvxNumberFormat aFmt(aRule.GetLevel(i));
-                if(SVX_NUM_BITMAP == aFmt.GetNumType())
+                if(SVX_NUM_BITMAP == aFmt.GetNumberingType())
                 {
                     const SvxBrushItem* pBrush = aFmt.GetBrush();
                     const String* pLinkStr;
                     if(pBrush &&
                         0 != (pLinkStr = pBrush->GetGraphicLink()) &&
                             pLinkStr->Len())
-                        aFmt.SetNumType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
+                        aFmt.SetNumberingType(SvxExtNumType(SVX_NUM_BITMAP|LINK_TOKEN));
                     aRule.SetLevel(i, aFmt, aRule.Get(i) != 0);
                 }
             }
@@ -295,6 +295,9 @@ void SwTextShell::ExecEnterNum(SfxRequest &rReq)
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:47  hr
+    initial import
+
     Revision 1.45  2000/09/18 16:06:07  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/utlui/attrdesc.cxx b/sw/source/ui/utlui/attrdesc.cxx
index 1fbe6ec5df4d..e882eb637f5e 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.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-16 21:30:40 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -927,7 +927,7 @@ SfxItemPresentation SwFmtFtnEndAtTxtEnd::GetPresentation
                     {
 //  String      sPrefix;
 //  String      sSuffix;
-//  SwNumType   aFmt;
+//  SvxNumberType   aFmt;
 //  USHORT      nOffset;
 //                      rText +=
                     }
@@ -1257,6 +1257,9 @@ SfxItemPresentation SwDrawModeGrf::GetPresentation(
 /*************************************************************************
 
       $Log: not supported by cvs2svn $
+      Revision 1.3  2000/11/16 21:30:40  jp
+      SwFmt2Lines moved to SVX and renamed
+
       Revision 1.2  2000/10/23 11:58:25  jp
       new attributes Ruby and 2Lines
 
diff --git a/sw/source/ui/utlui/content.cxx b/sw/source/ui/utlui/content.cxx
index f5dc848300b3..7d8197df687e 100644
--- a/sw/source/ui/utlui/content.cxx
+++ b/sw/source/ui/utlui/content.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: content.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: os $ $Date: 2001-01-29 12:43:43 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1527,7 +1527,7 @@ sal_Bool SwContentTree::FillDragServer(sal_uInt16& nDragMode)
                 {
                     sal_uInt16 nVal = pNum->GetLevelVal()[nLevel];
                     nVal ++;
-                    nVal -= pOutlRule->Get(nLevel).GetStartValue();
+                    nVal -= pOutlRule->Get(nLevel).GetStart();
                     sEntry += String::CreateFromInt32( nVal );
                     sEntry += '.';
                 }
@@ -3194,6 +3194,9 @@ void SwContentLBoxString::Paint( const Point& rPos, SvLBox& rDev, sal_uInt16 nFl
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.4  2001/01/29 12:43:43  os
+    #339# fixed: update/rename of indexes
+
     Revision 1.3  2000/11/03 11:32:31  os
     allow editing of indexes independent from the cursor position
 
diff --git a/sw/source/ui/utlui/uitool.cxx b/sw/source/ui/utlui/uitool.cxx
index 5c40b85d48ef..0cd487dd00c3 100644
--- a/sw/source/ui/utlui/uitool.cxx
+++ b/sw/source/ui/utlui/uitool.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: uitool.cxx,v $
  *
- *  $Revision: 1.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2001-02-14 09:58:47 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -302,8 +302,8 @@ void ItemSetToPageDesc(const SfxItemSet& rSet, SwPageDesc& rPageDesc,
         if(nUse)
             rPageDesc.SetUseOn( (UseOnPage) nUse );
         rPageDesc.SetLandscape(rPageItem.IsLandscape());
-        SwNumType aNumType;
-        aNumType.eType = (SvxExtNumType)rPageItem.GetNumType();
+        SvxNumberType aNumType;
+        aNumType.SetNumberingType(rPageItem.GetNumType());
         rPageDesc.SetNumType(aNumType);
     }
     // Groesse
@@ -438,7 +438,7 @@ void PageDescToItemSet( const SwPageDesc& rPageDesc, SfxItemSet& rSet)
     aPageItem.SetDescName(rPageDesc.GetName());
     aPageItem.SetPageUsage((SvxPageUsage)rPageDesc.GetUseOn());
     aPageItem.SetLandscape(rPageDesc.GetLandscape());
-    aPageItem.SetNumType((SvxNumType)rPageDesc.GetNumType().eType);
+    aPageItem.SetNumType((SvxNumType)rPageDesc.GetNumType().GetNumberingType());
     rSet.Put(aPageItem);
 
     // Groesse
@@ -892,6 +892,9 @@ String GetAppLangDateTimeString( const DateTime& rDT )
 
 /*------------------------------------------------------------------------
     $Log: not supported by cvs2svn $
+    Revision 1.3  2001/02/14 09:58:47  jp
+    changes: international -> localdatawrapper
+
     Revision 1.2  2000/09/28 15:25:03  os
     use of configuration service in view options
 
diff --git a/sw/source/ui/wrtsh/wrtsh1.cxx b/sw/source/ui/wrtsh/wrtsh1.cxx
index 121cf6942835..e3194df18100 100644
--- a/sw/source/ui/wrtsh/wrtsh1.cxx
+++ b/sw/source/ui/wrtsh/wrtsh1.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: wrtsh1.cxx,v $
  *
- *  $Revision: 1.6 $
+ *  $Revision: 1.7 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-14 18:28:14 $
+ *  last change: $Author: os $ $Date: 2001-02-23 12:45:30 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1186,7 +1186,7 @@ void SwWrtShell::BulletOn()
         SwNumFmt aFmt( aRule.Get( n ) );
         aFmt.SetBulletFont( pFnt );
         aFmt.SetBulletChar( cBulletChar );
-        aFmt.eType = SVX_NUM_CHAR_SPECIAL;
+        aFmt.SetNumberingType(SVX_NUM_CHAR_SPECIAL);
         aFmt.SetCharFmt( pChrFmt );
         if(bHtml && n)
         {
@@ -1574,6 +1574,9 @@ void SwWrtShell::NewCoreSelection()
 /*************************************************************************
 
    $Log: not supported by cvs2svn $
+   Revision 1.6  2000/11/14 18:28:14  jp
+   use moduleoptions
+
    Revision 1.5  2000/10/27 14:29:47  os
    sba includes removed