INTEGRATION: CWS frmvalidation (1.16.26); FILE MERGED

2004/03/12 12:10:36 fs 1.16.26.2: #i21506# new services for validating form control values
2004/03/11 16:46:24 fs 1.16.26.1: mass checkin
- #i25106# core for validating form controls via external XValidator instances
- moved the services/interfaces related to binding form controls to external
  value suppliers into css.form.binding (out of drafts.css.form/component)

1 files changed, 23 insertions, 16 deletions

diff --git a/forms/source/misc/services.cxx b/forms/source/misc/services.cxx
index 7fb44c0d6c8d..9b17bbaa34d5 100644
--- a/forms/source/misc/services.cxx
+++ b/forms/source/misc/services.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: services.cxx,v $
  *
- *  $Revision: 1.16 $
+ *  $Revision: 1.17 $
  *
- *  last change: $Author: kz $ $Date: 2003-12-11 12:32:31 $
+ *  last change: $Author: rt $ $Date: 2004-04-02 10:58:56 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -223,13 +223,20 @@ IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_CONTROL_PATTERNFIELD,   "com.sun.star.form
 IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_CONTROL_IMAGECONTROL,   "com.sun.star.form.control.ImageControl"   );
 IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_CONTROL_FORMATTEDFIELD, "com.sun.star.form.control.FormattedField" );
 
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_CHECKBOX, "drafts.com.sun.star.form.component.BindableDatabaseCheckBox" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_COMBOBOX, "drafts.com.sun.star.form.component.BindableDatabaseComboBox" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_FORMATTEDFIELD, "drafts.com.sun.star.form.component.BindableDatabaseFormattedField" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_LISTBOX, "drafts.com.sun.star.form.component.BindableDatabaseListBox" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_NUMERICFIELD, "drafts.com.sun.star.form.component.BindableDatabaseNumericField" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_RADIOBUTTON, "drafts.com.sun.star.form.component.BindableDatabaseRadioButton" );
-IMPLEMENT_CONSTASCII_USTRING( FRM_SUN_COMPONENT_BINDDB_TEXTFIELD, "drafts.com.sun.star.form.component.BindableDatabaseTextField" );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_CHECK_BOX,        "com.sun.star.form.binding.BindableDatabaseCheckBox"        );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_COMBO_BOX,        "com.sun.star.form.binding.BindableDatabaseComboBox"        );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_FORMATTED_FIELD,  "com.sun.star.form.binding.BindableDatabaseFormattedField"  );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_LIST_BOX,         "com.sun.star.form.binding.BindableDatabaseListBox"         );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_NUMERIC_FIELD,    "com.sun.star.form.binding.BindableDatabaseNumericField"    );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_RADIO_BUTTON,     "com.sun.star.form.binding.BindableDatabaseRadioButton"     );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATABASE_TEXT_FIELD,       "com.sun.star.form.binding.BindableDatabaseTextField"       );
+
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_CONTROL_MODEL,               "com.sun.star.form.binding.BindableControlModel"            );
+IMPLEMENT_CONSTASCII_USTRING( BINDABLE_DATA_AWARE_CONTROL_MODEL,    "com.sun.star.form.binding.BindableDataAwareControlModel"   );
+IMPLEMENT_CONSTASCII_USTRING( DATA_AWARE_CONTROL_MODEL,             "com.sun.star.form.binding.DataAwareControlModel"           );
+IMPLEMENT_CONSTASCII_USTRING( VALIDATABLE_CONTROL_MODEL,            "com.sun.star.form.binding.ValidatableControlModel"         );
+IMPLEMENT_CONSTASCII_USTRING( VALIDATABLE_BINDABLE_CONTROL_MODEL,   "com.sun.star.form.binding.ValidatableBindableControlModel" );
+
 
 IMPLEMENT_CONSTASCII_USTRING(FRM_SUN_FORMS_COLLECTION, "com.sun.star.form.Forms");
 
@@ -420,21 +427,21 @@ void ensureClassInfos()
     REGISTER_CLASS2(OGroupBoxModel, FRM_COMPONENT_GROUPBOX, FRM_SUN_COMPONENT_GROUPBOX);
 
     // - RadioButton
