INTEGRATION: CWS fwk67 (1.16.200); FILE MERGED

2007/07/11 10:21:42 as 1.16.200.2: #144841# handle some more cases
2007/07/02 12:46:44 as 1.16.200.1: #144841# new exception for corrupt UI config; handle corrupt UI config as fatal error
This commit is contained in:
Oliver Bolte 2007-07-18 07:49:19 +00:00
parent 762dcfec6e
commit e0b9ed1a32

View file

@ -4,9 +4,9 @@
* *
* $RCSfile: resource.hrc,v $ * $RCSfile: resource.hrc,v $
* *
* $Revision: 1.16 $ * $Revision: 1.17 $
* *
* last change: $Author: hr $ $Date: 2006-05-09 19:47:45 $ * last change: $Author: obo $ $Date: 2007-07-18 08:49:19 $
* *
* The Contents of this file are made available subject to * The Contents of this file are made available subject to
* the terms of GNU Lesser General Public License Version 2.1. * the terms of GNU Lesser General Public License Version 2.1.
@ -53,6 +53,9 @@
#define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by AuotSave to show error state: full disc #define STR_FULL_DISC_RETRY_BUTTON (RID_STR_START+9) // used by AuotSave to show error state: full disc
#define STR_FULL_DISC_MSG (RID_STR_START+10) // used by AuotSave to show error state: full disc #define STR_FULL_DISC_MSG (RID_STR_START+10) // used by AuotSave to show error state: full disc
#define STR_RESTORE_TOOLBARS (RID_STR_START+11) #define STR_RESTORE_TOOLBARS (RID_STR_START+11)
#define STR_CORRUPT_UICFG_SHARE (RID_STR_START+12)
#define STR_CORRUPT_UICFG_USER (RID_STR_START+13)
#define STR_CORRUPT_UICFG_GENERAL (RID_STR_START+14)
#define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0) #define POPUPMENU_TOOLBAR_QUICKCUSTOMIZATION (RID_MENU_START+0)