new Field/-Type: combined character

12 files changed, 248 insertions, 65 deletions

diff --git a/sw/inc/docufld.hxx b/sw/inc/docufld.hxx
index 516ebb23a923..a6520f80e036 100644
--- a/sw/inc/docufld.hxx
+++ b/sw/inc/docufld.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docufld.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:05:08 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -225,9 +225,8 @@ public:
 
 class SwAuthorFieldType : public SwFieldType
 {
-    SwDoc *pDoc;
 public:
-    SwAuthorFieldType(SwDoc*);
+    SwAuthorFieldType();
 
     String                  Expand(ULONG) const;
     virtual SwFieldType*    Copy() const;
@@ -769,7 +768,7 @@ public:
 };
 
 /*--------------------------------------------------------------------
-    Beschreibung: PostIts
+    Beschreibung: Script Fieldtype
  --------------------------------------------------------------------*/
 
 class SwScriptFieldType : public SwFieldType
@@ -782,7 +781,7 @@ public:
 };
 
 /*--------------------------------------------------------------------
-    Beschreibung: PostIt
+    Beschreibung: Script Field
  --------------------------------------------------------------------*/
 
 class SwScriptField : public SwField
@@ -814,5 +813,43 @@ public:
     virtual BOOL        PutValue( const com::sun::star::uno::Any& rVal, const String& rProperty );
 };
 
+/*--------------------------------------------------------------------
+    Beschreibung: Combined Character Fieldtype
+ --------------------------------------------------------------------*/
+
+class SwCombinedCharFieldType : public SwFieldType
+{
+public:
+    SwCombinedCharFieldType();
+
+    virtual SwFieldType*    Copy() const;
+};
+
+/*--------------------------------------------------------------------
+    Beschreibung: Script Field
+ --------------------------------------------------------------------*/
+
+#define MAX_COMBINED_CHARACTERS     6
+
+class SwCombinedCharField : public SwField
+{
+    String  sCharacters;    // combine these characters
+
+public:
+    SwCombinedCharField( SwCombinedCharFieldType*, const String& rChars );
+
+    virtual String          Expand() const;
+    virtual SwField*        Copy() const;
+
+    // Characters
+    virtual const String&   GetPar1() const;
+    virtual void            SetPar1(const String& rStr);
+
+    virtual BOOL            QueryValue( com::sun::star::uno::Any& rVal,
+                                        const String& rProperty ) const;
+    virtual BOOL            PutValue( const com::sun::star::uno::Any& rVal,
+                                        const String& rProperty );
+};
+
 
 #endif // _DOCUFLD_HXX
diff --git a/sw/inc/fldbas.hxx b/sw/inc/fldbas.hxx
index a60f82c18798..1bf19a221d47 100644
--- a/sw/inc/fldbas.hxx
+++ b/sw/inc/fldbas.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldbas.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:25 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:05:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -72,7 +72,9 @@
 #ifndef _STRING_HXX //autogen
 #include <tools/string.hxx>
 #endif
-#include "calbck.hxx"
+#ifndef _CALBCK_HXX
+#include <calbck.hxx>
+#endif
 
 #ifndef _COM_SUN_STAR_UNO_ANY_HXX_
 #include <com/sun/star/uno/Any.hxx>
@@ -84,7 +86,6 @@ class Time;
 class _SetGetExpFlds;
 class SwEditShell;
 class SvStringsDtor;
-namespace com{namespace star { namespace sun {namespace uno{ class Any;}}}}
 class SvNumberFormatter;
 
 #endif      // FIELDIDS_ONLY
@@ -135,6 +136,7 @@ enum RES_FIELDS
     RES_SCRIPTFLD,
     RES_DATETIMEFLD,
     RES_AUTHORITY,  //Table of authorities
+    RES_COMBINED_CHARS,
     RES_FIELDS_END
 };
 
@@ -186,6 +188,7 @@ enum SwFldTypesEnum
     TYP_JUMPEDITFLD,
     TYP_SCRIPTFLD,              // 40
     TYP_AUTHORITY,
+    TYP_COMBINED_CHARS,
     TYP_END
 };
 
