INTEGRATION: CWS frmcontrols02 (1.8.6); FILE MERGED

2004/03/24 09:42:30 fs 1.8.6.2: RESYNC: (1.8-1.9); FILE MERGED
2004/01/23 17:52:48 fs 1.8.6.1: #i24414# #i24417#

1 files changed, 48 insertions, 182 deletions

diff --git a/forms/source/inc/property.hrc b/forms/source/inc/property.hrc
index 5624d8b5b747..4dc1ed6e1be0 100644
--- a/forms/source/inc/property.hrc
+++ b/forms/source/inc/property.hrc
@@ -2,9 +2,9 @@
  *
  *  $RCSfile: property.hrc,v $
  *
- *  $Revision: 1.10 $
+ *  $Revision: 1.11 $
  *
- *  last change: $Author: rt $ $Date: 2004-04-02 10:58:02 $
+ *  last change: $Author: hr $ $Date: 2004-04-13 11:25:05 $
  *
  *  The Contents of this file are made available subject to the terms of
  *  either of the following licenses
@@ -65,8 +65,8 @@
 #include <rtl/ustring.hxx>
 #endif
 
-#ifndef _FRM_STRINGS_HXX_
-#include "strings.hxx"
+#ifndef FRM_STRINGS_HXX
+#include "frm_strings.hxx"
 #endif
 
 //.........................................................................
@@ -90,12 +90,29 @@ namespace frm
 #define PROPERTY_ID_ALLOWADDITIONS      (PROPERTY_ID_START + 15)
 #define PROPERTY_ID_ALLOWEDITS          (PROPERTY_ID_START + 16)
 #define PROPERTY_ID_ALLOWDELETIONS      (PROPERTY_ID_START + 17)
-#define PROPERTY_ID_CACHESIZE           (PROPERTY_ID_START + 19)
-#define PROPERTY_ID_LASTDIRTY           (PROPERTY_ID_START + 24)
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
 #define PROPERTY_ID_VALUE               (PROPERTY_ID_START + 31)    // INT32
+    // free
 #define PROPERTY_ID_FORMATKEY           (PROPERTY_ID_START + 33)    // UINT32
+    // free
+    // free
+    // free
 #define PROPERTY_ID_SIZE                (PROPERTY_ID_START + 37)    // UINT32
     // free
+    // free
+    // free
+    // free
 #define PROPERTY_ID_WIDTH               (PROPERTY_ID_START + 42)    // UINT16
 #define PROPERTY_ID_DEFAULTCONTROL      (PROPERTY_ID_START + 43)    // string
 #define PROPERTY_ID_BOUNDCOLUMN         (PROPERTY_ID_START + 44)    // UINT16 may be null
@@ -105,10 +122,12 @@ namespace frm
 #define PROPERTY_ID_TEXT                (PROPERTY_ID_START + 48)    // string
 #define PROPERTY_ID_STRINGITEMLIST      (PROPERTY_ID_START + 49)    // wsstringsequence
 #define PROPERTY_ID_LABEL               (PROPERTY_ID_START + 50)    // string
+    // free
 #define PROPERTY_ID_STATE               (PROPERTY_ID_START + 52)    // UINT16
-    //  free
+#define PROPERTY_ID_DELAY               (PROPERTY_ID_START + 53)    // sal_Int32
 #define PROPERTY_ID_FONT                (PROPERTY_ID_START + 54)    // font
 #define PROPERTY_ID_HASNAVIGATION       (PROPERTY_ID_START + 55)
+    // free
 #define PROPERTY_ID_ROWHEIGHT           (PROPERTY_ID_START + 57)    // UINT16
 #define PROPERTY_ID_BACKGROUNDCOLOR     (PROPERTY_ID_START + 58)    // UINT32
 #define PROPERTY_ID_FILLCOLOR           (PROPERTY_ID_START + 59)    // UINT32
@@ -132,6 +151,17 @@ namespace frm
 #define PROPERTY_ID_DEFAULTCHECKED      (PROPERTY_ID_START + 77)    // UINT16
 #define PROPERTY_ID_VALUE_SEQ           (PROPERTY_ID_START + 78)    // StringSeq
 #define PROPERTY_ID_IMAGE_URL           (PROPERTY_ID_START + 79)    // ::rtl::OUString
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
+    // free
 #define PROPERTY_ID_SELECT_SEQ          (PROPERTY_ID_START + 91)    // INT16Seq
 #define PROPERTY_ID_DEFAULT_SELECT_SEQ  (PROPERTY_ID_START + 92)    // INT16Seq
 #define PROPERTY_ID_MULTISELECTION      (PROPERTY_ID_START + 93)    // BOOL
