User: obo     
Date: 2006/07/10 08:30:29

Modified:
   dba/dbaccess/source/ui/inc/dbu_misc.hrc

Log:
 INTEGRATION: CWS qiq (1.5.124); FILE MERGED
 2006/05/24 06:47:48 fs 1.5.124.4: moved two strings to another place (adbt lib)
 2006/05/18 09:16:13 fs 1.5.124.3: #i51143#
 2006/05/17 11:46:20 fs 1.5.124.2: #i51143#
 2006/05/15 14:20:02 fs 1.5.124.1: #i51143 moved STR_WARNINGS_DURING_CONNECT 
moved from dbu_resource to dbu_misc

File Changes:

Directory: /dba/dbaccess/source/ui/inc/
=======================================

File [changed]: dbu_misc.hrc
Url: 
http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_misc.hrc?r1=1.5&r2=1.6
Delta lines:  +4 -3
-------------------
--- dbu_misc.hrc        8 Sep 2005 15:49:35 -0000       1.5
+++ dbu_misc.hrc        10 Jul 2006 15:30:26 -0000      1.6
@@ -50,16 +50,17 @@
 #define STR_COPYTABLE_TITLE_COPY                       RID_STR_MISC_START +  7
 #define STR_COPYTABLE_TITLE_MOVE                       RID_STR_MISC_START +  8
 #define STR_COULDNOTOPEN_LINKEDDOC                     RID_STR_MISC_START +  9
-#define STR_ERR_DUPL_TABLENAME                         RID_STR_MISC_START + 10
+#define STR_SUGGEST_APPEND_TABLE_DATA       RID_STR_MISC_START + 10
 #define STR_UNDO_COLON                                         
RID_STR_MISC_START + 11
 #define STR_REDO_COLON                                         
RID_STR_MISC_START + 12
 #define STR_UNKNOWN_TYPE_FOUND                         RID_STR_MISC_START + 13
 #define STR_FILE_DOES_NOT_EXIST             RID_STR_MISC_START + 14
-
+#define STR_WARNINGS_DURING_CONNECT         RID_STR_MISC_START + 15
+#define STR_NAMED_OBJECT_ALREADY_EXISTS     RID_STR_MISC_START + 16
 
 // please adjust checking before insert new strings
 
-#if STR_FILE_DOES_NOT_EXIST > RID_STR_MISC_END
+#if STR_NAMED_OBJECT_ALREADY_EXISTS > RID_STR_MISC_END
 #error Resource-Id Ueberlauf in #file, #line
 #endif
 




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

Reply via email to