diff --git a/sw/inc/swtypes.hxx b/sw/inc/swtypes.hxx
index ec2e618f2a25..576fdd56e7fa 100644
--- a/sw/inc/swtypes.hxx
+++ b/sw/inc/swtypes.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: swtypes.hxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:16:31 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:05:09 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -193,7 +193,7 @@ enum SwGetPoolIdFromName
 };
 
 // Anzahl der SystemField-Types vom SwDoc
-#define INIT_FLDTYPES   30
+#define INIT_FLDTYPES   31
 // Anzahl der vordefinierten Seq-Feldtypen. Es handelt sich dabei
 // immer um die letzen Felder vor INIT_FLDTYPES
 #define INIT_SEQ_FLDTYPES   4
diff --git a/sw/source/core/doc/docfld.cxx b/sw/source/core/doc/docfld.cxx
index 893659df6a8b..ae2b3c141bc8 100644
--- a/sw/source/core/doc/docfld.cxx
+++ b/sw/source/core/doc/docfld.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: docfld.cxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: os $ $Date: 2000-10-27 11:23:48 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:08:36 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1625,7 +1625,7 @@ void SwDoc::_InitFieldTypes()       // wird vom CTOR gerufen!!
     pFldTypes->Insert( new SwDateTimeFieldType(this), nFldType++ );
     pFldTypes->Insert( new SwChapterFieldType, nFldType++ );
     pFldTypes->Insert( new SwPageNumberFieldType, nFldType++ );
-    pFldTypes->Insert( new SwAuthorFieldType(this),nFldType++ );
+    pFldTypes->Insert( new SwAuthorFieldType, nFldType++ );
     pFldTypes->Insert( new SwFileNameFieldType(this), nFldType++ );
     pFldTypes->Insert( new SwDBNameFieldType(this), nFldType++);
     pFldTypes->Insert( new SwGetExpFieldType(this), nFldType++ );
@@ -1648,6 +1648,7 @@ void SwDoc::_InitFieldTypes()       // wird vom CTOR gerufen!!
     pFldTypes->Insert( new SwRefPageGetFieldType( this ), nFldType++ );
     pFldTypes->Insert( new SwJumpEditFieldType( this ), nFldType++ );
     pFldTypes->Insert( new SwScriptFieldType( this ), nFldType++ );
+    pFldTypes->Insert( new SwCombinedCharFieldType, nFldType++ );
 
     // Types muessen am Ende stehen !!
     // Im InsertFldType wird davon ausgegangen !!!!
diff --git a/sw/source/core/fields/docufld.cxx b/sw/source/core/fields/docufld.cxx
index 0a21c8b3e722..93f9776021c3 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.8 $
+ *  $Revision: 1.9 $
  *