@@ -163,6 +193,10 @@ namespace frm
 #define PROPERTY_ID_TARGET_FRAME        (PROPERTY_ID_START +119)    // ::rtl::OUString
 #define PROPERTY_ID_TAG                 (PROPERTY_ID_START +120)    // ::rtl::OUString
 #define PROPERTY_ID_ECHO_CHAR           (PROPERTY_ID_START +121)    // UINT16
+#define PROPERTY_ID_SHOW_POSITION       (PROPERTY_ID_START +122)    // sal_Bool
+#define PROPERTY_ID_SHOW_NAVIGATION     (PROPERTY_ID_START +123)    // sal_Bool
+#define PROPERTY_ID_SHOW_RECORDACTIONS  (PROPERTY_ID_START +124)    // sal_Bool
+#define PROPERTY_ID_SHOW_FILTERSORT     (PROPERTY_ID_START +125)    // sal_Bool
 #define PROPERTY_ID_EMPTY_IS_NULL       (PROPERTY_ID_START +126)    // Bool
 #define PROPERTY_ID_DECIMAL_ACCURACY    (PROPERTY_ID_START +127)    // UINT16
 #define PROPERTY_ID_DATE_SHOW_CENTURY   (PROPERTY_ID_START +128)    // Bool
@@ -171,7 +205,9 @@ namespace frm
 #define PROPERTY_ID_HIDDEN_VALUE        (PROPERTY_ID_START +131)    // ::rtl::OUString
 #define PROPERTY_ID_DECIMALS            (PROPERTY_ID_START +132)    // UINT16
 #define PROPERTY_ID_AUTOINCREMENT       (PROPERTY_ID_START +133)    // UINT16
+    // free
 #define PROPERTY_ID_FILTER              (PROPERTY_ID_START +135)    // ::rtl::OUString
+    // free
 #define PROPERTY_ID_QUERY               (PROPERTY_ID_START +137)    // ::rtl::OUString
 #define PROPERTY_ID_DEFAULT_LONG_VALUE  (PROPERTY_ID_START +138)    // Double
 #define PROPERTY_ID_DEFAULT_DATE        (PROPERTY_ID_START +139)    // UINT32
@@ -211,7 +247,6 @@ namespace frm
 #define PROPERTY_ID_CURSORCOLOR         (PROPERTY_ID_START +174)    // INT32
 #define PROPERTY_ID_ALWAYSSHOWCURSOR    (PROPERTY_ID_START +175)    // BOOL
 #define PROPERTY_ID_DISPLAYSYNCHRON     (PROPERTY_ID_START +176)    // BOOL
-
 #define PROPERTY_ID_ISMODIFIED          (PROPERTY_ID_START +177)    // BOOL
 #define PROPERTY_ID_ISNEW               (PROPERTY_ID_START +178)    // BOOL
 #define PROPERTY_ID_PRIVILEGES          (PROPERTY_ID_START +179)    // INT32
@@ -233,13 +268,13 @@ namespace frm
 #define PROPERTY_ID_SCALE               (PROPERTY_ID_START +195)    // INT32
 #define PROPERTY_ID_SORT                (PROPERTY_ID_START +196)    // String
 
-#define PROPERTY_ID_ROWCOUNT            (PROPERTY_ID_START +197)
-#define PROPERTY_ID_ROWCOUNTFINAL       (PROPERTY_ID_START +198)
+    // free
+    // free
 #define PROPERTY_ID_FETCHSIZE           (PROPERTY_ID_START +199)
-#define PROPERTY_ID_STATEMENT           (PROPERTY_ID_START +200)
+    // free
 #define PROPERTY_ID_SEARCHABLE          (PROPERTY_ID_START +201)
 #define PROPERTY_ID_ISREADONLY          (PROPERTY_ID_START +202)
-#define PROPERTY_ID_ISREQUIRED          (PROPERTY_ID_START +203)
+    // free
 #define PROPERTY_ID_FIELDTYPE           (PROPERTY_ID_START +204)
 #define PROPERTY_ID_COLUMNSERVICENAME   (PROPERTY_ID_START +205)
 #define PROPERTY_ID_CONTROLSOURCEPROPERTY   (PROPERTY_ID_START +206)
@@ -255,180 +290,11 @@ namespace frm
 #define PROPERTY_ID_DEFAULT_SPIN_VALUE          ( PROPERTY_ID_START + 215 ) // sal_Int32
 #define PROPERTY_ID_SCROLL_VALUE                ( PROPERTY_ID_START + 216 ) // sal_Int32
 #define PROPERTY_ID_SPIN_VALUE                  ( PROPERTY_ID_START + 217 ) // sal_Int32
+#define PROPERTY_ID_ICONSIZE                    ( PROPERTY_ID_START + 218 ) // sal_Int16
 
 // start ID fuer aggregierte Properties
 #define PROPERTY_ID_AGGREGATE_ID        (PROPERTY_ID_START + 10000)
 
