#92082# Add additional controls to the dialog editor

11 files changed, 337 insertions, 57 deletions

diff --git a/basctl/source/basicide/baside3.cxx b/basctl/source/basicide/baside3.cxx
index b7cc41e6dcd5..ea13cea11679 100644
--- a/basctl/source/basicide/baside3.cxx
+++ b/basctl/source/basicide/baside3.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: baside3.cxx,v $
  *
- *  $Revision: 1.15 $
+ *  $Revision: 1.16 $
  *
- *  last change: $Author: tbe $ $Date: 2001-09-06 09:17:41 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -328,21 +328,28 @@ void __EXPORT DialogWindow::GetState( SfxItemSet& rSet )
                     USHORT nObj;
                     switch( pEditor->GetInsertObj() )
                     {
-                        case OBJ_DLG_PUSHBUTTON:    nObj = SVX_SNAP_PUSHBUTTON; break;
-                        case OBJ_DLG_RADIOBUTTON:   nObj = SVX_SNAP_RADIOBUTTON; break;
-                        case OBJ_DLG_CHECKBOX:      nObj = SVX_SNAP_CHECKBOX; break;
-                        case OBJ_DLG_LISTBOX:       nObj = SVX_SNAP_LISTBOX; break;
-                        case OBJ_DLG_COMBOBOX:      nObj = SVX_SNAP_COMBOBOX; break;
-                        case OBJ_DLG_GROUPBOX:      nObj = SVX_SNAP_GROUPBOX; break;
-                        case OBJ_DLG_EDIT:          nObj = SVX_SNAP_EDIT; break;
-                        case OBJ_DLG_FIXEDTEXT:     nObj = SVX_SNAP_FIXEDTEXT; break;
-                        case OBJ_DLG_IMAGECONTROL:  nObj = SVX_SNAP_IMAGECONTROL; break;
-                        case OBJ_DLG_PROGRESSBAR:   nObj = SVX_SNAP_PROGRESSBAR; break;
-                        case OBJ_DLG_HSCROLLBAR:    nObj = SVX_SNAP_HSCROLLBAR; break;
-                        case OBJ_DLG_VSCROLLBAR:    nObj = SVX_SNAP_VSCROLLBAR; break;
-                        case OBJ_DLG_HFIXEDLINE:    nObj = SVX_SNAP_HFIXEDLINE; break;
-                        case OBJ_DLG_VFIXEDLINE:    nObj = SVX_SNAP_VFIXEDLINE; break;
-                        default:                    nObj = 0;
+                        case OBJ_DLG_PUSHBUTTON:        nObj = SVX_SNAP_PUSHBUTTON; break;
+                        case OBJ_DLG_RADIOBUTTON:       nObj = SVX_SNAP_RADIOBUTTON; break;
+                        case OBJ_DLG_CHECKBOX:          nObj = SVX_SNAP_CHECKBOX; break;
+                        case OBJ_DLG_LISTBOX:           nObj = SVX_SNAP_LISTBOX; break;
+                        case OBJ_DLG_COMBOBOX:          nObj = SVX_SNAP_COMBOBOX; break;
+                        case OBJ_DLG_GROUPBOX:          nObj = SVX_SNAP_GROUPBOX; break;
+                        case OBJ_DLG_EDIT:              nObj = SVX_SNAP_EDIT; break;
+                        case OBJ_DLG_FIXEDTEXT:         nObj = SVX_SNAP_FIXEDTEXT; break;
+                        case OBJ_DLG_IMAGECONTROL:      nObj = SVX_SNAP_IMAGECONTROL; break;
+                        case OBJ_DLG_PROGRESSBAR:       nObj = SVX_SNAP_PROGRESSBAR; break;
+                        case OBJ_DLG_HSCROLLBAR:        nObj = SVX_SNAP_HSCROLLBAR; break;
+                        case OBJ_DLG_VSCROLLBAR:        nObj = SVX_SNAP_VSCROLLBAR; break;
+                        case OBJ_DLG_HFIXEDLINE:        nObj = SVX_SNAP_HFIXEDLINE; break;
+                        case OBJ_DLG_VFIXEDLINE:        nObj = SVX_SNAP_VFIXEDLINE; break;
+                        case OBJ_DLG_DATEFIELD:         nObj = SVX_SNAP_DATEFIELD; break;
+                        case OBJ_DLG_TIMEFIELD:         nObj = SVX_SNAP_TIMEFIELD; break;
+                        case OBJ_DLG_NUMERICFIELD:      nObj = SVX_SNAP_NUMERICFIELD; break;
+                        case OBJ_DLG_CURRENCYFIELD:     nObj = SVX_SNAP_CURRENCYFIELD; break;
+                        case OBJ_DLG_FORMATTEDFIELD:    nObj = SVX_SNAP_FORMATTEDFIELD; break;
+                        case OBJ_DLG_PATTERNFIELD:      nObj = SVX_SNAP_PATTERNFIELD; break;
+                        case OBJ_DLG_FILECONTROL:       nObj = SVX_SNAP_FILECONTROL; break;
+                        default:                        nObj = 0;
                     }
 #ifdef DBG_UTIL
                     if( !nObj )
