Tag: cws_src680_dba24d
User: fs      
Date: 2007-11-08 14:06:55+0000
Modified:
   dba/dbaccess/source/shared/cfgstrings.cxx
   dba/dbaccess/source/shared/dbustrings.cxx
   dba/dbaccess/source/shared/stringconstants.cxx

Log:
 during #i81658#: string cleanup

File Changes:

Directory: /dba/dbaccess/source/shared/
=======================================

File [changed]: cfgstrings.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/cfgstrings.cxx?r1=1.4&r2=1.4.170.1
Delta lines:  +4 -13
--------------------
--- cfgstrings.cxx      2006-09-17 06:51:25+0000        1.4
+++ cfgstrings.cxx      2007-11-08 14:06:52+0000        1.4.170.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: cfgstrings.cxx,v $
  *
- *  $Revision: 1.4 $
+ *  $Revision: 1.4.170.1 $
  *
- *  last change: $Author: obo $ $Date: 2006/09/17 06:51:25 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:06:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -51,20 +51,15 @@
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_LOGINTIMEOUT, 
"LoginTimeout");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_PASSWORDREQUIRED, 
"IsPasswordRequired");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_SUPPRESSVERSIONCL, 
"SuppressVersionColumns");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_INFO, 
"DataSourceSettings");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_BOOKMARKS, "Bookmarks");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_QUERYDOCUMENTS, 
"Queries");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_TABLES, "Tables");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DBLINK_DOCUMENTLOCATION, 
"DocumentLocation");
        
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COMMAND, "Command");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_USE_ESCAPE_PROCESSING, 
"EscapeProcessing");
+       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_ESCAPE_PROCESSING, 
"EscapeProcessing");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_TABLENAME, 
"UpdateTableName");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_SCHEMANAME, 
"UpdateSchemaName");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_UPDATE_CATALOGNAME, 
"UpdateCatalogName");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_QRYDESCR_COLUMNS, "Columns");
 
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DATASETTINGS_MAIN, 
"DataSettings");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_SETTINGS, "Settings");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DEFSET_FILTER, "Filter");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_DEFSET_APPLYFILTER, 
"ApplyFilter");
@@ -96,13 +91,9 @@
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_ALIGNMENT, "Align");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_WIDTH, "Width");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_NUMBERFORMAT, 
"FormatKey");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_FORMATSTRING, "FormatString");
-       IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_FORMATLOCALE, "FormatLocale");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_RELPOSITION, "Position");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HIDDEN, "Hidden");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_HELPTEXT, "HelpText");
        IMPLEMENT_CONSTASCII_USTRING(CONFIGKEY_COLUMN_CONTROLDEFAULT, 
"ControlDefault");
-
-       
IMPLEMENT_CONSTASCII_USTRING(CFG_DATASOURCEPATH,"org.openoffice.Office.DataAccess/DataSources");
 }
 

File [changed]: dbustrings.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/dbustrings.cxx?r1=1.13&r2=1.13.70.1
Delta lines:  +3 -4
-------------------
--- dbustrings.cxx      2007-07-06 07:57:28+0000        1.13
+++ dbustrings.cxx      2007-11-08 14:06:52+0000        1.13.70.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: dbustrings.cxx,v $
  *
- *  $Revision: 1.13 $
+ *  $Revision: 1.13.70.1 $
  *
- *  last change: $Author: rt $ $Date: 2007/07/06 07:57:28 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:06:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -74,5 +74,4 @@
        IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TABSTOP, "TabStop");
        IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DEFAULTCONTROL, "DefaultControl");
        IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ENABLED, "Enabled");
-       IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COLUMN, "Column");
 }

File [changed]: stringconstants.cxx
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/shared/stringconstants.cxx?r1=1.42&r2=1.42.2.1
Delta lines:  +13 -7
--------------------
--- stringconstants.cxx 2007-11-01 15:03:00+0000        1.42
+++ stringconstants.cxx 2007-11-08 14:06:52+0000        1.42.2.1
@@ -4,9 +4,9 @@
  *
  *  $RCSfile: stringconstants.cxx,v $
  *
- *  $Revision: 1.42 $
+ *  $Revision: 1.42.2.1 $
  *
- *  last change: $Author: hr $ $Date: 2007/11/01 15:03:00 $
+ *  last change: $Author: fs $ $Date: 2007/11/08 14:06:52 $
  *
  *  The Contents of this file are made available subject to
  *  the terms of GNU Lesser General Public License Version 2.1.
@@ -50,7 +50,7 @@
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SCHEMANAME, "SchemaName");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CATALOGNAME, "CatalogName");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PRIVILEGES, "Privileges");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USE_ESCAPE_PROCESSING, 
"EscapeProcessing");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ESCAPE_PROCESSING, "EscapeProcessing");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND, "Command");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPE, "Type");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPENAME, "TypeName");
@@ -90,14 +90,21 @@
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_NUMBERFORMATSSUPPLIER, 
"NumberFormatsSupplier");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISCALCULATED, "IsCalculated");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME, "DataSourceName");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATABASE_LOCATION, "DatabaseLocation");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONNECTION_RESOURCE, 
"ConnectionResource");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_RESULT_SET, "ResultSet");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_SELECTION, "Selection");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOOKMARK_SELECTION, "BookmarkSelection");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COLUMN_NAME, "ColumnName");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COLUMN, "Column");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DATASOURCE, "DataSource");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TRANSACTIONISOLATION, 
"TransactionIsolation");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_TYPEMAP, "TypeMap");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_USER, "User");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_PASSWORD, "Password");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE, "CommandType");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_COMMAND_TYPE, "CommandType");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECOMMAND, "ActiveCommand");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION, "ActiveConnection");
+IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION, "ActiveConnection");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_FILTER, "Filter");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_APPLYFILTER, "ApplyFilter");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ORDER, "Order");
@@ -117,7 +124,6 @@
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_CONTROLSOURCE, "DataField");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_REALNAME, "RealName");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISHIDDEN, "IsHidden");
-IMPLEMENT_CONSTASCII_USTRING(PROPERTY_DOCUMENTLOCATION, "DocumentLocation");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_TABLENAME, "UpdateTableName");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_SCHEMANAME, "UpdateSchemaName");
 IMPLEMENT_CONSTASCII_USTRING(PROPERTY_UPDATE_CATALOGNAME, "UpdateCatalogName");




---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to