- *  last change: $Author: os $ $Date: 2000-11-22 16:49:00 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:07:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -449,10 +449,9 @@ BOOL SwPageNumberField::PutValue( const uno::Any& rAny, const String& rProperty
     Beschreibung: SwAuthorFieldType
  --------------------------------------------------------------------*/
 
-SwAuthorFieldType::SwAuthorFieldType(SwDoc* pDocument)
+SwAuthorFieldType::SwAuthorFieldType()
     : SwFieldType( RES_AUTHORFLD )
 {
-    pDoc = pDocument;
 }
 
 String SwAuthorFieldType::Expand(sal_uInt32 nFmt) const
@@ -468,8 +467,7 @@ String SwAuthorFieldType::Expand(sal_uInt32 nFmt) const
 
 SwFieldType* SwAuthorFieldType::Copy() const
 {
-    SwAuthorFieldType *pTmp = new SwAuthorFieldType(pDoc);
-    return pTmp;
+    return new SwAuthorFieldType;
 }
 
 /*--------------------------------------------------------------------
@@ -485,16 +483,17 @@ SwAuthorField::SwAuthorField(SwAuthorFieldType* pTyp, sal_uInt32 nFmt)
 String SwAuthorField::Expand() const
 {
     if (!IsFixed())
-        ((SwAuthorField*)this)->aContent = ((SwAuthorFieldType*)GetTyp())->Expand(GetFormat());
+        ((SwAuthorField*)this)->aContent =
+                    ((SwAuthorFieldType*)GetTyp())->Expand(GetFormat());
 
     return aContent;
 }
 
 SwField* SwAuthorField::Copy() const
 {
-    SwAuthorField *pTmp = new SwAuthorField((SwAuthorFieldType*)GetTyp(), GetFormat());
+    SwAuthorField *pTmp = new SwAuthorField( (SwAuthorFieldType*)GetTyp(),
+                                                GetFormat());
     pTmp->SetExpansion(aContent);
-
     return pTmp;
 }
 
@@ -891,10 +890,12 @@ String SwDocStatFieldType::Expand(sal_uInt16 nSubType, sal_uInt32 nFmt) const
             ASSERT( sal_False, "SwDocStatFieldType::Expand: unbekannter SubType" );
     }
 
+    String sRet;
     if( nVal <= SHRT_MAX )
-        return FormatNumber( (sal_uInt16)nVal, nFmt );
-
-    return nVal;
+        sRet = FormatNumber( (sal_uInt16)nVal, nFmt );
+    else
+        sRet = String::CreateFromInt32( nVal );
+    return sRet;
 }
 
 SwFieldType* SwDocStatFieldType::Copy() const
@@ -2015,14 +2016,14 @@ SwField* SwRefPageSetField::Copy() const
  ---------------------------------------------------------------------------*/
 String SwRefPageSetField::GetPar2() const
 {
-    return String::CreateFromInt32(GetOffset());
+    return String::CreateFromInt32( GetOffset() );
 }
 /* ---------------------------------------------------------------------------
 
  ---------------------------------------------------------------------------*/
 void SwRefPageSetField::SetPar2(const String& rStr)
 {
-    SetOffset(rStr.ToInt32());
+    SetOffset( (short) rStr.ToInt32() );
 }
 
 /*-----------------05.03.98 14:52-------------------
@@ -2473,3 +2474,79 @@ BOOL SwJumpEditField::PutValue( const uno::Any& rAny, const String& rProperty )
 #endif
     return sal_True;
 }
+
+
+/*--------------------------------------------------------------------
+    Beschreibung: Combined Character Fieldtype / Field
+ --------------------------------------------------------------------*/
+
+SwCombinedCharFieldType::SwCombinedCharFieldType()
+    : SwFieldType( RES_COMBINED_CHARS )
+{
+}
+
+SwFieldType* SwCombinedCharFieldType::Copy() const
+{
+    return new SwCombinedCharFieldType;
+}
+
+/* --------------------------------------------------------------------*/
+
+SwCombinedCharField::SwCombinedCharField( SwCombinedCharFieldType* pFTyp,
+                                            const String& rChars )
+    : SwField( pFTyp, 0 ),
+    sCharacters( rChars.Copy( 0, MAX_COMBINED_CHARACTERS ))
+{
+}
+
+String  SwCombinedCharField::Expand() const
+{
+    return sCharacters;
+}
+
+SwField* SwCombinedCharField::Copy() const
+{
+    return new SwCombinedCharField( (SwCombinedCharFieldType*)GetTyp(),
+                                        sCharacters );
+}
+
+const String& SwCombinedCharField::GetPar1() const
+{
+    return sCharacters;
+}
+
+void SwCombinedCharField::SetPar1(const String& rStr)
+{
+    sCharacters = rStr.Copy( 0, MAX_COMBINED_CHARACTERS );
+}
+
+BOOL SwCombinedCharField::QueryValue( com::sun::star::uno::Any& rAny,
+                                        const String& rProperty ) const
+{
+    if( rProperty.EqualsAscii( UNO_NAME_CONTENT ) ||
+        rProperty.EqualsAscii( UNO_NAME_CURRENT_PRESENTATION ))
+        rAny <<= rtl::OUString( sCharacters );
+#ifdef DBG_UTIL
+    else
+        DBG_ERROR("Welches Property?")
+#endif
+    return sal_True;
+}
+
+BOOL SwCombinedCharField::PutValue( const com::sun::star::uno::Any& rAny,
+                                        const String& rProperty )
+{
+    if( rProperty.EqualsAscii(UNO_NAME_CONTENT) ||
+        rProperty.EqualsAscii(UNO_NAME_CURRENT_PRESENTATION))
+    {
+        OUString uTmp;
+        rAny >>= uTmp;
+        sCharacters = String( uTmp );
+    }
+#ifdef DBG_UTIL
+    else
+        DBG_ERROR("Welches Property?")
+#endif
+    return sal_True;
+}
+
diff --git a/sw/source/core/fields/fldbas.cxx b/sw/source/core/fields/fldbas.cxx
index 84d4f9bec99f..07baa06c7694 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.3 $
+ *  $Revision: 1.4 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-21 14:23:59 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:07:16 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -204,7 +204,8 @@ DBG_NAME(SwFieldType);
     /* RES_JUMPEDITFLD      */      TYP_JUMPEDITFLD,
     /* RES_SCRIPTFLD        */      TYP_SCRIPTFLD,
     /* RES_DATETIMEFLD      */      0,                  // dynamisch
-    /* RES_AUTHORITY        */      TYP_AUTHORITY
+    /* RES_AUTHORITY        */      TYP_AUTHORITY,
+    /* RES_COMBINED_CHARS   */      TYP_COMBINED_CHARS
     };
         // ????? TYP_USRINPFLD,
 
