INTEGRATION: CWS dba24c (1.44.62); FILE MERGED

2007/10/29 22:44:06 fs 1.44.62.3: merging changes from CWS dba24b herein, to not wait for later resync
2007/09/13 11:40:34 fs 1.44.62.2: some cleanup during #i49183#
2007/09/12 09:09:38 fs 1.44.62.1: PROPERTY_(ID_)USE_ESCAPE_PROCESSING: removed the USE_ for consistency reasons

dbaccess/source/inc/stringconstants.hrc

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: stringconstants.hrc,v $
  *
- *  $Revision: 1.46 $
+ *  $Revision: 1.47 $
  *
- *  last change: $Author: rt $ $Date: 2007-11-09 08:19:24 $
+ *  last change: $Author: ihi $ $Date: 2007-11-21 15:44:33 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -56,7 +56,7 @@
 #define PROPERTY_ID_SCHEMANAME              8
 #define PROPERTY_ID_CATALOGNAME             9
 #define PROPERTY_ID_PRIVILEGES              10
-#define PROPERTY_ID_USE_ESCAPE_PROCESSING   11
+#define PROPERTY_ID_ESCAPE_PROCESSING   11
 #define PROPERTY_ID_COMMAND                 12
 #define PROPERTY_ID_TYPE                    13
 #define PROPERTY_ID_TYPENAME                14
@@ -190,7 +190,7 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_NAME);
 DECLARE_CONSTASCII_USTRING(PROPERTY_SCHEMANAME);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CATALOGNAME);
 DECLARE_CONSTASCII_USTRING(PROPERTY_PRIVILEGES);
-DECLARE_CONSTASCII_USTRING(PROPERTY_USE_ESCAPE_PROCESSING);
+DECLARE_CONSTASCII_USTRING(PROPERTY_ESCAPE_PROCESSING);
 DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND);
 DECLARE_CONSTASCII_USTRING(PROPERTY_TYPE);
 DECLARE_CONSTASCII_USTRING(PROPERTY_TYPENAME);
@@ -284,15 +284,12 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_SUPPRESSVERSIONCL);
 DECLARE_CONSTASCII_USTRING(PROPERTY_SHOWTREEVIEW);
 DECLARE_CONSTASCII_USTRING(PROPERTY_SHOWTREEVIEWBUTTON);
 DECLARE_CONSTASCII_USTRING(PROPERTY_SHOWMENU);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CURRENTQUERY);
-DECLARE_CONSTASCII_USTRING(PROPERTY_QUERYDESIGNVIEW);
 DECLARE_CONSTASCII_USTRING(PROPERTY_LAYOUTINFORMATION);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CURRENTTABLE);
 DECLARE_CONSTASCII_USTRING(PROPERTY_DATABASENAME);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLUSER);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CONTROLPASSWORD);
 DECLARE_CONSTASCII_USTRING(PROPERTY_CACHESIZE);
-DECLARE_CONSTASCII_USTRING(PROPERTY_CREATEVIEW);
 DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTLINECOLOR);
 DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTEMPHASIS);
 DECLARE_CONSTASCII_USTRING(PROPERTY_TEXTRELIEF);