@@ -476,6 +483,48 @@ void __EXPORT DialogWindow::ExecuteCommand( SfxRequest& rReq )
                     GetEditor()->SetInsertObj( OBJ_DLG_VFIXEDLINE );
                 }
                 break;
+                case SVX_SNAP_DATEFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_DATEFIELD );
+                }
+                break;
+                case SVX_SNAP_TIMEFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_TIMEFIELD );
+                }
+                break;
+                case SVX_SNAP_NUMERICFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_NUMERICFIELD );
+                }
+                break;
+                case SVX_SNAP_CURRENCYFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_CURRENCYFIELD );
+                }
+                break;
+                case SVX_SNAP_FORMATTEDFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_FORMATTEDFIELD );
+                }
+                break;
+                case SVX_SNAP_PATTERNFIELD:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_PATTERNFIELD );
+                }
+                break;
+                case SVX_SNAP_FILECONTROL:
+                {
+                    GetEditor()->SetMode( DLGED_INSERT );
+                    GetEditor()->SetInsertObj( OBJ_DLG_FILECONTROL );
+                }
+                break;
                 case SVX_SNAP_SELECT:
                 {
                     GetEditor()->SetMode( DLGED_SELECT );
diff --git a/basctl/source/basicide/basidesh.src b/basctl/source/basicide/basidesh.src
index 7c6ba7163ada..6412d3915a94 100644
--- a/basctl/source/basicide/basidesh.src
+++ b/basctl/source/basicide/basidesh.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: basidesh.src,v $
  *
- *  $Revision: 1.36 $
+ *  $Revision: 1.37 $
  *
- *  last change: $Author: kz $ $Date: 2001-08-29 20:28:32 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:28 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -1808,6 +1808,13 @@ ImageList RID_DEFAULTIMAGELIST_SC
         SID_INSERT_PROGRESSBAR ;
         SID_INSERT_HFIXEDLINE ;
         SID_INSERT_VFIXEDLINE ;
+        SID_INSERT_DATEFIELD ;
+        SID_INSERT_TIMEFIELD ;
+        SID_INSERT_NUMERICFIELD ;
+        SID_INSERT_CURRENCYFIELD ;
+        SID_INSERT_FORMATTEDFIELD ;
+        SID_INSERT_PATTERNFIELD ;
+        SID_INSERT_FILECONTROL ;
     };
 };
 ImageList RID_DEFAULTIMAGELIST_LC
@@ -1855,6 +1862,13 @@ ImageList RID_DEFAULTIMAGELIST_LC
         SID_INSERT_PROGRESSBAR ;
         SID_INSERT_HFIXEDLINE ;
         SID_INSERT_VFIXEDLINE ;