@@ -333,7 +334,8 @@ USHORT SwField::GetResId(USHORT nTypeId, BOOL& bAmbigous)
      RES_INTERNETFLD   ,/*      TYP_INTERNETFLD     */
      RES_JUMPEDITFLD   ,/*      TYP_JUMPEDITFLD     */
      RES_SCRIPTFLD,     /*      TYP_SCRIPTFLD       */
-     RES_AUTHORITY      /*      TYP_AUTHORITY       */
+     RES_AUTHORITY,     /*      TYP_AUTHORITY       */
+     RES_COMBINED_CHARS /*      TYP_COMBINED_CHARS  */
     };
 
     switch( nTypeId )
diff --git a/sw/source/core/text/txtfld.cxx b/sw/source/core/text/txtfld.cxx
index 0ee812b7aa37..f0bbae93cbc1 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.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: ama $ $Date: 2000-12-06 15:26:23 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:07:46 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -153,24 +153,24 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
     {
         case RES_SCRIPTFLD:
         case RES_POSTITFLD:
-        {
             pRet = new SwPostItsPortion( RES_SCRIPTFLD == pFld->GetTyp()->Which() );
             break;
-        }
+
+        case RES_COMBINED_CHARS:
+            {
+                String sStr( pFld->GetCntnt( bName ));
+                if( bName )
+                    pRet = new SwFldPortion( sStr );
+                else
+                    pRet = new SwCombinedPortion( sStr );
+            }
+            break;
+
         case RES_HIDDENTXTFLD:
-        {
-#ifdef OWN_YOUR_OWN_RISK
-            if( bName )
-                pRet = new SwFldPortion(pFld->GetCntnt( TRUE ));
-            else
-                pRet = new SwCombinedPortion(pFld->GetCntnt( FALSE ));
-#else
             pRet = new SwHiddenPortion(pFld->GetCntnt( bName ));
-#endif
             break;
-        }
+
         case RES_CHAPTERFLD:
-        {
             if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
             {
                 ((SwChapterField*)pFld)->ChangeExpansion( pFrame,
@@ -178,7 +178,6 @@ SwExpandPortion *SwTxtFormatter::NewFldPortion( SwTxtFormatInfo &rInf,
             }
             pRet = new SwFldPortion( pFld->GetCntnt( bName ) );
             break;
-        }
 
         case RES_DOCSTATFLD:
             if( !bName && pSh && !pSh->Imp()->IsUpdateExpFlds() )
diff --git a/sw/source/ui/fldui/fldfunc.cxx b/sw/source/ui/fldui/fldfunc.cxx
index 06bea4663cda..047d87efbc1a 100644
--- a/sw/source/ui/fldui/fldfunc.cxx
+++ b/sw/source/ui/fldui/fldfunc.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldfunc.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:01:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -149,6 +149,8 @@ SwFldFuncPage::SwFldFuncPage(Window* pParent, const SfxItemSet& rCoreSet ) :
 
     aNameED.SetPosPixel(Point(aNameED.GetPosPixel().X(), aFormatLB.GetPosPixel().Y()));
 
+    aNameED.SetModifyHdl(LINK(this, SwFldFuncPage, ModifyHdl));
+
     sOldValueFT = aValueFT.GetText();
     sOldNameFT = aNameFT.GetText();
 
@@ -438,6 +440,18 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, pBox )
                 // bShowSelection = TRUE;
                 break;
 
+            case TYP_COMBINED_CHARS:
+                {
+                    aNameFT.SetText(SW_RESSTR(STR_COMBCHRS_FT));
+                    aNameED.EnableDrop(TRUE);
+                    bName = TRUE;
+
+                    const USHORT nLen = aNameED.GetText().Len();
+                    if( !nLen || nLen > MAX_COMBINED_CHARACTERS )
+                        bInsert = FALSE;
+                }
+                break;
+
             default:
                 break;
         }
@@ -465,7 +479,7 @@ IMPL_LINK( SwFldFuncPage, TypeHdl, ListBox *, pBox )
         aValueED.Enable(bValue);
         aMacroBT.Enable(bMacro);
 
-        EnableInsert(bInsert);
+        EnableInsert( bInsert );
     }
 
     return 0;