-// extern declaration fuer vordefinierte Strings, laengst nicht vollstaendig
-DECLARE_CONSTASCII_USTRING(PROPERTY_NAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TAG);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABINDEX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CLASSID);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALIGN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ROWCOUNT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ROWCOUNTFINAL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FETCHSIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUEMIN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUEMAX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUESTEP);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LABEL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_NAVIGATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CYCLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ENABLED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SPIN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_READONLY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_AUTOINCREMENT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CACHESIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LASTDIRTY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATEMENT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_WIDTH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SEARCHABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MULTILINE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TARGET_URL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MAXTEXTLEN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_STATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TRISTATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HIDDEN_VALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TARGET_FRAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BUTTONTYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_STRINGITEMLIST);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULT_TEXT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULTCHECKED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULT_DATE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULT_TIME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULT_VALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATKEY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FORMATSSUPPLIER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SUBMIT_ACTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SUBMIT_TARGET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SUBMIT_METHOD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SUBMIT_ENCODING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_IMAGE_URL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EMPTY_IS_NULL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCETYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LISTSOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SELECT_SEQ);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VALUE_SEQ);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DEFAULT_SELECT_SEQ);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MULTISELECTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DECIMAL_ACCURACY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EDITMASK);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISREADONLY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISREQUIRED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FIELDTYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DECIMALS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_REFVALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_STRICTFORMAT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALLOWADDITIONS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALLOWEDITS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALLOWDELETIONS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_MASTERFIELDS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISPASSTHROUGH);
-DECLARE_CONSTASCII_USTRING(PROPERTY_QUERY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LITERALMASK);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SHOWTHOUSANDSEP);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CURRENCYSYMBOL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATEFORMAT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATEMIN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATEMAX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DATE_SHOW_CENTURY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIMEFORMAT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIMEMIN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TIMEMAX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOUNT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOUNDCOLUMN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HASNAVIGATION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BACKGROUNDCOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILLCOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTCOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_LINECOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BORDER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DROPDOWN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HSCROLL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_VSCROLL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABSTOP);
-DECLARE_CONSTASCII_USTRING(PROPERTY_AUTOCOMPLETE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HARDLINEBREAKS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRINTABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ECHO_CHAR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ROWHEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HELPTEXT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_NAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_STYLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_FAMILY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_CHARSET);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_HEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_WEIGHT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_SLANT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_UNDERLINE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_WORDLINEMODE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONT_STRIKEOUT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTEMPHASISMARK);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FONTRELIEF);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HELPURL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RECORDMARKER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TREATASNUMERIC);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVE_VALUE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVE_DEFAULT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVE_MIN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_EFFECTIVE_MAX);
-DECLARE_CONSTASCII_USTRING(PROPERTY_HIDDEN);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FILTERPROPOSAL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_FIELDSOURCE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TABLENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLLABEL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CURRSYM_POSITION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CURSORCOLOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ALWAYSSHOWCURSOR);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DISPLAYSYNCHRON);
-
-DECLARE_CONSTASCII_USTRING( PROPERTY_DEFAULT_SCROLL_VALUE );
-DECLARE_CONSTASCII_USTRING( PROPERTY_SCROLL_VALUE );
-DECLARE_CONSTASCII_USTRING( PROPERTY_DEFAULT_SPIN_VALUE );
-DECLARE_CONSTASCII_USTRING( PROPERTY_SPIN_VALUE );
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISMODIFIED);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISNEW);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PRIVILEGES);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DETAILFIELDS);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSET_CONCURRENCY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_INSERTONLY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_RESULTSET_TYPE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPE_PROCESSING);
-DECLARE_CONSTASCII_USTRING(PROPERTY_APPLYFILTER);
-
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISNULLABLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECOMMAND);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ISCURRENCY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_URL);
-DECLARE_CONSTASCII_USTRING(PROPERTY_TITLE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SCALE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_SORT);
-DECLARE_CONSTASCII_USTRING(PROPERTY_COLUMNSERVICENAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCEPROPERTY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_REALNAME);
-DECLARE_CONSTASCII_USTRING(PROPERTY_USER);
-DECLARE_CONSTASCII_USTRING(PROPERTY_PASSWORD);
-DECLARE_CONSTASCII_USTRING(PROPERTY_DISPATCHURLINTERNAL);
-
-DECLARE_CONSTASCII_USTRING( PROPERTY_PERSISTENCE_MAXTEXTLENGTH );
-DECLARE_CONSTASCII_USTRING( PROPERTY_ENFORCE_FORMAT );
-
 //.........................................................................
 }
 //.........................................................................