+        SID_INSERT_DATEFIELD ;
+        SID_INSERT_TIMEFIELD ;
+        SID_INSERT_NUMERICFIELD ;
+        SID_INSERT_CURRENCYFIELD ;
+        SID_INSERT_FORMATTEDFIELD ;
+        SID_INSERT_PATTERNFIELD ;
+        SID_INSERT_FILECONTROL ;
     };
 };
 ToolBox RID_BASICIDE_OBJECTBAR
diff --git a/basctl/source/basicide/idetemp.hxx b/basctl/source/basicide/idetemp.hxx
index 03ab57ca3540..6f502579dbea 100644
--- a/basctl/source/basicide/idetemp.hxx
+++ b/basctl/source/basicide/idetemp.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: idetemp.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tbe $ $Date: 2001-05-14 08:44:05 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,7 +82,14 @@ enum SvxChooseControlEnum
     SVX_SNAP_IMAGECONTROL,
     SVX_SNAP_PROGRESSBAR,
     SVX_SNAP_HFIXEDLINE,
-    SVX_SNAP_VFIXEDLINE
+    SVX_SNAP_VFIXEDLINE,
+    SVX_SNAP_DATEFIELD,
+    SVX_SNAP_TIMEFIELD,
+    SVX_SNAP_NUMERICFIELD,
+    SVX_SNAP_CURRENCYFIELD,
+    SVX_SNAP_FORMATTEDFIELD,
+    SVX_SNAP_PATTERNFIELD,
+    SVX_SNAP_FILECONTROL
 };
 
 #define SvxChooseControlItem SfxAllEnumItem