@@ -479,8 +493,8 @@ IMPL_LINK( SwFldFuncPage, SelectHdl, ListBox *, pBox )
 {
     USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
 
-    if (nTypeId == TYP_MACROFLD)
-        aNameED.SetText(aSelectionLB.GetSelectEntry());
+    if( TYP_MACROFLD == nTypeId )
+        aNameED.SetText( aSelectionLB.GetSelectEntry() );
 
     return 0;
 }
@@ -616,6 +630,8 @@ BOOL __EXPORT SwFldFuncPage::FillItemSet(SfxItemSet& rSet)
         InsertFld( nTypeId, nSubType, aName, aVal, nFormat );
     }
 
+    ModifyHdl();    // Insert ggf enablen/disablen
+
     return FALSE;
 }
 
@@ -683,9 +699,31 @@ void    SwFldFuncPage::FillUserData()
     sData += String::CreateFromInt32( nTypeSel );
     SetUserData(sData);
 }
+
+IMPL_LINK( SwFldFuncPage, ModifyHdl, Edit *, EMPTYARG )
+{
+    String aName(aNameED.GetText());
+    const USHORT nLen = aName.Len();
+
+    BOOL bEnable = TRUE;
+    USHORT nTypeId = (USHORT)(ULONG)aTypeLB.GetEntryData(GetTypeSel());
+
+    if( TYP_COMBINED_CHARS == nTypeId &&
+        (!nLen || nLen > MAX_COMBINED_CHARACTERS ))
+        bEnable = FALSE;
+
+    EnableInsert( bEnable );
+
+    return 0;
+}
+
+
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:36  hr
+    initial import
+
     Revision 1.28  2000/09/18 16:05:28  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/fldui/fldfunc.hxx b/sw/source/ui/fldui/fldfunc.hxx
index 6eba1598d219..db1346cba7f8 100644
--- a/sw/source/ui/fldui/fldfunc.hxx
+++ b/sw/source/ui/fldui/fldfunc.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldfunc.hxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:01:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -113,6 +113,7 @@ class SwFldFuncPage : public SwFldPage
     DECL_LINK( TypeHdl, ListBox* pLB = 0 );
     DECL_LINK( SelectHdl, ListBox* pLB = 0 );
     DECL_LINK( InsertMacroHdl, ListBox* pLB = 0 );
+    DECL_LINK( ModifyHdl, Edit *pEd = 0 );
 
     // Macro ausw�hlen
     DECL_LINK( MacroHdl, Button * );
diff --git a/sw/source/ui/fldui/fldmgr.cxx b/sw/source/ui/fldui/fldmgr.cxx
index 3b8ff94a406c..736a8be783a9 100644
--- a/sw/source/ui/fldui/fldmgr.cxx
+++ b/sw/source/ui/fldui/fldmgr.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldmgr.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: jp $ $Date: 2000-11-20 09:06:40 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:01:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -245,7 +245,7 @@ enum
     GRP_DOC_END     =  GRP_DOC_BEGIN + 11,
 
     GRP_FKT_BEGIN   =  GRP_DOC_END,
-    GRP_FKT_END     =  GRP_FKT_BEGIN + 6,
+    GRP_FKT_END     =  GRP_FKT_BEGIN + 7,
 
     GRP_REF_BEGIN   =  GRP_FKT_END,
     GRP_REF_END     =  GRP_REF_BEGIN + 2,
