INTEGRATION: CWS formdesign01 (1.9.72); FILE MERGED

2004/01/05 21:25:29 fs 1.9.72.3: RESYNC: (1.9-1.10); FILE MERGED
2003/12/11 14:10:39 fs 1.9.72.2: #i23418# removed some unused property identifiers
2003/12/05 14:22:26 fs 1.9.72.1: removed obsolete property name (PROPERY_MULTI)

1 files changed, 4 insertions, 19 deletions

diff --git a/forms/source/misc/property.cxx b/forms/source/misc/property.cxx
index f029f1c7444f..b3c0348a68a3 100644
--- a/forms/source/misc/property.cxx
+++ b/forms/source/misc/property.cxx
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: property.cxx,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: kz $ $Date: 2003-12-11 12:32:11 $
+ *  last change: $Author: obo $ $Date: 2004-03-19 11:54:49 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -146,7 +146,7 @@ void PropertyInfoService::initialize()
     ADD_PROP_ASSIGNMENT(ENABLED);
     ADD_PROP_ASSIGNMENT(SPIN);
     ADD_PROP_ASSIGNMENT(READONLY);
-    ADD_PROP_ASSIGNMENT(FILTER_CRITERIA);
+    ADD_PROP_ASSIGNMENT(FILTER);
     ADD_PROP_ASSIGNMENT(AUTOINCREMENT);
     ADD_PROP_ASSIGNMENT(CACHESIZE);
     ADD_PROP_ASSIGNMENT(LASTDIRTY);
@@ -220,7 +220,6 @@ void PropertyInfoService::initialize()
     ADD_PROP_ASSIGNMENT(LINECOLOR);
     ADD_PROP_ASSIGNMENT(BORDER);
     ADD_PROP_ASSIGNMENT(DROPDOWN);
-    ADD_PROP_ASSIGNMENT(MULTI);
     ADD_PROP_ASSIGNMENT(HSCROLL);
     ADD_PROP_ASSIGNMENT(VSCROLL);
     ADD_PROP_ASSIGNMENT(TABSTOP);
@@ -255,14 +254,8 @@ void PropertyInfoService::initialize()
     ADD_PROP_ASSIGNMENT(FILTERPROPOSAL);
     ADD_PROP_ASSIGNMENT(FIELDSOURCE);
     ADD_PROP_ASSIGNMENT(TABLENAME);
-    ADD_PROP_ASSIGNMENT(FILTERSUPPLIER);
-    ADD_PROP_ASSIGNMENT(CURRENTFILTER);
-    ADD_PROP_ASSIGNMENT(SELECTED_FIELDS);
-    ADD_PROP_ASSIGNMENT(SELECTED_TABLES);
-    ADD_PROP_ASSIGNMENT(THREADSAFE);
     ADD_PROP_ASSIGNMENT(CONTROLLABEL);
     ADD_PROP_ASSIGNMENT(CURRSYM_POSITION);
-    ADD_PROP_ASSIGNMENT(SOURCE);
     ADD_PROP_ASSIGNMENT(CURSORCOLOR);
     ADD_PROP_ASSIGNMENT(ALWAYSSHOWCURSOR);
     ADD_PROP_ASSIGNMENT(DISPLAYSYNCHRON);
@@ -324,7 +317,7 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE, "DataField");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED, "Enabled");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_READONLY, "ReadOnly");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISREADONLY, "IsReadOnly");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER_CRITERIA, "Filter");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISREQUIRED, "IsRequired");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_AUTOINCREMENT, "IsAutoIncrement");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CACHESIZE, "CacheSize");
@@ -403,7 +396,6 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR, "TextColor");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_LINECOLOR, "LineColor");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BORDER, "Border");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DROPDOWN, "Dropdown");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_MULTI, "Multi");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HSCROLL, "HScroll");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_VSCROLL, "VScroll");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "Tabstop");
@@ -438,15 +430,8 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_HIDDEN, "Hidden");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL, "UseFilterValueProposal");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FIELDSOURCE, "FieldSource");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABLENAME, "TableName");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTERSUPPLIER, "FilterSupplier");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURRENTFILTER, "CurrentFilter");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SELECTED_FIELDS, "SelectedFields");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SELECTED_TABLES, "SelectedTables");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_THREADSAFE, "ThreadSafe");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISFILTERAPPLIED, "IsFilterApplied");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLLABEL, "LabelControl");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURRSYM_POSITION, "PrependCurrencySymbol");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SOURCE, "Source");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CURSORCOLOR, "CursorColor");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ALWAYSSHOWCURSOR, "AlwaysShowCursor");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DISPLAYSYNCHRON, "DisplayIsSynchron");