summaryrefslogtreecommitdiff
path: root/dbaccess/source/shared
diff options
context:
space:
mode:
authorRĂ¼diger Timm <rt@openoffice.org>2008-01-30 07:40:53 +0000
committerRĂ¼diger Timm <rt@openoffice.org>2008-01-30 07:40:53 +0000
commit7391786cddc157903361e78cc06c2817e6e2e6b5 (patch)
tree07f5e3ed2cee89689179dfacbb3480bcd25f59e1 /dbaccess/source/shared
parentf0519ecfc8f50b5491985f5ba21bb16edbbfd93b (diff)
INTEGRATION: CWS dba24d (1.42.2); FILE MERGED
2007/12/05 15:45:55 fs 1.42.2.4: #i81658# ConnectionInfo 2007/12/01 13:40:21 fs 1.42.2.3: RESYNC: (1.43-1.44); FILE MERGED 2007/11/16 12:56:23 fs 1.42.2.2: RESYNC: (1.42-1.43); FILE MERGED 2007/11/08 14:06:52 fs 1.42.2.1: during #i81658#: string cleanup
Diffstat (limited to 'dbaccess/source/shared')
-rw-r--r--dbaccess/source/shared/stringconstants.cxx17
1 files changed, 12 insertions, 5 deletions
diff --git a/dbaccess/source/shared/stringconstants.cxx b/dbaccess/source/shared/stringconstants.cxx
index 78a35c7787c6..8956c54c67d9 100644
--- a/dbaccess/source/shared/stringconstants.cxx
+++ b/dbaccess/source/shared/stringconstants.cxx
@@ -4,9 +4,9 @@
*
* $RCSfile: stringconstants.cxx,v $
*
- * $Revision: 1.44 $
+ * $Revision: 1.45 $
*
- * last change: $Author: ihi $ $Date: 2007-11-21 15:49:12 $
+ * last change: $Author: rt $ $Date: 2008-01-30 08:40:53 $
*
* The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1.
@@ -90,14 +90,22 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_ISOUTPARAMETER, "IsOutParameter");
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_CONNECTION_INFO, "ConnectionInfo");
+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 +125,6 @@ IMPLEMENT_CONSTASCII_USTRING(PROPERTY_BOUNDFIELD, "BoundField");
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");