@@ -356,6 +356,7 @@ static const SwFldPack __FAR_DATA aSwFlds[] =
     TYP_INPUTFLD,       FLD_INPUT_BEGIN,    FLD_INPUT_END,  0,                  0,
     TYP_MACROFLD,       0,                  0,              0,                  0,
     TYP_JUMPEDITFLD,    0,                  0,              FMT_MARK_BEGIN,     FMT_MARK_END,
+    TYP_COMBINED_CHARS,  0,                 0,              0,                  0,
     TYP_HIDDENTXTFLD,   0,                  0,              0,                  0,
     TYP_HIDDENPARAFLD,  0,                  0,              0,                  0,
 
@@ -1007,6 +1008,13 @@ BOOL SwFldMgr::InsertFld(USHORT         nType,
             pFld = new SwScriptField(pType, rPar1, rPar2, (BOOL)nFormat);
             break;
         }
+        case TYP_COMBINED_CHARS:
+        {
+            SwCombinedCharFieldType* pType = (SwCombinedCharFieldType*)
+                                pSh->GetFldType( 0, RES_COMBINED_CHARS );
+            pFld = new SwCombinedCharField( pType, rPar1 );
+        }
+        break;
         case TYP_AUTHORITY:
         {
             SwAuthorityFieldType* pType =
@@ -1844,7 +1852,8 @@ void SwFieldType::_GetFldName()
         STR_INTERNETFLD,
         STR_JUMPEDITFLD,
         STR_SCRIPTFLD,
-        STR_AUTHORITY
+        STR_AUTHORITY,
+        STR_COMBINED_CHARS
     };
 
     // Infos fuer Felder einfuegen
diff --git a/sw/source/ui/fldui/fldtdlg.cxx b/sw/source/ui/fldui/fldtdlg.cxx
index 1fbf87548f46..9264f8a3b10f 100644
--- a/sw/source/ui/fldui/fldtdlg.cxx
+++ b/sw/source/ui/fldui/fldtdlg.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldtdlg.cxx,v $
  *
- *  $Revision: 1.1.1.1 $
+ *  $Revision: 1.2 $
  *
- *  last change: $Author: hr $ $Date: 2000-09-18 17:14:36 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:01:38 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -451,8 +451,10 @@ void SwFldDlg::Activate()
     ReInitTabPage(TP_FLD_VAR);
 
     if (!bHtmlMode)
+    {
         ReInitTabPage(TP_FLD_REF);
-
+        ReInitTabPage(TP_FLD_FUNC);
+    }
 }
 
 /*--------------------------------------------------------------------
@@ -482,6 +484,9 @@ void SwFldDlg::InsertHdl()
 /*------------------------------------------------------------------------
 
     $Log: not supported by cvs2svn $
+    Revision 1.1.1.1  2000/09/18 17:14:36  hr
+    initial import
+
     Revision 1.26  2000/09/18 16:05:29  willem.vandorp
     OpenOffice header added.
 
diff --git a/sw/source/ui/fldui/fldui.src b/sw/source/ui/fldui/fldui.src
index 9867470fedb0..62c8234c1e70 100644
--- a/sw/source/ui/fldui/fldui.src
+++ b/sw/source/ui/fldui/fldui.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: fldui.src,v $
  *
- *  $Revision: 1.11 $
+ *  $Revision: 1.12 $
  *
- *  last change: $Author: kz $ $Date: 2001-01-12 22:29:29 $
+ *  last change: $Author: jp $ $Date: 2001-01-18 14:04:12 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -715,6 +715,12 @@ String STR_JUMPEDITFLD
     Text[ turkish ] = "Genel arama  karakteri";
     Text[ language_user1 ] = " ";
 };
+String STR_COMBINED_CHARS
+{
+    TEXT = "Zeichen kombinieren" ;
+    TEXT [ English ] = "Combine characters" ;
+};
+
  //
  // Bereich Referenzen
  //
@@ -3160,6 +3166,11 @@ String STR_PROMPT
     TEXT[ turkish ] = "Bilgi";
     TEXT[ language_user1 ] = " ";
 };
+String STR_COMBCHRS_FT
+{
+    TEXT = "Ze~ichen" ;
+    TEXT [ English ] = "Ch~aracters" ;
+};
 String STR_SETNO
 {
     TEXT = "Satznummer" ;