diff --git a/basctl/source/basicide/tbxctl.cxx b/basctl/source/basicide/tbxctl.cxx
index e471c33be150..b8242a3bec7c 100644
--- a/basctl/source/basicide/tbxctl.cxx
+++ b/basctl/source/basicide/tbxctl.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxctl.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: tbe $ $Date: 2001-09-06 12:48:14 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -171,23 +171,30 @@ void TbxControls::StateChanged( USHORT nSID, SfxItemState eState,
             USHORT nTemp = 0;
             switch( nLastEnum )
             {
-                case SVX_SNAP_PUSHBUTTON:   nTemp = SID_INSERT_PUSHBUTTON; break;
-                case SVX_SNAP_CHECKBOX:     nTemp = SID_INSERT_CHECKBOX; break;
-                case SVX_SNAP_RADIOBUTTON:  nTemp = SID_INSERT_RADIOBUTTON; break;
-                case SVX_SNAP_SPINBUTTON:   nTemp = SID_INSERT_SPINBUTTON; break;
-                case SVX_SNAP_FIXEDTEXT:    nTemp = SID_INSERT_FIXEDTEXT; break;
-                case SVX_SNAP_GROUPBOX:     nTemp = SID_INSERT_GROUPBOX; break;
-                case SVX_SNAP_LISTBOX:      nTemp = SID_INSERT_LISTBOX; break;
-                case SVX_SNAP_COMBOBOX:     nTemp = SID_INSERT_COMBOBOX; break;
-                case SVX_SNAP_EDIT:         nTemp = SID_INSERT_EDIT; break;
-                case SVX_SNAP_HSCROLLBAR:   nTemp = SID_INSERT_HSCROLLBAR; break;
-                case SVX_SNAP_VSCROLLBAR:   nTemp = SID_INSERT_VSCROLLBAR; break;
-                case SVX_SNAP_PREVIEW:      nTemp = SID_INSERT_PREVIEW; break;
-                case SVX_SNAP_URLBUTTON:    nTemp = SID_INSERT_URLBUTTON; break;
-                case SVX_SNAP_IMAGECONTROL: nTemp = SID_INSERT_IMAGECONTROL; break;
-                case SVX_SNAP_PROGRESSBAR:  nTemp = SID_INSERT_PROGRESSBAR; break;
-                case SVX_SNAP_HFIXEDLINE:   nTemp = SID_INSERT_HFIXEDLINE; break;
-                case SVX_SNAP_VFIXEDLINE:   nTemp = SID_INSERT_VFIXEDLINE; break;
+                case SVX_SNAP_PUSHBUTTON:       nTemp = SID_INSERT_PUSHBUTTON; break;
+                case SVX_SNAP_CHECKBOX:         nTemp = SID_INSERT_CHECKBOX; break;
+                case SVX_SNAP_RADIOBUTTON:      nTemp = SID_INSERT_RADIOBUTTON; break;
+                case SVX_SNAP_SPINBUTTON:       nTemp = SID_INSERT_SPINBUTTON; break;
+                case SVX_SNAP_FIXEDTEXT:        nTemp = SID_INSERT_FIXEDTEXT; break;
+                case SVX_SNAP_GROUPBOX:         nTemp = SID_INSERT_GROUPBOX; break;
+                case SVX_SNAP_LISTBOX:          nTemp = SID_INSERT_LISTBOX; break;
+                case SVX_SNAP_COMBOBOX:         nTemp = SID_INSERT_COMBOBOX; break;
+                case SVX_SNAP_EDIT:             nTemp = SID_INSERT_EDIT; break;
+                case SVX_SNAP_HSCROLLBAR:       nTemp = SID_INSERT_HSCROLLBAR; break;
+                case SVX_SNAP_VSCROLLBAR:       nTemp = SID_INSERT_VSCROLLBAR; break;
+                case SVX_SNAP_PREVIEW:          nTemp = SID_INSERT_PREVIEW; break;
+                case SVX_SNAP_URLBUTTON:        nTemp = SID_INSERT_URLBUTTON; break;
+                case SVX_SNAP_IMAGECONTROL:     nTemp = SID_INSERT_IMAGECONTROL; break;
+                case SVX_SNAP_PROGRESSBAR:      nTemp = SID_INSERT_PROGRESSBAR; break;
+                case SVX_SNAP_HFIXEDLINE:       nTemp = SID_INSERT_HFIXEDLINE; break;
+                case SVX_SNAP_VFIXEDLINE:       nTemp = SID_INSERT_VFIXEDLINE; break;
+                case SVX_SNAP_DATEFIELD:        nTemp = SID_INSERT_DATEFIELD; break;
+                case SVX_SNAP_TIMEFIELD:        nTemp = SID_INSERT_TIMEFIELD; break;
+                case SVX_SNAP_NUMERICFIELD:     nTemp = SID_INSERT_NUMERICFIELD; break;
+                case SVX_SNAP_CURRENCYFIELD:    nTemp = SID_INSERT_CURRENCYFIELD; break;
+                case SVX_SNAP_FORMATTEDFIELD:   nTemp = SID_INSERT_FORMATTEDFIELD; break;
+                case SVX_SNAP_PATTERNFIELD:     nTemp = SID_INSERT_PATTERNFIELD; break;
+                case SVX_SNAP_FILECONTROL:      nTemp = SID_INSERT_FILECONTROL; break;
             }
             if( nTemp )
             {
diff --git a/basctl/source/basicide/tbxctl.src b/basctl/source/basicide/tbxctl.src
index ddb589be37c8..6d9e48e023ca 100644
--- a/basctl/source/basicide/tbxctl.src
+++ b/basctl/source/basicide/tbxctl.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: tbxctl.src,v $
  *
- *  $Revision: 1.25 $
+ *  $Revision: 1.26 $
  *
- *  last change: $Author: kz $ $Date: 2001-07-14 00:14:36 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:29 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -334,7 +334,38 @@ ToolBox RID_TOOLBOX
             Text[ arabic ] = "HFixedLine";
             Text[ catalan ] = "HFixedLine";
         };
-        ToolBoxItem { Type = TOOLBOXITEM_SPACE ; };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_DATEFIELD ;
+            Identifier = SID_INSERT_DATEFIELD ;
+            RadioCheck = TRUE ;
+            Text = "Datumsfeld" ;
+            Text [ english ] = "DateField" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_NUMERICFIELD ;
+            Identifier = SID_INSERT_NUMERICFIELD ;
+            RadioCheck = TRUE ;
+            Text = "Numerisches Feld" ;
+            Text [ english ] = "NumericField" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_FORMATTEDFIELD ;
+            Identifier = SID_INSERT_FORMATTEDFIELD ;
+            RadioCheck = TRUE ;
+            Text = "Formatiertes Feld" ;
+            Text [ english ] = "FormattedField" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_FILECONTROL ;
+            Identifier = SID_INSERT_FILECONTROL ;
+            RadioCheck = TRUE ;
+            Text = "Dateiauswahl" ;
+            Text [ english ] = "FileControl" ;
+        };
         ToolBoxItem { Type = TOOLBOXITEM_SEPARATOR ; };
         ToolBoxItem
         {
@@ -572,6 +603,30 @@ ToolBox RID_TOOLBOX
         };
         ToolBoxItem
         {
+            HelpId = SID_INSERT_TIMEFIELD ;
+            Identifier = SID_INSERT_TIMEFIELD ;
+            RadioCheck = TRUE ;
+            Text = "Zeitfeld" ;
+            Text [ english ] = "TimeField" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_CURRENCYFIELD ;
+            Identifier = SID_INSERT_CURRENCYFIELD ;
+            RadioCheck = TRUE ;
+            Text = "W�hrungsfeld" ;
+            Text [ english ] = "CurrencyField" ;
+        };
+        ToolBoxItem
+        {
+            HelpId = SID_INSERT_PATTERNFIELD ;
+            Identifier = SID_INSERT_PATTERNFIELD ;
+            RadioCheck = TRUE ;
+            Text = "Maskiertes Feld" ;
+            Text [ english ] = "PatternField" ;
+        };
+        ToolBoxItem
+        {
             HelpId = SID_OBJECT_SELECT ;
             Identifier = SID_OBJECT_SELECT ;
             RadioCheck = TRUE ;
diff --git a/basctl/source/dlged/dlgedfac.cxx b/basctl/source/dlged/dlgedfac.cxx
index 9fd827c76d92..789bb2881afc 100644
--- a/basctl/source/dlged/dlgedfac.cxx
+++ b/basctl/source/dlged/dlgedfac.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedfac.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.14 $
  *
- *  last change: $Author: tbe $ $Date: 2001-08-17 13:57:40 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:24:17 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -131,7 +131,7 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
 
     if( (pObjFactory->nInventor == DlgInventor) &&
         (pObjFactory->nIdentifier >= OBJ_DLG_PUSHBUTTON) &&
-        (pObjFactory->nIdentifier <= OBJ_DLG_VFIXEDLINE)    )
+        (pObjFactory->nIdentifier <= OBJ_DLG_FILECONTROL)    )
     {
         switch( pObjFactory->nIdentifier )
         {
@@ -223,6 +223,27 @@ IMPL_LINK( DlgEdFactory, MakeObject, SdrObjFactory *, pObjFactory )
                  {
                  }
             }    break;
+            case OBJ_DLG_DATEFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlDateFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_TIMEFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlTimeFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_NUMERICFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlNumericFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_CURRENCYFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlCurrencyFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_FORMATTEDFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFormattedFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_PATTERNFIELD:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlPatternFieldModel") , xDialogSFact );
+                 break;
+            case OBJ_DLG_FILECONTROL:
+                 pObjFactory->pNewObj = new DlgEdObj( ::rtl::OUString::createFromAscii("com.sun.star.awt.UnoControlFileControlModel") , xDialogSFact );
+                 break;
         }
 
         DlgEdObj* pDlgEdObj = PTR_CAST(DlgEdObj, pObjFactory->pNewObj);