-    REGISTER_CLASS4( ORadioButtonModel, FRM_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON, FRM_SUN_COMPONENT_BINDDB_RADIOBUTTON );
+    REGISTER_CLASS4( ORadioButtonModel, FRM_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_RADIOBUTTON, FRM_SUN_COMPONENT_DATABASE_RADIOBUTTON, BINDABLE_DATABASE_RADIO_BUTTON );
     // - CheckBox
-    REGISTER_CLASS4( OCheckBoxModel, FRM_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_DATABASE_CHECKBOX, FRM_SUN_COMPONENT_BINDDB_CHECKBOX );
+    REGISTER_CLASS4( OCheckBoxModel, FRM_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_CHECKBOX, FRM_SUN_COMPONENT_DATABASE_CHECKBOX, BINDABLE_DATABASE_CHECK_BOX );
     // - ListBox
-    REGISTER_CLASS4( OListBoxModel, FRM_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_DATABASE_LISTBOX, FRM_SUN_COMPONENT_BINDDB_LISTBOX );
+    REGISTER_CLASS4( OListBoxModel, FRM_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_LISTBOX, FRM_SUN_COMPONENT_DATABASE_LISTBOX, BINDABLE_DATABASE_LIST_BOX );
     // - ComboBox
-    REGISTER_CLASS4( OComboBoxModel, FRM_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_DATABASE_COMBOBOX, FRM_SUN_COMPONENT_BINDDB_COMBOBOX );
+    REGISTER_CLASS4( OComboBoxModel, FRM_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_COMBOBOX, FRM_SUN_COMPONENT_DATABASE_COMBOBOX, BINDABLE_DATABASE_COMBO_BOX );
     // - EditControl
-    REGISTER_CLASS4( OEditModel, FRM_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_DATABASE_TEXTFIELD, FRM_SUN_COMPONENT_BINDDB_TEXTFIELD );
+    REGISTER_CLASS4( OEditModel, FRM_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_TEXTFIELD, FRM_SUN_COMPONENT_DATABASE_TEXTFIELD, BINDABLE_DATABASE_TEXT_FIELD );
     // - DateControl
     REGISTER_CLASS3( ODateModel, FRM_COMPONENT_DATEFIELD, FRM_SUN_COMPONENT_DATEFIELD, FRM_SUN_COMPONENT_DATABASE_DATEFIELD );
     // - TimeControl
     REGISTER_CLASS3( OTimeModel, FRM_COMPONENT_TIMEFIELD, FRM_SUN_COMPONENT_TIMEFIELD, FRM_SUN_COMPONENT_DATABASE_TIMEFIELD );
     // - NumericField
-    REGISTER_CLASS4( ONumericModel, FRM_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD, FRM_SUN_COMPONENT_BINDDB_NUMERICFIELD );
+    REGISTER_CLASS4( ONumericModel, FRM_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_NUMERICFIELD, FRM_SUN_COMPONENT_DATABASE_NUMERICFIELD, BINDABLE_DATABASE_NUMERIC_FIELD );
     // - CurrencyField
     REGISTER_CLASS3( OCurrencyModel, FRM_COMPONENT_CURRENCYFIELD, FRM_SUN_COMPONENT_CURRENCYFIELD, FRM_SUN_COMPONENT_DATABASE_CURRENCYFIELD );
     // - PatternField
@@ -454,7 +461,7 @@ void ensureClassInfos()
     aServices.getArray()[0] = frm::FRM_COMPONENT_FORMATTEDFIELD;
     aServices.getArray()[1] = frm::FRM_SUN_COMPONENT_FORMATTEDFIELD;
     aServices.getArray()[2] = frm::FRM_SUN_COMPONENT_DATABASE_FORMATTEDFIELD;
-    aServices.getArray()[3] = frm::FRM_SUN_COMPONENT_BINDDB_FORMATTEDFIELD;
+    aServices.getArray()[3] = frm::BINDABLE_DATABASE_FORMATTED_FIELD;
 
     registerClassInfo(::rtl::OUString::createFromAscii("com.sun.star.comp.forms.OFormattedFieldWrapper_ForcedFormatted"),
         aServices,