INTEGRATION: CWS dba24d (1.3.348); FILE MERGED

2007/11/08 14:05:09 fs 1.3.348.1: during #i81658#: string cleanup

dbaccess/source/inc/cfgstrings.hrc

@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cfgstrings.hrc,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.5 $
  *
- *  last change: $Author: ihi $ $Date: 2007-11-21 15:43:52 $
+ *  last change: $Author: rt $ $Date: 2008-01-30 08:38:07 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -45,10 +45,6 @@ namespace dbacfg
 #include "stringconstants.hrc"
 #undef STRINGCONSTANTS_INCLUDED_INDIRECT
 
-    //============================================================
-    //= CFG
-    //============================================================
-    DECLARE_CONSTASCII_USTRING(CFG_DATASOURCEPATH);
     //============================================================
     //= configuration key names
     //============================================================
@@ -62,11 +58,7 @@ namespace dbacfg
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_LOGINTIMEOUT);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_INFO);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_QUERYDOCUMENTS);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLES);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_DBLINK_DOCUMENTLOCATION);
 
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING);
@@ -100,14 +92,11 @@ namespace dbacfg
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARACTEREMPHASIS);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FONT_CHARACTERRELIEF);
 
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_DATASETTINGS_MAIN);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_SETTINGS);
 
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_ALIGNMENT);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_WIDTH);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_NUMBERFORMAT);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_FORMATSTRING);
-    DECLARE_CONSTASCII_USTRING(CONFIGKEY_FORMATLOCALE);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_RELPOSITION);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN);
     DECLARE_CONSTASCII_USTRING(CONFIGKEY_LAYOUTINFORMATION);