Tag: cws_src680_dba24lms User: fs Date: 2007-11-09 20:13:10+0000 Removed: dba/dbaccess/source/ui/uno/copytablewizard.src
Modified: dba/dbaccess/source/ui/inc/dbu_resource.hrc dba/dbaccess/source/ui/inc/dbu_uno.hrc dba/dbaccess/source/ui/uno/makefile.mk Log: reverted previous change. Fix for #i83469# will be done in CWS dba24lastminutestrings instead File Changes: Directory: /dba/dbaccess/source/ui/inc/ ======================================= File [changed]: dbu_resource.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_resource.hrc?r1=1.98.4.1&r2=1.98.4.2 Delta lines: +5 -5 ------------------- --- dbu_resource.hrc 2007-11-08 21:29:12+0000 1.98.4.1 +++ dbu_resource.hrc 2007-11-09 20:13:07+0000 1.98.4.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_resource.hrc,v $ * - * $Revision: 1.98.4.1 $ + * $Revision: 1.98.4.2 $ * - * last change: $Author: fs $ $Date: 2007/11/08 21:29:12 $ + * last change: $Author: fs $ $Date: 2007/11/09 20:13:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -78,13 +78,13 @@ #define RID_STR_REL_END RID_STR_REL_START + 10 // 330 - 349 #define RID_STR_UNO_START RID_STR_REL_END -#define RID_STR_UNO_END RID_STR_UNO_START + 20 // 350 - 369 +#define RID_STR_UNO_END RID_STR_UNO_START + 5 // 350 - 354 #define RID_STR_GEN_START RID_STR_UNO_END -#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 370 - 424 +#define RID_STR_GEN_END RID_STR_GEN_START + 55 // 355 - 409 #define RID_STR_APP_START RID_STR_GEN_END -#define RID_STR_APP_END RID_STR_APP_START + 40 // 425 - 464 +#define RID_STR_APP_END RID_STR_APP_START + 40 // 409 - 449 #if RID_STR_GEN_END > RID_DBACCESS_END File [changed]: dbu_uno.hrc Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/inc/dbu_uno.hrc?r1=1.4.360.1&r2=1.4.360.2 Delta lines: +5 -13 -------------------- --- dbu_uno.hrc 2007-11-08 21:29:12+0000 1.4.360.1 +++ dbu_uno.hrc 2007-11-09 20:13:07+0000 1.4.360.2 @@ -4,9 +4,9 @@ * * $RCSfile: dbu_uno.hrc,v $ * - * $Revision: 1.4.360.1 $ + * $Revision: 1.4.360.2 $ * - * last change: $Author: fs $ $Date: 2007/11/08 21:29:12 $ + * last change: $Author: fs $ $Date: 2007/11/09 20:13:07 $ * * The Contents of this file are made available subject to * the terms of GNU Lesser General Public License Version 2.1. @@ -39,21 +39,13 @@ #include "dbu_resource.hrc" #endif -#define STR_REMEMBERPASSWORD_PERSISTENT ( RID_STR_UNO_START + 0 ) -#define STR_CTW_NO_VIEWS_SUPPORT ( RID_STR_UNO_START + 1 ) -#define STR_CTW_NO_PRIMARY_KEY_SUPPORT ( RID_STR_UNO_START + 2 ) -#define STR_CTW_INVALID_DATA_ACCESS_DESCRIPTOR ( RID_STR_UNO_START + 3 ) -#define STR_CTW_ONLY_TABLES_AND_QUERIES_SUPPORT ( RID_STR_UNO_START + 4 ) -#define STR_CTW_COPY_SOURCE_NEEDS_BOOKMARKS ( RID_STR_UNO_START + 5 ) -#define STR_CTW_UNSUPPORTED_COLUMN_TYPE ( RID_STR_UNO_START + 6 ) -#define STR_CTW_ILLEGAL_PARAMETER_COUNT ( RID_STR_UNO_START + 7 ) -#define STR_CTW_ERROR_DURING_INITIALIZATION ( RID_STR_UNO_START + 8 ) +#define STR_REMEMBERPASSWORD_PERSISTENT RID_STR_UNO_START -// please adjust when inserting new strings: -#define RID_STR_UNO_LAST_USED STR_CTW_ERROR_DURING_INITIALIZATION -#if RID_STR_UNO_LAST_USED >= RID_STR_UNO_END -#error too many resources in uno .... +// please adjust checking before insert new strings + +#if STR_REMEMBERPASSWORD_PERSISTENT > RID_STR_UNO_END +#error Resource-Id Ueberlauf in #file, #line #endif #endif // _DBU_UNO_HRC_ Directory: /dba/dbaccess/source/ui/uno/ ======================================= File [removed]: copytablewizard.src File [changed]: makefile.mk Url: http://dba.openoffice.org/source/browse/dba/dbaccess/source/ui/uno/makefile.mk?r1=1.12.82.1&r2=1.12.82.2 Delta lines: +1 -2 ------------------- --- makefile.mk 2007-11-08 21:29:13+0000 1.12.82.1 +++ makefile.mk 2007-11-09 20:13:08+0000 1.12.82.2 @@ -4,9 +4,9 @@ # # $RCSfile: makefile.mk,v $ # -# $Revision: 1.12.82.1 $ +# $Revision: 1.12.82.2 $ # -# last change: $Author: fs $ $Date: 2007/11/08 21:29:13 $ +# last change: $Author: fs $ $Date: 2007/11/09 20:13:08 $ # # The Contents of this file are made available subject to # the terms of GNU Lesser General Public License Version 2.1. @@ -51,8 +51,7 @@ SRS1NAME=$(TARGET) SRC1FILES = \ - dbinteraction.src \ - copytablewizard.src + dbinteraction.src # ... object files ............................ --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
