User: rt Date: 2008-01-30 08:39:08+0000 Modified: dba/dbaccess/source/inc/stringconstants.hrc
Log: INTEGRATION: CWS dba24d (1.45.2); FILE MERGED 2007/12/05 15:23:50 fs 1.45.2.4: #i81658# ConnectionInfo 2007/12/01 13:40:15 fs 1.45.2.3: RESYNC: (1.46-1.47); FILE MERGED 2007/11/16 12:56:20 fs 1.45.2.2: RESYNC: (1.45-1.46); FILE MERGED 2007/11/08 14:06:06 fs 1.45.2.1: during #i81658#: string cleanup stringconstants.hrc File Changes: Directory: /dba/dbaccess/source/inc/ ==================================== File [changed]: stringconstants.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/inc/stringconstants.hrc?r1=1.47&r2=1.48 Delta lines: +21 -8 -------------------- --- stringconstants.hrc 2007-11-21 15:44:33+0000 1.47 +++ stringconstants.hrc 2008-01-30 08:39:05+0000 1.48 @@ -100,9 +100,9 @@ #define PROPERTY_ID_TYPEMAP 52 #define PROPERTY_ID_USER 53 #define PROPERTY_ID_PASSWORD 54 -#define PROPERTY_ID_COMMANDTYPE 55 +#define PROPERTY_ID_COMMAND_TYPE 55 #define PROPERTY_ID_ACTIVECOMMAND 56 -#define PROPERTY_ID_ACTIVECONNECTION 57 +#define PROPERTY_ID_ACTIVE_CONNECTION 57 #define PROPERTY_ID_FILTER 58 #define PROPERTY_ID_APPLYFILTER 59 #define PROPERTY_ID_ORDER 60 @@ -116,7 +116,7 @@ #define PROPERTY_ID_ALIGN 68 #define PROPERTY_ID_WIDTH 69 #define PROPERTY_ID_TABLETYPEFILTER 70 -#define PROPERTY_ID_DOCUMENTLOCATION 71 +#define PROPERTY_ID_DATABASE_LOCATION 71 #define PROPERTY_ID_FONT 72 #define PROPERTY_ID_ROW_HEIGHT 73 #define PROPERTY_ID_TEXTCOLOR 74 @@ -175,6 +175,12 @@ #define PROPERTY_ID_GROUP_BY 127 #define PROPERTY_ID_EDIT_WIDTH 128 #define PROPERTY_ID_SETTINGS 129 +#define PROPERTY_ID_CONNECTION_RESOURCE 130 +#define PROPERTY_ID_RESULT_SET 131 +#define PROPERTY_ID_SELECTION 132 +#define PROPERTY_ID_BOOKMARK_SELECTION 133 +#define PROPERTY_ID_COLUMN_NAME 134 +#define PROPERTY_ID_CONNECTION_INFO 135 //============================================================ //= property names @@ -230,14 +236,22 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_NUMBERFORMATSSUPPLIER); DECLARE_CONSTASCII_USTRING(PROPERTY_ISCALCULATED); DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCENAME); +DECLARE_CONSTASCII_USTRING(PROPERTY_DATABASE_LOCATION); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONNECTION_RESOURCE); +DECLARE_CONSTASCII_USTRING(PROPERTY_CONNECTION_INFO); +DECLARE_CONSTASCII_USTRING(PROPERTY_RESULT_SET); +DECLARE_CONSTASCII_USTRING(PROPERTY_SELECTION); +DECLARE_CONSTASCII_USTRING(PROPERTY_BOOKMARK_SELECTION); +DECLARE_CONSTASCII_USTRING(PROPERTY_COLUMN_NAME); +DECLARE_CONSTASCII_USTRING(PROPERTY_COLUMN); DECLARE_CONSTASCII_USTRING(PROPERTY_DATASOURCE); DECLARE_CONSTASCII_USTRING(PROPERTY_TRANSACTIONISOLATION); DECLARE_CONSTASCII_USTRING(PROPERTY_TYPEMAP); DECLARE_CONSTASCII_USTRING(PROPERTY_USER); DECLARE_CONSTASCII_USTRING(PROPERTY_PASSWORD); -DECLARE_CONSTASCII_USTRING(PROPERTY_COMMANDTYPE); +DECLARE_CONSTASCII_USTRING(PROPERTY_COMMAND_TYPE); DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECOMMAND); -DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVECONNECTION); +DECLARE_CONSTASCII_USTRING(PROPERTY_ACTIVE_CONNECTION); DECLARE_CONSTASCII_USTRING(PROPERTY_FILTER); DECLARE_CONSTASCII_USTRING(PROPERTY_APPLYFILTER); DECLARE_CONSTASCII_USTRING(PROPERTY_ORDER); @@ -259,7 +273,6 @@ DECLARE_CONSTASCII_USTRING(PROPERTY_ISHIDDEN); DECLARE_CONSTASCII_USTRING(PROPERTY_HIDDEN); DECLARE_CONSTASCII_USTRING(PROPERTY_TABLETYPEFILTER); -DECLARE_CONSTASCII_USTRING(PROPERTY_DOCUMENTLOCATION); DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_TABLENAME); DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_SCHEMANAME); DECLARE_CONSTASCII_USTRING(PROPERTY_UPDATE_CATALOGNAME); @@ -348,8 +361,8 @@ DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTCOLUMN); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATACOLUMN); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATAACCESSCONNECTION); -DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT); // the new (portal) service -DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE); // the new (portal) service +DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATABASECONTEXT); +DECLARE_CONSTASCII_USTRING(SERVICE_SDB_DATASOURCE); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_ROWSET); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_RESULTSET); DECLARE_CONSTASCII_USTRING(SERVICE_SDB_PREPAREDSTATMENT); --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