diff --git a/basctl/source/dlged/dlgedobj.cxx b/basctl/source/dlged/dlgedobj.cxx
index ebddacdb7bbe..c0f61a1b1964 100644
--- a/basctl/source/dlged/dlgedobj.cxx
+++ b/basctl/source/dlged/dlgedobj.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgedobj.cxx,v $
  *
- *  $Revision: 1.24 $
+ *  $Revision: 1.25 $
  *
- *  last change: $Author: tbe $ $Date: 2001-08-17 13:57:40 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:24:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -600,6 +600,34 @@ void SAL_CALL DlgEdObj::TabIndexChange( const  ::com::sun::star::beans::Property
     {
         nResId = RID_STR_CLASS_FIXEDLINE;
     }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_DATEFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_TIMEFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_NUMERICFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_CURRENCYFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_FORMATTEDFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+    {
+        nResId = RID_STR_CLASS_PATTERNFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+    {
+        nResId = RID_STR_CLASS_FILECONTROL;
+    }
     else
     {
         nResId = RID_STR_CLASS_CONTROL;
@@ -699,6 +727,34 @@ sal_uInt16 DlgEdObj::GetObjIdentifier() const
     {
         return OBJ_DLG_HFIXEDLINE;
     }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+    {
+        return OBJ_DLG_DATEFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+    {
+        return OBJ_DLG_TIMEFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+    {
+        return OBJ_DLG_NUMERICFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+    {
+        return OBJ_DLG_CURRENCYFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+    {
+        return OBJ_DLG_FORMATTEDFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+    {
+        return OBJ_DLG_PATTERNFIELD;
+    }
+    else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+    {
+        return OBJ_DLG_FILECONTROL;
+    }
     else
     {
         return OBJ_DLG_CONTROL;
diff --git a/basctl/source/dlged/dlgresid.src b/basctl/source/dlged/dlgresid.src
index 7921e7877780..bcee32d6d93e 100644
--- a/basctl/source/dlged/dlgresid.src
+++ b/basctl/source/dlged/dlgresid.src
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgresid.src,v $
  *
- *  $Revision: 1.18 $
+ *  $Revision: 1.19 $
  *
- *  last change: $Author: kz $ $Date: 2001-09-06 20:41:07 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:24:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -119,6 +119,34 @@ String RID_STR_CLASS_FIXEDLINE
 {
     Text = "FixedLine" ;
 };
+String RID_STR_CLASS_DATEFIELD
+{
+    Text = "DateField" ;
+};
+String RID_STR_CLASS_TIMEFIELD
+{
+    Text = "TimeField" ;
+};
+String RID_STR_CLASS_NUMERICFIELD
+{
+    Text = "NumericField" ;
+};
+String RID_STR_CLASS_CURRENCYFIELD
+{
+    Text = "CurrencyField" ;
+};
+String RID_STR_CLASS_FORMATTEDFIELD
+{
+    Text = "FormattedField" ;
+};
+String RID_STR_CLASS_PATTERNFIELD
+{
+    Text = "PatternField" ;
+};
+String RID_STR_CLASS_FILECONTROL
+{
+    Text = "FileControl" ;
+};
 
 
 // Property Browser Headline ----------------------------------------------------------------
diff --git a/basctl/source/dlged/propbrw.cxx b/basctl/source/dlged/propbrw.cxx
index 785dae854c87..470d3b57ed53 100644
--- a/basctl/source/dlged/propbrw.cxx
+++ b/basctl/source/dlged/propbrw.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: propbrw.cxx,v $
  *
- *  $Revision: 1.7 $
+ *  $Revision: 1.8 $
  *
- *  last change: $Author: tbe $ $Date: 2001-08-17 13:57:40 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:24:18 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -485,6 +485,34 @@ void PropBrw::implSetNewObject(const Reference< XPropertySet >& _rxObject)
         {
             nResId = RID_STR_CLASS_FIXEDLINE;
         }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlDateFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_DATEFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlTimeFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_TIMEFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlNumericFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_NUMERICFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlCurrencyFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_CURRENCYFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFormattedFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_FORMATTEDFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlPatternFieldModel") ))
+        {
+            nResId = RID_STR_CLASS_PATTERNFIELD;
+        }
+        else if (aServiceName.equalsAsciiL( RTL_CONSTASCII_STRINGPARAM("com.sun.star.awt.UnoControlFileControlModel") ))
+        {
+            nResId = RID_STR_CLASS_FILECONTROL;
+        }
         else
         {
             nResId = RID_STR_CLASS_CONTROL;
diff --git a/basctl/source/inc/dlgeddef.hxx b/basctl/source/inc/dlgeddef.hxx
index 9c749876164c..cb2414fd3208 100644
--- a/basctl/source/inc/dlgeddef.hxx
+++ b/basctl/source/inc/dlgeddef.hxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgeddef.hxx,v $
  *
- *  $Revision: 1.2 $
+ *  $Revision: 1.3 $
  *
- *  last change: $Author: tbe $ $Date: 2001-08-17 13:55:42 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -89,6 +89,13 @@ const UINT32 DlgInventor = UINT32('D')*0x00000001+
 #define OBJ_DLG_VSCROLLBAR      ((UINT16)14)
 #define OBJ_DLG_HFIXEDLINE      ((UINT16)15)
 #define OBJ_DLG_VFIXEDLINE      ((UINT16)16)
+#define OBJ_DLG_DATEFIELD       ((UINT16)17)
+#define OBJ_DLG_TIMEFIELD       ((UINT16)18)
+#define OBJ_DLG_NUMERICFIELD    ((UINT16)19)
+#define OBJ_DLG_CURRENCYFIELD   ((UINT16)20)
+#define OBJ_DLG_FORMATTEDFIELD  ((UINT16)21)
+#define OBJ_DLG_PATTERNFIELD    ((UINT16)22)
+#define OBJ_DLG_FILECONTROL     ((UINT16)23)
 
 
 #endif // _BASCTL_DLGEDDEF_HXX
diff --git a/basctl/source/inc/dlgresid.hrc b/basctl/source/inc/dlgresid.hrc
index f0401053fcf9..859dac4be4ee 100644
--- a/basctl/source/inc/dlgresid.hrc
+++ b/basctl/source/inc/dlgresid.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: dlgresid.hrc,v $
  *
- *  $Revision: 1.5 $
+ *  $Revision: 1.6 $
  *
- *  last change: $Author: tbe $ $Date: 2001-08-17 13:55:42 $
+ *  last change: $Author: tbe $ $Date: 2001-09-17 11:23:54 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -82,6 +82,14 @@
 #define RID_STR_CLASS_PROGRESSBAR           ( RID_DLG_START +  11 )
 #define RID_STR_CLASS_SCROLLBAR             ( RID_DLG_START +  12 )
 #define RID_STR_CLASS_FIXEDLINE             ( RID_DLG_START +  13 )
+#define RID_STR_CLASS_DATEFIELD             ( RID_DLG_START +  14 )
+#define RID_STR_CLASS_TIMEFIELD             ( RID_DLG_START +  15 )
+#define RID_STR_CLASS_NUMERICFIELD          ( RID_DLG_START +  16 )
+#define RID_STR_CLASS_CURRENCYFIELD         ( RID_DLG_START +  17 )
+#define RID_STR_CLASS_FORMATTEDFIELD        ( RID_DLG_START +  18 )
+#define RID_STR_CLASS_PATTERNFIELD          ( RID_DLG_START +  19 )
+#define RID_STR_CLASS_FILECONTROL           ( RID_DLG_START +  20 )
+
 
 // Property Browser Headline Id's -----------------------------------------------------------